We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Foundation\Bus\DispatchesJobs; |
6 | 6 | use Illuminate\Foundation\Validation\ValidatesRequests; |
7 | -use Illuminate\Http\Request; |
|
8 | 7 | use Illuminate\Routing\Controller; |
9 | 8 | |
10 | 9 | class CrudController extends Controller |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | // call the setup function inside this closure to also have the request there |
29 | 29 | // this way, developers can use things stored in session (auth variables, etc) |
30 | - $this->middleware(function ($request, $next) { |
|
30 | + $this->middleware(function($request, $next) { |
|
31 | 31 | // make a new CrudPanel object, from the one stored in Laravel's service container |
32 | 32 | $this->crud = app()->make('crud'); |
33 | 33 | // ensure crud has the latest request |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | { |
42 | 42 | $this->crud->allowAccess('list'); |
43 | 43 | |
44 | - $this->crud->operation('list', function () { |
|
44 | + $this->crud->operation('list', function() { |
|
45 | 45 | $this->crud->loadDefaultOperationSettingsFromConfig(); |
46 | 46 | }); |
47 | 47 | } |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | // if there was an order set, this will be the last one (after all others were applied) |
113 | 113 | $orderBy = $this->crud->query->getQuery()->orders; |
114 | 114 | $hasOrderByPrimaryKey = false; |
115 | - collect($orderBy)->each(function ($item, $key) use ($hasOrderByPrimaryKey) { |
|
116 | - if (! isset($item['column'])) { |
|
115 | + collect($orderBy)->each(function($item, $key) use ($hasOrderByPrimaryKey) { |
|
116 | + if (!isset($item['column'])) { |
|
117 | 117 | return false; |
118 | 118 | } |
119 | 119 | |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | return false; |
124 | 124 | } |
125 | 125 | }); |
126 | - if (! $hasOrderByPrimaryKey) { |
|
126 | + if (!$hasOrderByPrimaryKey) { |
|
127 | 127 | $this->crud->query->orderByDesc($this->crud->model->getKeyName()); |
128 | 128 | } |
129 | 129 |
@@ -10,7 +10,7 @@ |
||
10 | 10 | $array_of_values = []; |
11 | 11 | |
12 | 12 | foreach ($values as $key => $value) { |
13 | - if (! is_null($value)) { |
|
13 | + if (!is_null($value)) { |
|
14 | 14 | $array_of_values[] = $column['options'][$value]; |
15 | 15 | } else { |
16 | 16 | echo '-'; |
@@ -2,8 +2,8 @@ |
||
2 | 2 | |
3 | 3 | namespace Backpack\CRUD\Tests\Unit\Http; |
4 | 4 | |
5 | -use Backpack\CRUD\app\Library\CrudPanel\CrudPanel; |
|
6 | 5 | use Backpack\CRUD\Tests\BaseTest; |
6 | +use Backpack\CRUD\app\Library\CrudPanel\CrudPanel; |
|
7 | 7 | |
8 | 8 | class CrudControllerTest extends BaseTest |
9 | 9 | { |
@@ -19,7 +19,7 @@ |
||
19 | 19 | $controller = '\Backpack\CRUD\Tests\Unit\Http\Controllers\UserCrudController'; |
20 | 20 | $app['router']->get('users/{id}/edit', "$controller@edit"); |
21 | 21 | $app['router']->put('users/{id}', "$controller@update"); |
22 | - $app->singleton('crud', function ($app) { |
|
22 | + $app->singleton('crud', function($app) { |
|
23 | 23 | return new CrudPanel($app); |
24 | 24 | }); |
25 | 25 | } |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | */ |
70 | 70 | public function setRequest($request = null) |
71 | 71 | { |
72 | - if (! $request) { |
|
72 | + if (!$request) { |
|
73 | 73 | $request = \Request::instance(); |
74 | 74 | } |
75 | 75 | $this->request = $request; |
@@ -89,11 +89,11 @@ discard block |
||
89 | 89 | */ |
90 | 90 | public function setModel($model_namespace) |
91 | 91 | { |
92 | - if (! class_exists($model_namespace)) { |
|
92 | + if (!class_exists($model_namespace)) { |
|
93 | 93 | throw new \Exception('The model does not exist.', 500); |
94 | 94 | } |
95 | 95 | |
96 | - if (! method_exists($model_namespace, 'hasCrudTrait')) { |
|
96 | + if (!method_exists($model_namespace, 'hasCrudTrait')) { |
|
97 | 97 | throw new \Exception('Please use CrudTrait on the model.', 500); |
98 | 98 | } |
99 | 99 | |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | { |
157 | 157 | $complete_route = $route.'.index'; |
158 | 158 | |
159 | - if (! \Route::has($complete_route)) { |
|
159 | + if (!\Route::has($complete_route)) { |
|
160 | 160 | throw new \Exception('There are no routes for this route name.', 404); |
161 | 161 | } |
162 | 162 | |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | */ |
258 | 258 | public function getFirstOfItsTypeInArray($type, $array) |
259 | 259 | { |
260 | - return array_first($array, function ($item) use ($type) { |
|
260 | + return array_first($array, function($item) use ($type) { |
|
261 | 261 | return $item['type'] == $type; |
262 | 262 | }); |
263 | 263 | } |
@@ -274,8 +274,8 @@ discard block |
||
274 | 274 | |
275 | 275 | public function sync($type, $fields, $attributes) |
276 | 276 | { |
277 | - if (! empty($this->{$type})) { |
|
278 | - $this->{$type} = array_map(function ($field) use ($fields, $attributes) { |
|
277 | + if (!empty($this->{$type})) { |
|
278 | + $this->{$type} = array_map(function($field) use ($fields, $attributes) { |
|
279 | 279 | if (in_array($field['name'], (array) $fields)) { |
280 | 280 | $field = array_merge($field, $attributes); |
281 | 281 | } |
@@ -306,15 +306,15 @@ discard block |
||
306 | 306 | { |
307 | 307 | $relationArray = explode('.', $relationString); |
308 | 308 | |
309 | - if (! isset($length)) { |
|
309 | + if (!isset($length)) { |
|
310 | 310 | $length = count($relationArray); |
311 | 311 | } |
312 | 312 | |
313 | - if (! isset($model)) { |
|
313 | + if (!isset($model)) { |
|
314 | 314 | $model = $this->model; |
315 | 315 | } |
316 | 316 | |
317 | - $result = array_reduce(array_splice($relationArray, 0, $length), function ($obj, $method) { |
|
317 | + $result = array_reduce(array_splice($relationArray, 0, $length), function($obj, $method) { |
|
318 | 318 | return $obj->$method()->getRelated(); |
319 | 319 | }, $model); |
320 | 320 | |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | $relation = $model->{$firstRelationName}; |
365 | 365 | |
366 | 366 | $results = []; |
367 | - if (! empty($relation)) { |
|
367 | + if (!empty($relation)) { |
|
368 | 368 | if ($relation instanceof Collection) { |
369 | 369 | $currentResults = $relation->toArray(); |
370 | 370 | } else { |
@@ -373,7 +373,7 @@ discard block |
||
373 | 373 | |
374 | 374 | array_shift($relationArray); |
375 | 375 | |
376 | - if (! empty($relationArray)) { |
|
376 | + if (!empty($relationArray)) { |
|
377 | 377 | foreach ($currentResults as $currentResult) { |
378 | 378 | $results = array_merge($results, $this->getRelationModelInstances($currentResult, implode('.', $relationArray))); |
379 | 379 | } |
@@ -30,7 +30,7 @@ |
||
30 | 30 | /** |
31 | 31 | * Execute the console command. |
32 | 32 | * |
33 | - * @return mixed Command-line output |
|
33 | + * @return false|null Command-line output |
|
34 | 34 | */ |
35 | 35 | public function handle() |
36 | 36 | { |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | $createUploadDirectoryCommand = 'mkdir -p public/uploads'; |
89 | 89 | break; |
90 | 90 | case '\\': // windows |
91 | - if (! file_exists('public\uploads')) { |
|
91 | + if (!file_exists('public\uploads')) { |
|
92 | 92 | $createUploadDirectoryCommand = 'mkdir public\uploads'; |
93 | 93 | } |
94 | 94 | break; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $this->echo('info', $beforeNotice ? ' '.$beforeNotice : $command); |
134 | 134 | |
135 | 135 | $process = new Process($command, null, null, null, $this->option('timeout')); |
136 | - $process->run(function ($type, $buffer) { |
|
136 | + $process->run(function($type, $buffer) { |
|
137 | 137 | if (Process::ERR === $type) { |
138 | 138 | $this->echo('comment', $buffer); |
139 | 139 | } else { |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | }); |
143 | 143 | |
144 | 144 | // executes after the command finishes |
145 | - if (! $process->isSuccessful()) { |
|
145 | + if (!$process->isSuccessful()) { |
|
146 | 146 | throw new ProcessFailedException($process); |
147 | 147 | } |
148 | 148 |
@@ -170,7 +170,6 @@ |
||
170 | 170 | /** |
171 | 171 | * Allow the developer to unset all save actions. |
172 | 172 | * |
173 | - * @param string $saveAction |
|
174 | 173 | * @return void |
175 | 174 | */ |
176 | 175 | public function forgetAllSaveActions() |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function getSaveActionByOrder($order) |
49 | 49 | { |
50 | - return array_filter($this->availableSaveActions, function ($arr) use ($order) { |
|
50 | + return array_filter($this->availableSaveActions, function($arr) use ($order) { |
|
51 | 51 | return $arr['order'] == $order; |
52 | 52 | }); |
53 | 53 | } |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | if (is_array($saveAction)) { |
94 | 94 | //check for some mandatory fields |
95 | 95 | $saveAction['name'] ?? abort(500, 'Please define save action name.'); |
96 | - $saveAction['redirect'] = $saveAction['redirect'] ?? function ($crud, $request, $itemId) { |
|
96 | + $saveAction['redirect'] = $saveAction['redirect'] ?? function($crud, $request, $itemId) { |
|
97 | 97 | return $request->has('http_referrer') ? $request->get('http_referrer') : $crud->route; |
98 | 98 | }; |
99 | 99 | $saveAction['permissions'] = $saveAction['permissions'] ?? true; |
@@ -112,11 +112,11 @@ discard block |
||
112 | 112 | */ |
113 | 113 | public function reorderSaveActions($wantedOrder) |
114 | 114 | { |
115 | - if (! empty($this->availableSaveActions)) { |
|
115 | + if (!empty($this->availableSaveActions)) { |
|
116 | 116 | $lastOrder = max(array_column($this->availableSaveActions, 'order')); |
117 | 117 | foreach ($this->availableSaveActions as &$sv) { |
118 | 118 | if ($wantedOrder == $sv['order']) { |
119 | - if (empty(array_filter($this->availableSaveActions, function ($arr) { |
|
119 | + if (empty(array_filter($this->availableSaveActions, function($arr) { |
|
120 | 120 | $arr['order'] == 1; |
121 | 121 | }))) { |
122 | 122 | $sv['order'] = 1; |
@@ -241,12 +241,12 @@ discard block |
||
241 | 241 | } |
242 | 242 | |
243 | 243 | //get only passed permissions |
244 | - $saveOptions = array_filter($this->availableSaveActions, function ($saveOption) { |
|
244 | + $saveOptions = array_filter($this->availableSaveActions, function($saveOption) { |
|
245 | 245 | return $saveOption['permissions'] == true; |
246 | 246 | }, ARRAY_FILTER_USE_BOTH); |
247 | 247 | |
248 | 248 | //sort by order |
249 | - uasort($saveOptions, function ($a, $b) { |
|
249 | + uasort($saveOptions, function($a, $b) { |
|
250 | 250 | return $a['order'] <=> $b['order']; |
251 | 251 | }); |
252 | 252 | |
@@ -285,8 +285,7 @@ discard block |
||
285 | 285 | */ |
286 | 286 | public function setSaveAction($forceSaveAction = null) |
287 | 287 | { |
288 | - $saveAction = $forceSaveAction ?: |
|
289 | - \Request::input('save_action', $this->getFallBackSaveAction()); |
|
288 | + $saveAction = $forceSaveAction ?: \Request::input('save_action', $this->getFallBackSaveAction()); |
|
290 | 289 | |
291 | 290 | $showBubble = $this->getOperationSetting('showSaveActionChange') ?? config('backpack.crud.operations.'.$this->getCurrentOperation().'.showSaveActionChange') ?? true; |
292 | 291 | |
@@ -353,10 +352,10 @@ discard block |
||
353 | 352 | $defaultSaveActions = [ |
354 | 353 | [ |
355 | 354 | 'name' => 'save_and_back', |
356 | - 'permissions' => function ($crud) { |
|
355 | + 'permissions' => function($crud) { |
|
357 | 356 | return $crud->hasAccess('list'); |
358 | 357 | }, |
359 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
358 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
360 | 359 | return $request->has('http_referrer') ? $request->get('http_referrer') : $crud->route; |
361 | 360 | }, |
362 | 361 | 'button_text' => trans('backpack::crud.save_action_save_and_back'), |
@@ -364,10 +363,10 @@ discard block |
||
364 | 363 | ], |
365 | 364 | [ |
366 | 365 | 'name' => 'save_and_edit', |
367 | - 'permissions' => function ($crud) { |
|
366 | + 'permissions' => function($crud) { |
|
368 | 367 | return $crud->hasAccess('update'); |
369 | 368 | }, |
370 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
369 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
371 | 370 | $itemId = $itemId ?: $request->input('id'); |
372 | 371 | $redirectUrl = $crud->route.'/'.$itemId.'/edit'; |
373 | 372 | if ($request->has('locale')) { |
@@ -379,7 +378,7 @@ discard block |
||
379 | 378 | |
380 | 379 | return $redirectUrl; |
381 | 380 | }, |
382 | - 'referrer_url' => function ($crud, $request, $itemId) { |
|
381 | + 'referrer_url' => function($crud, $request, $itemId) { |
|
383 | 382 | return url($crud->route.'/'.$itemId.'/edit'); |
384 | 383 | }, |
385 | 384 | 'button_text' => trans('backpack::crud.save_action_save_and_edit'), |
@@ -387,10 +386,10 @@ discard block |
||
387 | 386 | ], |
388 | 387 | [ |
389 | 388 | 'name' => 'save_and_new', |
390 | - 'permissions' => function ($crud) { |
|
389 | + 'permissions' => function($crud) { |
|
391 | 390 | return $crud->hasAccess('create'); |
392 | 391 | }, |
393 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
392 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
394 | 393 | return $this->route.'/create'; |
395 | 394 | }, |
396 | 395 | 'button_text' => trans('backpack::crud.save_action_save_and_new'), |