@@ -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 | ]); |
@@ -3,7 +3,6 @@ |
||
3 | 3 | namespace App\Ship\Parents\Tests\PhpUnit; |
4 | 4 | |
5 | 5 | use App\Ship\Engine\Traits\HashIdTrait; |
6 | -use App\Ship\Features\Tests\PhpUnit\TestingTrait; |
|
7 | 6 | use App\Ship\Features\Tests\PhpUnit\TestsAuthHelperTrait; |
8 | 7 | use App\Ship\Features\Tests\PhpUnit\TestsCustomHelperTrait; |
9 | 8 | use App\Ship\Features\Tests\PhpUnit\TestsMockHelperTrait; |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | /** |
183 | 183 | * @param $subject |
184 | 184 | * @param $findKey |
185 | - * @param $callback |
|
185 | + * @param \Closure $callback |
|
186 | 186 | * |
187 | 187 | * @return array |
188 | 188 | */ |
@@ -206,7 +206,7 @@ discard block |
||
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
209 | - * @param $search |
|
209 | + * @param string $search |
|
210 | 210 | * @param $subject |
211 | 211 | * |
212 | 212 | * @return mixed |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
228 | - * @param $needle |
|
228 | + * @param string $needle |
|
229 | 229 | * @param $haystack |
230 | 230 | * |
231 | 231 | * @return int |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | public function runEndpointsHashedIdsDecoder() |
30 | 30 | { |
31 | 31 | if (Config::get('hello.hash-id')) { |
32 | - Route::bind('id', function ($id, $route) { |
|
32 | + Route::bind('id', function($id, $route) { |
|
33 | 33 | // skip decoding some endpoints |
34 | 34 | if (!in_array($route->uri(), $this->skippedEndpoints)) { |
35 | 35 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | { |
59 | 59 | // hash the ID only if hash-id enabled in the config |
60 | 60 | if (Config::get('hello.hash-id')) { |
61 | - return $this->encoder(($key) ? : $this->getKey()); |
|
61 | + return $this->encoder(($key) ?: $this->getKey()); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | return $this->getKey(); |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | // get the last part of the key, which should be the ID that needs decoding |
144 | 144 | $idToDecode = substr($key, strrpos($key, '.*.') + 3); |
145 | 145 | |
146 | - array_walk_recursive($requestData, function (&$value, $key) use ($idToDecode) { |
|
146 | + array_walk_recursive($requestData, function(&$value, $key) use ($idToDecode) { |
|
147 | 147 | |
148 | 148 | if ($key == $idToDecode) { |
149 | 149 | |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | |
163 | 163 | $idToDecode = $this->removeLastOccurrenceFromString($key, '.*'); |
164 | 164 | |
165 | - $this->findKeyAndReturnValue($requestData, $idToDecode, function ($ids) { |
|
165 | + $this->findKeyAndReturnValue($requestData, $idToDecode, function($ids) { |
|
166 | 166 | |
167 | 167 | if (!is_array($ids)) { |
168 | 168 | throw new IncorrectIdException('Expected ID\'s to be in array. Please wrap your ID\'s in an Array and send them back.'); |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | public function extendValidationRules() |
19 | 19 | { |
20 | 20 | // Validate String contains no space. |
21 | - Validator::extend('no_spaces', function ($attribute, $value, $parameters, $validator) { |
|
21 | + Validator::extend('no_spaces', function($attribute, $value, $parameters, $validator) { |
|
22 | 22 | return preg_match('/^\S*$/u', $value); |
23 | 23 | }, ['String should not contain space.']); |
24 | 24 | |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | // Usage: unique_composite:table,this-attribute-column,the-other-attribute-column |
27 | 27 | // Example: 'values' => 'required|unique_composite:item_variant_values,value,item_variant_name_id', |
28 | 28 | // 'item_variant_name_id' => 'required', |
29 | - Validator::extend('unique_composite', function ($attribute, $value, $parameters, $validator) { |
|
29 | + Validator::extend('unique_composite', function($attribute, $value, $parameters, $validator) { |
|
30 | 30 | |
31 | 31 | $queryBuilder = \DB::table($parameters[0]); |
32 | 32 |