We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function getSaveActionByOrder($order) |
48 | 48 | { |
49 | - return array_filter($this->getOperationSetting('save_actions'), function ($arr) use ($order) { |
|
49 | + return array_filter($this->getOperationSetting('save_actions'), function($arr) use ($order) { |
|
50 | 50 | return $arr['order'] == $order; |
51 | 51 | }); |
52 | 52 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | $orderCounter = $this->getOperationSetting('save_actions') !== null ? (count($this->getOperationSetting('save_actions')) + 1) : 1; |
81 | 81 | //check for some mandatory fields |
82 | 82 | $saveAction['name'] ?? abort(500, 'Please define save action name.'); |
83 | - $saveAction['redirect'] = $saveAction['redirect'] ?? function ($crud, $request, $itemId) { |
|
83 | + $saveAction['redirect'] = $saveAction['redirect'] ?? function($crud, $request, $itemId) { |
|
84 | 84 | return $request->has('http_referrer') ? $request->get('http_referrer') : $crud->route; |
85 | 85 | }; |
86 | 86 | $saveAction['visible'] = $saveAction['visible'] ?? true; |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | |
90 | 90 | $actions = $this->getOperationSetting('save_actions') ?? []; |
91 | 91 | |
92 | - if (! in_array($saveAction['name'], $actions)) { |
|
92 | + if (!in_array($saveAction['name'], $actions)) { |
|
93 | 93 | $actions[$saveAction['name']] = $saveAction; |
94 | 94 | } |
95 | 95 | |
@@ -106,7 +106,7 @@ discard block |
||
106 | 106 | public function orderSaveAction(string $saveAction, int $wantedOrder) |
107 | 107 | { |
108 | 108 | $actions = $this->getOperationSetting('save_actions') ?? []; |
109 | - if (! empty($actions)) { |
|
109 | + if (!empty($actions)) { |
|
110 | 110 | $replaceOrder = isset($actions[$saveAction]) ? $actions[$saveAction]['order'] : count($actions) + 1; |
111 | 111 | |
112 | 112 | foreach ($actions as $key => $sv) { |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | public function orderSaveActions(array $saveActions) |
198 | 198 | { |
199 | 199 | foreach ($saveActions as $sv => $order) { |
200 | - if (! is_int($order)) { |
|
200 | + if (!is_int($order)) { |
|
201 | 201 | $this->orderSaveAction($order, $sv + 1); |
202 | 202 | } else { |
203 | 203 | $this->orderSaveAction($sv, $order); |
@@ -214,7 +214,7 @@ discard block |
||
214 | 214 | { |
215 | 215 | $actions = $this->getOperationSetting('save_actions') ?? []; |
216 | 216 | |
217 | - uasort($actions, function ($a, $b) { |
|
217 | + uasort($actions, function($a, $b) { |
|
218 | 218 | return $a['order'] <=> $b['order']; |
219 | 219 | }); |
220 | 220 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | } |
237 | 237 | } |
238 | 238 | |
239 | - return array_filter($actions, function ($action) { |
|
239 | + return array_filter($actions, function($action) { |
|
240 | 240 | return $action['visible'] == true; |
241 | 241 | }, ARRAY_FILTER_USE_BOTH); |
242 | 242 | } |
@@ -300,8 +300,7 @@ discard block |
||
300 | 300 | */ |
301 | 301 | public function setSaveAction($forceSaveAction = null) |
302 | 302 | { |
303 | - $saveAction = $forceSaveAction ?: |
|
304 | - \Request::input('save_action', $this->getFallBackSaveAction()); |
|
303 | + $saveAction = $forceSaveAction ?: \Request::input('save_action', $this->getFallBackSaveAction()); |
|
305 | 304 | |
306 | 305 | $showBubble = $this->getOperationSetting('showSaveActionChange') ?? config('backpack.crud.operations.'.$this->getCurrentOperation().'.showSaveActionChange') ?? true; |
307 | 306 | |
@@ -369,20 +368,20 @@ discard block |
||
369 | 368 | $defaultSaveActions = [ |
370 | 369 | [ |
371 | 370 | 'name' => 'save_and_back', |
372 | - 'visible' => function ($crud) { |
|
371 | + 'visible' => function($crud) { |
|
373 | 372 | return $crud->hasAccess('list'); |
374 | 373 | }, |
375 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
374 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
376 | 375 | return $request->has('http_referrer') ? $request->get('http_referrer') : $crud->route; |
377 | 376 | }, |
378 | 377 | 'button_text' => trans('backpack::crud.save_action_save_and_back'), |
379 | 378 | ], |
380 | 379 | [ |
381 | 380 | 'name' => 'save_and_edit', |
382 | - 'visible' => function ($crud) { |
|
381 | + 'visible' => function($crud) { |
|
383 | 382 | return $crud->hasAccess('update'); |
384 | 383 | }, |
385 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
384 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
386 | 385 | $itemId = $itemId ?: $request->input('id'); |
387 | 386 | $redirectUrl = $crud->route.'/'.$itemId.'/edit'; |
388 | 387 | if ($request->has('locale')) { |
@@ -394,17 +393,17 @@ discard block |
||
394 | 393 | |
395 | 394 | return $redirectUrl; |
396 | 395 | }, |
397 | - 'referrer_url' => function ($crud, $request, $itemId) { |
|
396 | + 'referrer_url' => function($crud, $request, $itemId) { |
|
398 | 397 | return url($crud->route.'/'.$itemId.'/edit'); |
399 | 398 | }, |
400 | 399 | 'button_text' => trans('backpack::crud.save_action_save_and_edit'), |
401 | 400 | ], |
402 | 401 | [ |
403 | 402 | 'name' => 'save_and_new', |
404 | - 'visible' => function ($crud) { |
|
403 | + 'visible' => function($crud) { |
|
405 | 404 | return $crud->hasAccess('create'); |
406 | 405 | }, |
407 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
406 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
408 | 407 | return $this->route.'/create'; |
409 | 408 | }, |
410 | 409 | 'button_text' => trans('backpack::crud.save_action_save_and_new'), |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | /** |
156 | 156 | * Allow the developer to remove multiple save actions from settings. |
157 | 157 | * |
158 | - * @param array $saveActions |
|
158 | + * @param string[] $saveActions |
|
159 | 159 | * @return void |
160 | 160 | */ |
161 | 161 | public function removeSaveActions(array $saveActions) |
@@ -183,7 +183,6 @@ discard block |
||
183 | 183 | /** |
184 | 184 | * Allow the developer to unset all save actions. |
185 | 185 | * |
186 | - * @param string $saveAction |
|
187 | 186 | * @return void |
188 | 187 | */ |
189 | 188 | public function removeAllSaveActions() |
@@ -194,7 +193,7 @@ discard block |
||
194 | 193 | /** |
195 | 194 | * Allows the developer to set save actions order. It could be ['action1','action2'] or ['action1' => 1, 'action2' => 2]. |
196 | 195 | * |
197 | - * @param array $saveActions |
|
196 | + * @param string[] $saveActions |
|
198 | 197 | * @return void |
199 | 198 | */ |
200 | 199 | public function orderSaveActions(array $saveActions) |
@@ -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] ?? $value; |
15 | 15 | } else { |
16 | 16 | echo '-'; |
@@ -89,7 +89,7 @@ |
||
89 | 89 | /** |
90 | 90 | * Infer a field type, judging from the database column type. |
91 | 91 | * |
92 | - * @param string $field Field name. |
|
92 | + * @param string $fieldName Field name. |
|
93 | 93 | * |
94 | 94 | * @return string Field type. |
95 | 95 | */ |
@@ -12,12 +12,12 @@ discard block |
||
12 | 12 | */ |
13 | 13 | public function setFromDb() |
14 | 14 | { |
15 | - if (! $this->driverIsMongoDb()) { |
|
15 | + if (!$this->driverIsMongoDb()) { |
|
16 | 16 | $this->setDoctrineTypesMapping(); |
17 | 17 | $this->getDbColumnTypes(); |
18 | 18 | } |
19 | 19 | |
20 | - array_map(function ($field) { |
|
20 | + array_map(function($field) { |
|
21 | 21 | $new_field = [ |
22 | 22 | 'name' => $field, |
23 | 23 | 'label' => $this->makeLabel($field), |
@@ -29,11 +29,11 @@ discard block |
||
29 | 29 | 'autoset' => true, |
30 | 30 | ]; |
31 | 31 | |
32 | - if (! isset($this->fields()[$field])) { |
|
32 | + if (!isset($this->fields()[$field])) { |
|
33 | 33 | $this->addField($new_field); |
34 | 34 | } |
35 | 35 | |
36 | - if (! in_array($field, $this->model->getHidden()) && ! in_array($field, $this->columns())) { |
|
36 | + if (!in_array($field, $this->model->getHidden()) && !in_array($field, $this->columns())) { |
|
37 | 37 | $this->addColumn([ |
38 | 38 | 'name' => $field, |
39 | 39 | 'label' => $this->makeLabel($field), |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | $dbColumnTypes = $this->getDbColumnTypes(); |
107 | 107 | |
108 | - if (! isset($dbColumnTypes[$fieldName])) { |
|
108 | + if (!isset($dbColumnTypes[$fieldName])) { |
|
109 | 109 | return 'text'; |
110 | 110 | } |
111 | 111 | |
@@ -163,7 +163,7 @@ discard block |
||
163 | 163 | $types = ['enum' => 'string']; |
164 | 164 | $platform = $this->getSchema()->getConnection()->getDoctrineConnection()->getDatabasePlatform(); |
165 | 165 | foreach ($types as $type_key => $type_value) { |
166 | - if (! $platform->hasDoctrineTypeMappingFor($type_key)) { |
|
166 | + if (!$platform->hasDoctrineTypeMappingFor($type_key)) { |
|
167 | 167 | $platform->registerDoctrineTypeMapping($type_key, $type_value); |
168 | 168 | } |
169 | 169 | } |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | // Automatically-set columns should be both in the database, and in the $fillable variable on the Eloquent Model |
223 | 223 | $columns = $this->model->getConnection()->getSchemaBuilder()->getColumnListing($this->model->getTable()); |
224 | 224 | |
225 | - if (! empty($fillable)) { |
|
225 | + if (!empty($fillable)) { |
|
226 | 226 | $columns = array_intersect($columns, $fillable); |
227 | 227 | } |
228 | 228 | } |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | // make sure the column has a priority in terms of visibility |
52 | 52 | // if no priority has been defined, use the order in the array plus one |
53 | - if (! array_key_exists('priority', $column)) { |
|
53 | + if (!array_key_exists('priority', $column)) { |
|
54 | 54 | $position_in_columns_array = (int) array_search($column['key'], array_keys($this->columns())); |
55 | 55 | $allColumns[$column['key']]['priority'] = $position_in_columns_array + 1; |
56 | 56 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | $column = ['name' => $column]; |
72 | 72 | } |
73 | 73 | |
74 | - if (is_array($column) && ! isset($column['name'])) { |
|
74 | + if (is_array($column) && !isset($column['name'])) { |
|
75 | 75 | $column['name'] = 'anonymous_column_'.Str::random(5); |
76 | 76 | } |
77 | 77 | |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | */ |
88 | 88 | protected function makeSureColumnHasLabel($column) |
89 | 89 | { |
90 | - if (! isset($column['label'])) { |
|
90 | + if (!isset($column['label'])) { |
|
91 | 91 | $column['label'] = mb_ucfirst($this->makeLabel($column['name'])); |
92 | 92 | } |
93 | 93 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | */ |
103 | 103 | protected function makeSureColumnHasType($column) |
104 | 104 | { |
105 | - if (! isset($column['type'])) { |
|
105 | + if (!isset($column['type'])) { |
|
106 | 106 | $column['type'] = 'text'; |
107 | 107 | } |
108 | 108 | |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | */ |
120 | 120 | protected function makeSureColumnHasKey($column) |
121 | 121 | { |
122 | - if (! isset($column['key'])) { |
|
122 | + if (!isset($column['key'])) { |
|
123 | 123 | $column['key'] = str_replace('.', '__', $column['name']); |
124 | 124 | } |
125 | 125 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | { |
138 | 138 | // if this is a relation type field and no corresponding model was specified, |
139 | 139 | // get it from the relation method defined in the main model |
140 | - if (isset($column['entity']) && ! isset($column['model'])) { |
|
140 | + if (isset($column['entity']) && !isset($column['model'])) { |
|
141 | 141 | $column['model'] = $this->getRelationModel($column['entity']); |
142 | 142 | } |
143 | 143 | |
@@ -158,8 +158,7 @@ discard block |
||
158 | 158 | $columnsArray = $this->columns(); |
159 | 159 | |
160 | 160 | if (array_key_exists($targetColumnName, $columnsArray)) { |
161 | - $targetColumnPosition = $before ? array_search($targetColumnName, array_keys($columnsArray)) : |
|
162 | - array_search($targetColumnName, array_keys($columnsArray)) + 1; |
|
161 | + $targetColumnPosition = $before ? array_search($targetColumnName, array_keys($columnsArray)) : array_search($targetColumnName, array_keys($columnsArray)) + 1; |
|
163 | 162 | |
164 | 163 | $element = array_pop($columnsArray); |
165 | 164 | $beginningPart = array_slice($columnsArray, 0, $targetColumnPosition, true); |
@@ -21,10 +21,10 @@ discard block |
||
21 | 21 | |
22 | 22 | $this->singleSaveAction = [ |
23 | 23 | 'name' => 'save_action_one', |
24 | - 'redirect' => function ($crud, $request, $itemId) { |
|
24 | + 'redirect' => function($crud, $request, $itemId) { |
|
25 | 25 | return $crud->route; |
26 | 26 | }, |
27 | - 'visible' => function ($crud) { |
|
27 | + 'visible' => function($crud) { |
|
28 | 28 | return true; |
29 | 29 | }, |
30 | 30 | ]; |
@@ -32,19 +32,19 @@ discard block |
||
32 | 32 | $this->multipleSaveActions = [ |
33 | 33 | [ |
34 | 34 | 'name' => 'save_action_one', |
35 | - 'redirect' => function ($crud, $request, $itemId) { |
|
35 | + 'redirect' => function($crud, $request, $itemId) { |
|
36 | 36 | return $crud->route; |
37 | 37 | }, |
38 | - 'visible' => function ($crud) { |
|
38 | + 'visible' => function($crud) { |
|
39 | 39 | return true; |
40 | 40 | }, |
41 | 41 | ], |
42 | 42 | [ |
43 | 43 | 'name' => 'save_action_two', |
44 | - 'redirect' => function ($crud, $request, $itemId) { |
|
44 | + 'redirect' => function($crud, $request, $itemId) { |
|
45 | 45 | return $crud->route; |
46 | 46 | }, |
47 | - 'visible' => function ($crud) { |
|
47 | + 'visible' => function($crud) { |
|
48 | 48 | return true; |
49 | 49 | }, |
50 | 50 | ], |
@@ -67,7 +67,7 @@ |
||
67 | 67 | /** |
68 | 68 | * Gets the relation data from the method in the model. |
69 | 69 | * |
70 | - * @param ReflectionMethod $method |
|
70 | + * @param \ReflectionMethod $method |
|
71 | 71 | * @return array |
72 | 72 | */ |
73 | 73 | public function inferFieldAttributesFromRelationship($method) |
@@ -24,7 +24,7 @@ |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | if (in_array($fieldName, array_column($relations, 'name'))) { |
27 | - return array_filter($relations, function ($arr) use ($fieldName) { |
|
27 | + return array_filter($relations, function($arr) use ($fieldName) { |
|
28 | 28 | if (isset($arr['name'])) { |
29 | 29 | return $arr['name'] == $fieldName; |
30 | 30 | } |
@@ -49,7 +49,7 @@ |
||
49 | 49 | */ |
50 | 50 | public function getInlineCreateModal() |
51 | 51 | { |
52 | - if (! request()->has('entity')) { |
|
52 | + if (!request()->has('entity')) { |
|
53 | 53 | abort(400, 'No "entity" inside the request.'); |
54 | 54 | } |
55 | 55 |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | // otherwise assume the arguments are actually the configuration array |
46 | 46 | $config = []; |
47 | 47 | |
48 | - if (! is_array($arg)) { |
|
49 | - if (! class_exists($arg)) { |
|
48 | + if (!is_array($arg)) { |
|
49 | + if (!class_exists($arg)) { |
|
50 | 50 | return response()->json(['error' => 'Class: '.$arg.' does not exists'], 500); |
51 | 51 | } |
52 | 52 | $config['model'] = $arg; |
@@ -65,8 +65,7 @@ discard block |
||
65 | 65 | |
66 | 66 | if ($searchString === false) { |
67 | 67 | return ($config['paginate'] !== false) ? |
68 | - $config['query']->paginate($config['paginate']) : |
|
69 | - $config['query']->get(); |
|
68 | + $config['query']->paginate($config['paginate']) : $config['query']->get(); |
|
70 | 69 | } |
71 | 70 | |
72 | 71 | // for each searchable attribute, add a WHERE clause |
@@ -83,7 +82,6 @@ discard block |
||
83 | 82 | |
84 | 83 | // return the results with or without pagination |
85 | 84 | return ($config['paginate'] !== false) ? |
86 | - $config['query']->paginate($config['paginate']) : |
|
87 | - $config['query']->get(); |
|
85 | + $config['query']->paginate($config['paginate']) : $config['query']->get(); |
|
88 | 86 | } |
89 | 87 | } |
@@ -123,7 +123,7 @@ |
||
123 | 123 | * The user has been authenticated. |
124 | 124 | * |
125 | 125 | * @param \Illuminate\Http\Request $request |
126 | - * @param mixed $user |
|
126 | + * @param \Illuminate\Contracts\Auth\Authenticatable|null $user |
|
127 | 127 | * @return mixed |
128 | 128 | */ |
129 | 129 | protected function authenticated(Request $request, $user) |