Skip to content

Commit 0c48ba4

Browse files
committedApr 1, 2016
working on formatting
1 parent 80644b0 commit 0c48ba4

File tree

2 files changed

+2
-74
lines changed

2 files changed

+2
-74
lines changed
 

‎src/Illuminate/Foundation/Auth/Access/AuthorizesResources.php

+2-6
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ trait AuthorizesResources
99
/**
1010
* Authorize a resource action.
1111
*
12-
* @param string $name
1312
* @param string $model
13+
* @param string $name
1414
* @param array $options
1515
* @param \Illuminate\Http\Request|null $request
1616
* @return \Illuminate\Routing\ControllerMiddlewareOptions
1717
*/
18-
public function authorizeResource($name, $model, array $options = [], $request = null)
18+
public function authorizeResource($model, $name = null, array $options = [], $request = null)
1919
{
2020
$action = with($request ?: request())->route()->getActionName();
2121

@@ -26,10 +26,6 @@ public function authorizeResource($name, $model, array $options = [], $request =
2626
'edit' => 'update', 'update' => 'update', 'delete' => 'delete',
2727
];
2828

29-
if (property_exists($this, 'abilityMap')) {
30-
$map = array_merge($map, $this->abilityMap);
31-
}
32-
3329
if (! in_array($method, array_keys($map))) {
3430
return new ControllerMiddlewareOptions($options);
3531
}

‎src/Illuminate/Foundation/Auth/Access/Middleware/Authorize.php

-68
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.