@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | } |
52 | 52 | |
53 | 53 | /** |
54 | - * @param $lang |
|
54 | + * @param string $lang |
|
55 | 55 | * |
56 | 56 | * @return string|Exception |
57 | 57 | */ |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | } |
68 | 68 | |
69 | 69 | /** |
70 | - * @param $request |
|
70 | + * @param \Illuminate\Http\Request $request |
|
71 | 71 | * |
72 | 72 | * @return string |
73 | 73 | */ |
@@ -63,7 +63,7 @@ |
||
63 | 63 | private function findLanguage($request) |
64 | 64 | { |
65 | 65 | // read the language from the request header, if the header is missed, take the default local language |
66 | - return $request->header('Content-Language') ? : Config::get('app.locale'); |
|
66 | + return $request->header('Content-Language') ?: Config::get('app.locale'); |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | /** |
@@ -32,7 +32,7 @@ |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | /** |
35 | - * @param $directory |
|
35 | + * @param string $directory |
|
36 | 36 | * @param $containerName |
37 | 37 | */ |
38 | 38 | private function loadLocals($directory, $containerName) |
@@ -36,7 +36,7 @@ |
||
36 | 36 | } |
37 | 37 | |
38 | 38 | /** |
39 | - * @param $directory |
|
39 | + * @param string $directory |
|
40 | 40 | */ |
41 | 41 | private function loadMigrations($directory) |
42 | 42 | { |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | /** |
79 | 79 | * @param $file |
80 | - * @param $controllerNamespace |
|
80 | + * @param string $controllerNamespace |
|
81 | 81 | */ |
82 | 82 | private function loadWebRoute($file, $controllerNamespace) |
83 | 83 | { |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | /** |
146 | 146 | * @param \Symfony\Component\Finder\SplFileInfo $file |
147 | 147 | * |
148 | - * @return mixed |
|
148 | + * @return string |
|
149 | 149 | */ |
150 | 150 | private function getRouteFileNameWithoutExtension(SplFileInfo $file) |
151 | 151 | { |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $this->webRouter->group([ |
85 | 85 | 'middleware' => ['web'], |
86 | 86 | 'namespace' => $controllerNamespace, |
87 | - ], function (LaravelRouter $router) use ($file) { |
|
87 | + ], function(LaravelRouter $router) use ($file) { |
|
88 | 88 | require $file->getPathname(); |
89 | 89 | }); |
90 | 90 | } |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | $apiVersionNumber = $this->getRouteFileVersionNumber($file); |
101 | 101 | |
102 | 102 | $this->apiRouter->version('v' . $apiVersionNumber, |
103 | - function (DingoApiRouter $router) use ($file, $containerPath, $containersNamespace) { |
|
103 | + function(DingoApiRouter $router) use ($file, $containerPath, $containersNamespace) { |
|
104 | 104 | |
105 | 105 | $controllerNamespace = $containersNamespace . '\\Containers\\' . basename($containerPath) . '\\UI\API\Controllers'; |
106 | 106 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | 'limit' => Config::get('hello.api.limit'), |
114 | 114 | // The API limit expiry time. |
115 | 115 | 'expires' => Config::get('hello.api.limit_expires'), |
116 | - ], function ($router) use ($file) { |
|
116 | + ], function($router) use ($file) { |
|
117 | 117 | |
118 | 118 | require $file->getPathname(); |
119 | 119 |
@@ -31,7 +31,7 @@ |
||
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
34 | - * @param $directory |
|
34 | + * @param string $directory |
|
35 | 35 | * @param $containerName |
36 | 36 | */ |
37 | 37 | private function loadViews($directory, $containerName) |
@@ -12,7 +12,7 @@ |
||
12 | 12 | trait AuthorizationTrait |
13 | 13 | { |
14 | 14 | /** |
15 | - * @return \App\Containers\User\Models\User|null |
|
15 | + * @return \Illuminate\Contracts\Auth\Authenticatable|null |
|
16 | 16 | */ |
17 | 17 | public function getUser() |
18 | 18 | { |
@@ -2,7 +2,6 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Ship\Parents\Requests; |
4 | 4 | |
5 | -use App\Containers\Authorization\Traits\AuthorizationTrait; |
|
6 | 5 | use App\Ship\Engine\Traits\HashIdTrait; |
7 | 6 | use Illuminate\Foundation\Http\FormRequest as LaravelFormRequest; |
8 | 7 |
@@ -28,7 +28,7 @@ |
||
28 | 28 | public function hasAccess(User $user = null) |
29 | 29 | { |
30 | 30 | // if not in parameters, take from the request object {$this} |
31 | - $user = $user ? : $this->user(); |
|
31 | + $user = $user ?: $this->user(); |
|
32 | 32 | |
33 | 33 | $hasAccess = array_merge( |
34 | 34 | $this->hasAnyPermissionAccess($user), |
@@ -52,7 +52,7 @@ |
||
52 | 52 | * To call functions and compare their bool responses to determine |
53 | 53 | * if the user can proceed with the request or not. |
54 | 54 | * |
55 | - * @param array $functions |
|
55 | + * @param string[] $functions |
|
56 | 56 | * |
57 | 57 | * @return bool |
58 | 58 | */ |
@@ -2,11 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace App\Ship\Parents\Requests; |
4 | 4 | |
5 | -use App\Containers\Authorization\Traits\AuthorizationTrait; |
|
6 | -use App\Ship\Engine\Traits\HashIdTrait; |
|
7 | 5 | use App\Ship\Features\Exceptions\ValidationFailedException; |
8 | 6 | use Illuminate\Contracts\Validation\Validator; |
9 | -use Illuminate\Foundation\Http\FormRequest as LaravelFormRequest; |
|
10 | 7 | |
11 | 8 | /** |
12 | 9 | * Class RequestTrait |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | $permissions = explode('|', $this->access['permissions']); |
127 | 127 | |
128 | - $hasAccess = array_map(function ($permission) use ($user) { |
|
128 | + $hasAccess = array_map(function($permission) use ($user) { |
|
129 | 129 | // Note: internal return |
130 | 130 | return $user->hasPermissionTo($permission); |
131 | 131 | }, $permissions); |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | |
147 | 147 | $roles = explode('|', $this->access['roles']); |
148 | 148 | |
149 | - $hasAccess = array_map(function ($role) use ($user) { |
|
149 | + $hasAccess = array_map(function($role) use ($user) { |
|
150 | 150 | // Note: internal return |
151 | 151 | return $user->hasRole($role); |
152 | 152 | }, $roles); |
@@ -42,6 +42,6 @@ |
||
42 | 42 | $router->post('admins', [ |
43 | 43 | 'uses' => 'Controller@createAdmin', |
44 | 44 | 'middleware' => [ |
45 | - 'api.auth', |
|
45 | + 'api.auth', |
|
46 | 46 | ], |
47 | 47 | ]); |