@@ -33,37 +33,37 @@ |
||
33 | 33 | if (!$exceptAll) { |
34 | 34 | if (in_array('index', $options['only']) && !in_array('index', $options['except'])) { |
35 | 35 | Route::get($uri, $controller.'@index') |
36 | - ->name($options['name'].'.index'); |
|
36 | + ->name($options['name'].'.index'); |
|
37 | 37 | } |
38 | 38 | |
39 | 39 | if (in_array('show', $options['only']) && !in_array('show', $options['except'])) { |
40 | 40 | Route::get($uri.'/{uuid}', $controller.'@show') |
41 | - ->name($options['name'].'.show'); |
|
41 | + ->name($options['name'].'.show'); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | if (in_array('store', $options['only']) && !in_array('store', $options['except'])) { |
45 | 45 | Route::post($uri, $controller.'@store') |
46 | - ->name($options['name'].'.store'); |
|
46 | + ->name($options['name'].'.store'); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | if (in_array('update', $options['only']) && !in_array('update', $options['except'])) { |
50 | 50 | Route::put($uri.'/{uuid}', $controller.'@update') |
51 | - ->name($options['name'].'.update'); |
|
51 | + ->name($options['name'].'.update'); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | if (in_array('destroy', $options['only']) && !in_array('destroy', $options['except'])) { |
55 | 55 | Route::delete($uri.'/{uuid}', $controller.'@destroy') |
56 | - ->name($options['name'].'.destroy'); |
|
56 | + ->name($options['name'].'.destroy'); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | if (in_array('destroyed', $options['only']) && !in_array('destroyed', $options['except'])) { |
60 | 60 | Route::get($uri.'/destroyed', $controller.'@destroyed') |
61 | - ->name($options['name'].'.destroyed'); |
|
61 | + ->name($options['name'].'.destroyed'); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | if (in_array('restoreDestroyed', $options['only']) && !in_array('restoreDestroyed', $options['except'])) { |
65 | 65 | Route::post($uri.'/{uuid}', $controller.'@restoreDestroyed') |
66 | - ->name($options['name'].'.restoreDestroyed'); |
|
66 | + ->name($options['name'].'.restoreDestroyed'); |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 |
@@ -8,62 +8,62 @@ |
||
8 | 8 | |
9 | 9 | class BaseApplication extends Application |
10 | 10 | { |
11 | - public function publicRoutes(string $uri, string $controller, Closure $routes = null, array $options = []) |
|
11 | + public function publicRoutes (string $uri, string $controller, Closure $routes = null, array $options = [ ]) |
|
12 | 12 | { |
13 | - $options['only'] = $options['only'] ?? ['index', 'show', 'destroyed']; |
|
13 | + $options[ 'only' ] = $options[ 'only' ] ?? [ 'index', 'show', 'destroyed' ]; |
|
14 | 14 | |
15 | 15 | return $this->resourceRoutes($uri, $controller, $routes, $options); |
16 | 16 | } |
17 | 17 | |
18 | - public function routesWithPermission(string $uri, string $controller, Closure $routes = null, array $options = []) |
|
18 | + public function routesWithPermission (string $uri, string $controller, Closure $routes = null, array $options = [ ]) |
|
19 | 19 | { |
20 | - $options['only'] = $options['only'] ?? ['store', 'update', 'destroyed', 'restoreDestroyed']; |
|
20 | + $options[ 'only' ] = $options[ 'only' ] ?? [ 'store', 'update', 'destroyed', 'restoreDestroyed' ]; |
|
21 | 21 | |
22 | 22 | return $this->resourceRoutes($uri, $controller, $routes, $options); |
23 | 23 | } |
24 | 24 | |
25 | - public function resourceRoutes(string $uri, string $controller, Closure $routes = null, array $options = []) |
|
25 | + public function resourceRoutes (string $uri, string $controller, Closure $routes = null, array $options = [ ]) |
|
26 | 26 | { |
27 | - $options['name'] = $options['name'] ?? $uri; |
|
28 | - $options['only'] = $options['only'] ?? []; |
|
29 | - $options['except'] = $options['except'] ?? []; |
|
27 | + $options[ 'name' ] = $options[ 'name' ] ?? $uri; |
|
28 | + $options[ 'only' ] = $options[ 'only' ] ?? [ ]; |
|
29 | + $options[ 'except' ] = $options[ 'except' ] ?? [ ]; |
|
30 | 30 | |
31 | - $exceptAll = isset($options['except'][0]) && $options['except'][0] == '*'; |
|
31 | + $exceptAll = isset($options[ 'except' ][ 0 ]) && $options[ 'except' ][ 0 ] == '*'; |
|
32 | 32 | |
33 | 33 | if (!$exceptAll) { |
34 | - if (in_array('index', $options['only']) && !in_array('index', $options['except'])) { |
|
34 | + if (in_array('index', $options[ 'only' ]) && !in_array('index', $options[ 'except' ])) { |
|
35 | 35 | Route::get($uri, $controller.'@index') |
36 | - ->name($options['name'].'.index'); |
|
36 | + ->name($options[ 'name' ].'.index'); |
|
37 | 37 | } |
38 | 38 | |
39 | - if (in_array('show', $options['only']) && !in_array('show', $options['except'])) { |
|
39 | + if (in_array('show', $options[ 'only' ]) && !in_array('show', $options[ 'except' ])) { |
|
40 | 40 | Route::get($uri.'/{uuid}', $controller.'@show') |
41 | - ->name($options['name'].'.show'); |
|
41 | + ->name($options[ 'name' ].'.show'); |
|
42 | 42 | } |
43 | 43 | |
44 | - if (in_array('store', $options['only']) && !in_array('store', $options['except'])) { |
|
44 | + if (in_array('store', $options[ 'only' ]) && !in_array('store', $options[ 'except' ])) { |
|
45 | 45 | Route::post($uri, $controller.'@store') |
46 | - ->name($options['name'].'.store'); |
|
46 | + ->name($options[ 'name' ].'.store'); |
|
47 | 47 | } |
48 | 48 | |
49 | - if (in_array('update', $options['only']) && !in_array('update', $options['except'])) { |
|
49 | + if (in_array('update', $options[ 'only' ]) && !in_array('update', $options[ 'except' ])) { |
|
50 | 50 | Route::put($uri.'/{uuid}', $controller.'@update') |
51 | - ->name($options['name'].'.update'); |
|
51 | + ->name($options[ 'name' ].'.update'); |
|
52 | 52 | } |
53 | 53 | |
54 | - if (in_array('destroy', $options['only']) && !in_array('destroy', $options['except'])) { |
|
54 | + if (in_array('destroy', $options[ 'only' ]) && !in_array('destroy', $options[ 'except' ])) { |
|
55 | 55 | Route::delete($uri.'/{uuid}', $controller.'@destroy') |
56 | - ->name($options['name'].'.destroy'); |
|
56 | + ->name($options[ 'name' ].'.destroy'); |
|
57 | 57 | } |
58 | 58 | |
59 | - if (in_array('destroyed', $options['only']) && !in_array('destroyed', $options['except'])) { |
|
59 | + if (in_array('destroyed', $options[ 'only' ]) && !in_array('destroyed', $options[ 'except' ])) { |
|
60 | 60 | Route::get($uri.'/destroyed', $controller.'@destroyed') |
61 | - ->name($options['name'].'.destroyed'); |
|
61 | + ->name($options[ 'name' ].'.destroyed'); |
|
62 | 62 | } |
63 | 63 | |
64 | - if (in_array('restoreDestroyed', $options['only']) && !in_array('restoreDestroyed', $options['except'])) { |
|
64 | + if (in_array('restoreDestroyed', $options[ 'only' ]) && !in_array('restoreDestroyed', $options[ 'except' ])) { |
|
65 | 65 | Route::post($uri.'/{uuid}', $controller.'@restoreDestroyed') |
66 | - ->name($options['name'].'.restoreDestroyed'); |
|
66 | + ->name($options[ 'name' ].'.restoreDestroyed'); |
|
67 | 67 | } |
68 | 68 | } |
69 | 69 |
@@ -6,8 +6,7 @@ |
||
6 | 6 | use Illuminate\Foundation\Application; |
7 | 7 | use Illuminate\Support\Facades\Route; |
8 | 8 | |
9 | -class BaseApplication extends Application |
|
10 | -{ |
|
9 | +class BaseApplication extends Application { |
|
11 | 10 | public function publicRoutes(string $uri, string $controller, Closure $routes = null, array $options = []) |
12 | 11 | { |
13 | 12 | $options['only'] = $options['only'] ?? ['index', 'show', 'destroyed']; |
@@ -8,21 +8,21 @@ |
||
8 | 8 | |
9 | 9 | class BaseApplication extends Application |
10 | 10 | { |
11 | - public function publicRoutes(string $uri, string $controller, Closure $routes = null, array $options = []) |
|
11 | + public function publicRoutes(string $uri, string $controller, Closure $routes = NULL, array $options = []) |
|
12 | 12 | { |
13 | 13 | $options['only'] = $options['only'] ?? ['index', 'show', 'destroyed']; |
14 | 14 | |
15 | 15 | return $this->resourceRoutes($uri, $controller, $routes, $options); |
16 | 16 | } |
17 | 17 | |
18 | - public function routesWithPermission(string $uri, string $controller, Closure $routes = null, array $options = []) |
|
18 | + public function routesWithPermission(string $uri, string $controller, Closure $routes = NULL, array $options = []) |
|
19 | 19 | { |
20 | 20 | $options['only'] = $options['only'] ?? ['store', 'update', 'destroyed', 'restoreDestroyed']; |
21 | 21 | |
22 | 22 | return $this->resourceRoutes($uri, $controller, $routes, $options); |
23 | 23 | } |
24 | 24 | |
25 | - public function resourceRoutes(string $uri, string $controller, Closure $routes = null, array $options = []) |
|
25 | + public function resourceRoutes(string $uri, string $controller, Closure $routes = NULL, array $options = []) |
|
26 | 26 | { |
27 | 27 | $options['name'] = $options['name'] ?? $uri; |
28 | 28 | $options['only'] = $options['only'] ?? []; |