We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -102,11 +102,11 @@ discard block |
||
102 | 102 | */ |
103 | 103 | public function setModel($model_namespace) |
104 | 104 | { |
105 | - if (! class_exists($model_namespace)) { |
|
105 | + if (!class_exists($model_namespace)) { |
|
106 | 106 | throw new \Exception('The model does not exist.', 500); |
107 | 107 | } |
108 | 108 | |
109 | - if (! method_exists($model_namespace, 'hasCrudTrait')) { |
|
109 | + if (!method_exists($model_namespace, 'hasCrudTrait')) { |
|
110 | 110 | throw new \Exception('Please use CrudTrait on the model.', 500); |
111 | 111 | } |
112 | 112 | |
@@ -195,7 +195,7 @@ discard block |
||
195 | 195 | { |
196 | 196 | $complete_route = $route.'.index'; |
197 | 197 | |
198 | - if (! \Route::has($complete_route)) { |
|
198 | + if (!\Route::has($complete_route)) { |
|
199 | 199 | throw new \Exception('There are no routes for this route name.', 404); |
200 | 200 | } |
201 | 201 | |
@@ -293,7 +293,7 @@ discard block |
||
293 | 293 | */ |
294 | 294 | public function getFirstOfItsTypeInArray($type, $array) |
295 | 295 | { |
296 | - return Arr::first($array, function ($item) use ($type) { |
|
296 | + return Arr::first($array, function($item) use ($type) { |
|
297 | 297 | return $item['type'] == $type; |
298 | 298 | }); |
299 | 299 | } |
@@ -310,8 +310,8 @@ discard block |
||
310 | 310 | |
311 | 311 | public function sync($type, $fields, $attributes) |
312 | 312 | { |
313 | - if (! empty($this->{$type})) { |
|
314 | - $this->{$type} = array_map(function ($field) use ($fields, $attributes) { |
|
313 | + if (!empty($this->{$type})) { |
|
314 | + $this->{$type} = array_map(function($field) use ($fields, $attributes) { |
|
315 | 315 | if (in_array($field['name'], (array) $fields)) { |
316 | 316 | $field = array_merge($field, $attributes); |
317 | 317 | } |
@@ -341,15 +341,15 @@ discard block |
||
341 | 341 | { |
342 | 342 | $relationArray = explode('.', $relationString); |
343 | 343 | |
344 | - if (! isset($length)) { |
|
344 | + if (!isset($length)) { |
|
345 | 345 | $length = count($relationArray); |
346 | 346 | } |
347 | 347 | |
348 | - if (! isset($model)) { |
|
348 | + if (!isset($model)) { |
|
349 | 349 | $model = $this->model; |
350 | 350 | } |
351 | 351 | |
352 | - $result = array_reduce(array_splice($relationArray, 0, $length), function ($obj, $method) { |
|
352 | + $result = array_reduce(array_splice($relationArray, 0, $length), function($obj, $method) { |
|
353 | 353 | try { |
354 | 354 | $result = $obj->$method(); |
355 | 355 | |
@@ -384,7 +384,7 @@ discard block |
||
384 | 384 | if (is_array($entries)) { |
385 | 385 | //if attribute does not exist in main array we have more than one entry OR the attribute |
386 | 386 | //is an acessor that is not in $appends property of model. |
387 | - if (! isset($entries[$attribute])) { |
|
387 | + if (!isset($entries[$attribute])) { |
|
388 | 388 | //we first check if we don't have the attribute because it's an acessor that is not in appends. |
389 | 389 | if ($model_instance->hasGetMutator($attribute) && isset($entries[$modelKey])) { |
390 | 390 | $entry_in_database = $model_instance->find($entries[$modelKey]); |
@@ -423,21 +423,21 @@ discard block |
||
423 | 423 | */ |
424 | 424 | public function parseTranslatableAttributes($model, $attribute, $value) |
425 | 425 | { |
426 | - if (! method_exists($model, 'isTranslatableAttribute')) { |
|
426 | + if (!method_exists($model, 'isTranslatableAttribute')) { |
|
427 | 427 | return $value; |
428 | 428 | } |
429 | 429 | |
430 | - if (! $model->isTranslatableAttribute($attribute)) { |
|
430 | + if (!$model->isTranslatableAttribute($attribute)) { |
|
431 | 431 | return $value; |
432 | 432 | } |
433 | 433 | |
434 | - if (! is_array($value)) { |
|
434 | + if (!is_array($value)) { |
|
435 | 435 | $decodedAttribute = json_decode($value, true); |
436 | 436 | } else { |
437 | 437 | $decodedAttribute = $value; |
438 | 438 | } |
439 | 439 | |
440 | - if (is_array($decodedAttribute) && ! empty($decodedAttribute)) { |
|
440 | + if (is_array($decodedAttribute) && !empty($decodedAttribute)) { |
|
441 | 441 | if (isset($decodedAttribute[app()->getLocale()])) { |
442 | 442 | return $decodedAttribute[app()->getLocale()]; |
443 | 443 | } else { |
@@ -463,7 +463,7 @@ discard block |
||
463 | 463 | $relation = $model->{$firstRelationName}; |
464 | 464 | |
465 | 465 | $results = []; |
466 | - if (! is_null($relation)) { |
|
466 | + if (!is_null($relation)) { |
|
467 | 467 | if ($relation instanceof Collection) { |
468 | 468 | $currentResults = $relation->all(); |
469 | 469 | } elseif (is_array($relation)) { |
@@ -476,7 +476,7 @@ discard block |
||
476 | 476 | |
477 | 477 | array_shift($relationArray); |
478 | 478 | |
479 | - if (! empty($relationArray)) { |
|
479 | + if (!empty($relationArray)) { |
|
480 | 480 | foreach ($currentResults as $currentResult) { |
481 | 481 | $results = array_merge_recursive($results, $this->getRelatedEntries($currentResult, implode('.', $relationArray))); |
482 | 482 | } |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | $higherAction = $this->getSaveActionByOrder(1); |
29 | 29 | |
30 | 30 | //if there is an higher action and that action is not the backpack default higher one `save_and_back` we return it. |
31 | - if (! empty($higherAction) && key($higherAction) !== 'save_and_back') { |
|
31 | + if (!empty($higherAction) && key($higherAction) !== 'save_and_back') { |
|
32 | 32 | return key($higherAction); |
33 | 33 | } |
34 | 34 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | */ |
48 | 48 | public function getSaveActionByOrder($order) |
49 | 49 | { |
50 | - return array_filter($this->getOperationSetting('save_actions'), function ($arr) use ($order) { |
|
50 | + return array_filter($this->getOperationSetting('save_actions'), function($arr) use ($order) { |
|
51 | 51 | return $arr['order'] == $order; |
52 | 52 | }); |
53 | 53 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | $orderCounter = $this->getOperationSetting('save_actions') !== null ? (count($this->getOperationSetting('save_actions')) + 1) : 1; |
82 | 82 | //check for some mandatory fields |
83 | 83 | $saveAction['name'] ?? abort(500, 'Please define save action name.'); |
84 | - $saveAction['redirect'] = $saveAction['redirect'] ?? function ($crud, $request, $itemId) { |
|
84 | + $saveAction['redirect'] = $saveAction['redirect'] ?? function($crud, $request, $itemId) { |
|
85 | 85 | return $request->has('_http_referrer') ? $request->get('_http_referrer') : $crud->route; |
86 | 86 | }; |
87 | 87 | $saveAction['visible'] = $saveAction['visible'] ?? true; |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | |
91 | 91 | $actions = $this->getOperationSetting('save_actions') ?? []; |
92 | 92 | |
93 | - if (! in_array($saveAction['name'], $actions)) { |
|
93 | + if (!in_array($saveAction['name'], $actions)) { |
|
94 | 94 | $actions[$saveAction['name']] = $saveAction; |
95 | 95 | } |
96 | 96 | |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | public function orderSaveAction(string $saveAction, int $wantedOrder) |
108 | 108 | { |
109 | 109 | $actions = $this->getOperationSetting('save_actions') ?? []; |
110 | - if (! empty($actions)) { |
|
110 | + if (!empty($actions)) { |
|
111 | 111 | $replaceOrder = isset($actions[$saveAction]) ? $actions[$saveAction]['order'] : count($actions) + 1; |
112 | 112 | |
113 | 113 | foreach ($actions as $key => $sv) { |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | public function orderSaveActions(array $saveActions) |
202 | 202 | { |
203 | 203 | foreach ($saveActions as $sv => $order) { |
204 | - if (! is_int($order)) { |
|
204 | + if (!is_int($order)) { |
|
205 | 205 | $this->orderSaveAction($order, $sv + 1); |
206 | 206 | } else { |
207 | 207 | $this->orderSaveAction($sv, $order); |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | { |
219 | 219 | $actions = $this->getOperationSetting('save_actions') ?? []; |
220 | 220 | |
221 | - uasort($actions, function ($a, $b) { |
|
221 | + uasort($actions, function($a, $b) { |
|
222 | 222 | return $a['order'] <=> $b['order']; |
223 | 223 | }); |
224 | 224 | |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | } |
241 | 241 | } |
242 | 242 | |
243 | - return array_filter($actions, function ($action) { |
|
243 | + return array_filter($actions, function($action) { |
|
244 | 244 | return $action['visible'] == true; |
245 | 245 | }, ARRAY_FILTER_USE_BOTH); |
246 | 246 | } |
@@ -303,8 +303,7 @@ discard block |
||
303 | 303 | */ |
304 | 304 | public function setSaveAction($forceSaveAction = null) |
305 | 305 | { |
306 | - $saveAction = $forceSaveAction ?: |
|
307 | - \Request::input('_save_action', $this->getFallBackSaveAction()); |
|
306 | + $saveAction = $forceSaveAction ?: \Request::input('_save_action', $this->getFallBackSaveAction()); |
|
308 | 307 | |
309 | 308 | $showBubble = $this->getOperationSetting('showSaveActionChange') ?? config('backpack.crud.operations.'.$this->getCurrentOperation().'.showSaveActionChange') ?? true; |
310 | 309 | |
@@ -371,20 +370,20 @@ discard block |
||
371 | 370 | $defaultSaveActions = [ |
372 | 371 | [ |
373 | 372 | 'name' => 'save_and_back', |
374 | - 'visible' => function ($crud) { |
|
373 | + 'visible' => function($crud) { |
|
375 | 374 | return $crud->hasAccess('list'); |
376 | 375 | }, |
377 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
376 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
378 | 377 | return $request->has('_http_referrer') ? $request->get('_http_referrer') : $crud->route; |
379 | 378 | }, |
380 | 379 | 'button_text' => trans('backpack::crud.save_action_save_and_back'), |
381 | 380 | ], |
382 | 381 | [ |
383 | 382 | 'name' => 'save_and_edit', |
384 | - 'visible' => function ($crud) { |
|
383 | + 'visible' => function($crud) { |
|
385 | 384 | return $crud->hasAccess('update'); |
386 | 385 | }, |
387 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
386 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
388 | 387 | $itemId = $itemId ?: $request->input('id'); |
389 | 388 | $redirectUrl = $crud->route.'/'.$itemId.'/edit'; |
390 | 389 | if ($request->has('_locale')) { |
@@ -396,17 +395,17 @@ discard block |
||
396 | 395 | |
397 | 396 | return $redirectUrl; |
398 | 397 | }, |
399 | - 'referrer_url' => function ($crud, $request, $itemId) { |
|
398 | + 'referrer_url' => function($crud, $request, $itemId) { |
|
400 | 399 | return url($crud->route.'/'.$itemId.'/edit'); |
401 | 400 | }, |
402 | 401 | 'button_text' => trans('backpack::crud.save_action_save_and_edit'), |
403 | 402 | ], |
404 | 403 | [ |
405 | 404 | 'name' => 'save_and_new', |
406 | - 'visible' => function ($crud) { |
|
405 | + 'visible' => function($crud) { |
|
407 | 406 | return $crud->hasAccess('create'); |
408 | 407 | }, |
409 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
408 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
410 | 409 | return $this->route.'/create'; |
411 | 410 | }, |
412 | 411 | 'button_text' => trans('backpack::crud.save_action_save_and_new'), |
@@ -58,18 +58,18 @@ discard block |
||
58 | 58 | public function register() |
59 | 59 | { |
60 | 60 | // Bind the CrudPanel object to Laravel's service container |
61 | - $this->app->singleton('crud', function ($app) { |
|
61 | + $this->app->singleton('crud', function($app) { |
|
62 | 62 | return new CrudPanel($app); |
63 | 63 | }); |
64 | 64 | |
65 | 65 | // Bind the widgets collection object to Laravel's service container |
66 | - $this->app->singleton('widgets', function ($app) { |
|
66 | + $this->app->singleton('widgets', function($app) { |
|
67 | 67 | return new Collection(); |
68 | 68 | }); |
69 | 69 | |
70 | 70 | // load a macro for Route, |
71 | 71 | // helps developers load all routes for a CRUD resource in one line |
72 | - if (! Route::hasMacro('crud')) { |
|
72 | + if (!Route::hasMacro('crud')) { |
|
73 | 73 | $this->addRouteMacro(); |
74 | 74 | } |
75 | 75 | |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | $middleware_key = config('backpack.base.middleware_key'); |
86 | 86 | $middleware_class = config('backpack.base.middleware_class'); |
87 | 87 | |
88 | - if (! is_array($middleware_class)) { |
|
88 | + if (!is_array($middleware_class)) { |
|
89 | 89 | $router->pushMiddlewareToGroup($middleware_key, $middleware_class); |
90 | 90 | |
91 | 91 | return; |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | */ |
188 | 188 | private function addRouteMacro() |
189 | 189 | { |
190 | - Route::macro('crud', function ($name, $controller) { |
|
190 | + Route::macro('crud', function($name, $controller) { |
|
191 | 191 | // put together the route name prefix, |
192 | 192 | // as passed to the Route::group() statements |
193 | 193 | $routeName = ''; |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | $operationConfigs = scandir(__DIR__.'/config/backpack/operations/'); |
243 | 243 | $operationConfigs = array_diff($operationConfigs, ['.', '..']); |
244 | 244 | |
245 | - if (! count($operationConfigs)) { |
|
245 | + if (!count($operationConfigs)) { |
|
246 | 246 | return; |
247 | 247 | } |
248 | 248 |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | $this->getDbColumnTypes(); |
17 | 17 | } |
18 | 18 | |
19 | - array_map(function ($field) use ($setFields, $setColumns) { |
|
20 | - if ($setFields && ! isset($this->getCleanStateFields()[$field])) { |
|
19 | + array_map(function($field) use ($setFields, $setColumns) { |
|
20 | + if ($setFields && !isset($this->getCleanStateFields()[$field])) { |
|
21 | 21 | $this->addField([ |
22 | 22 | 'name' => $field, |
23 | 23 | 'label' => $this->makeLabel($field), |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | ]); |
31 | 31 | } |
32 | 32 | |
33 | - if ($setColumns && ! in_array($field, $this->model->getHidden()) && ! isset($this->columns()[$field])) { |
|
33 | + if ($setColumns && !in_array($field, $this->model->getHidden()) && !isset($this->columns()[$field])) { |
|
34 | 34 | $this->addColumn([ |
35 | 35 | 'name' => $field, |
36 | 36 | 'label' => $this->makeLabel($field), |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | |
108 | 108 | $dbColumnTypes = $this->getDbColumnTypes(); |
109 | 109 | |
110 | - if (! isset($dbColumnTypes[$fieldName])) { |
|
110 | + if (!isset($dbColumnTypes[$fieldName])) { |
|
111 | 111 | return 'text'; |
112 | 112 | } |
113 | 113 | |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | $types = ['enum' => 'string']; |
166 | 166 | $platform = $this->getSchema()->getConnection()->getDoctrineSchemaManager()->getDatabasePlatform(); |
167 | 167 | foreach ($types as $type_key => $type_value) { |
168 | - if (! $platform->hasDoctrineTypeMappingFor($type_key)) { |
|
168 | + if (!$platform->hasDoctrineTypeMappingFor($type_key)) { |
|
169 | 169 | $platform->registerDoctrineTypeMapping($type_key, $type_value); |
170 | 170 | } |
171 | 171 | } |
@@ -216,13 +216,13 @@ discard block |
||
216 | 216 | { |
217 | 217 | $fillable = $this->model->getFillable(); |
218 | 218 | |
219 | - if (! $this->driverIsSql()) { |
|
219 | + if (!$this->driverIsSql()) { |
|
220 | 220 | $columns = $fillable; |
221 | 221 | } else { |
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 | } |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $column = ['name' => $column]; |
50 | 50 | } |
51 | 51 | |
52 | - if (is_array($column) && ! isset($column['name'])) { |
|
52 | + if (is_array($column) && !isset($column['name'])) { |
|
53 | 53 | $column['name'] = 'anonymous_column_'.Str::random(5); |
54 | 54 | } |
55 | 55 | |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | */ |
66 | 66 | protected function makeSureColumnHasLabel($column) |
67 | 67 | { |
68 | - if (! isset($column['label'])) { |
|
68 | + if (!isset($column['label'])) { |
|
69 | 69 | $column['label'] = mb_ucfirst($this->makeLabel($column['name'])); |
70 | 70 | } |
71 | 71 | |
@@ -146,7 +146,7 @@ discard block |
||
146 | 146 | */ |
147 | 147 | protected function makeSureColumnHasKey($column) |
148 | 148 | { |
149 | - if (! isset($column['key'])) { |
|
149 | + if (!isset($column['key'])) { |
|
150 | 150 | $column['key'] = str_replace('.', '__', $column['name']); |
151 | 151 | } |
152 | 152 | |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | */ |
165 | 165 | protected function makeSureColumnHasWrapper($column) |
166 | 166 | { |
167 | - if (! isset($column['wrapper'])) { |
|
167 | + if (!isset($column['wrapper'])) { |
|
168 | 168 | $column['wrapper'] = []; |
169 | 169 | } |
170 | 170 | |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | { |
256 | 256 | // if this is a relation type field and no corresponding model was specified, |
257 | 257 | // get it from the relation method defined in the main model |
258 | - if (isset($column['entity']) && $column['entity'] !== false && ! isset($column['model'])) { |
|
258 | + if (isset($column['entity']) && $column['entity'] !== false && !isset($column['model'])) { |
|
259 | 259 | $column['model'] = $this->getRelationModel($column['entity']); |
260 | 260 | } |
261 | 261 | |
@@ -276,8 +276,7 @@ discard block |
||
276 | 276 | $columnsArray = $this->columns(); |
277 | 277 | |
278 | 278 | if (array_key_exists($targetColumnName, $columnsArray)) { |
279 | - $targetColumnPosition = $before ? array_search($targetColumnName, array_keys($columnsArray)) : |
|
280 | - array_search($targetColumnName, array_keys($columnsArray)) + 1; |
|
279 | + $targetColumnPosition = $before ? array_search($targetColumnName, array_keys($columnsArray)) : array_search($targetColumnName, array_keys($columnsArray)) + 1; |
|
281 | 280 | |
282 | 281 | $element = array_pop($columnsArray); |
283 | 282 | $beginningPart = array_slice($columnsArray, 0, $targetColumnPosition, true); |
@@ -299,7 +298,7 @@ discard block |
||
299 | 298 | { |
300 | 299 | static $cache = []; |
301 | 300 | |
302 | - if (! $this->driverIsSql()) { |
|
301 | + if (!$this->driverIsSql()) { |
|
303 | 302 | return true; |
304 | 303 | } |
305 | 304 |
@@ -30,25 +30,25 @@ |
||
30 | 30 | $this->crud->allowAccess('show'); |
31 | 31 | $this->crud->setOperationSetting('setFromDb', true); |
32 | 32 | |
33 | - $this->crud->operation('show', function () { |
|
33 | + $this->crud->operation('show', function() { |
|
34 | 34 | $this->crud->loadDefaultOperationSettingsFromConfig(); |
35 | 35 | |
36 | - if (! method_exists($this, 'setupShowOperation')) { |
|
36 | + if (!method_exists($this, 'setupShowOperation')) { |
|
37 | 37 | $this->autoSetupShowOperation(); |
38 | 38 | } |
39 | 39 | }); |
40 | 40 | |
41 | - $this->crud->operation('list', function () { |
|
41 | + $this->crud->operation('list', function() { |
|
42 | 42 | $this->crud->addButton('line', 'show', 'view', 'crud::buttons.show', 'beginning'); |
43 | 43 | }); |
44 | 44 | |
45 | - $this->crud->operation(['create', 'update'], function () { |
|
45 | + $this->crud->operation(['create', 'update'], function() { |
|
46 | 46 | $this->crud->addSaveAction([ |
47 | 47 | 'name' => 'save_and_preview', |
48 | - 'visible' => function ($crud) { |
|
48 | + 'visible' => function($crud) { |
|
49 | 49 | return $crud->hasAccess('show'); |
50 | 50 | }, |
51 | - 'redirect' => function ($crud, $request, $itemId = null) { |
|
51 | + 'redirect' => function($crud, $request, $itemId = null) { |
|
52 | 52 | $itemId = $itemId ?: $request->input('id'); |
53 | 53 | $redirectUrl = $crud->route.'/'.$itemId.'/show'; |
54 | 54 | if ($request->has('_locale')) { |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | [$conn, $table] = self::getConnectionAndTable(); |
68 | 68 | |
69 | 69 | // MongoDB columns are alway nullable |
70 | - if (! in_array($conn->getConfig()['driver'], CRUD::getSqlDriverList())) { |
|
70 | + if (!in_array($conn->getConfig()['driver'], CRUD::getSqlDriverList())) { |
|
71 | 71 | return true; |
72 | 72 | } |
73 | 73 | |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | // check for NOT NULL |
78 | 78 | $notNull = $column->getNotnull(); |
79 | 79 | // return the value of nullable (aka the inverse of NOT NULL) |
80 | - return ! $notNull; |
|
80 | + return !$notNull; |
|
81 | 81 | } catch (\Exception $e) { |
82 | 82 | return true; |
83 | 83 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | [$conn, $table] = self::getConnectionAndTable(); |
95 | 95 | |
96 | 96 | // MongoDB columns don't have default values |
97 | - if (! in_array($conn->getConfig()['driver'], CRUD::getSqlDriverList())) { |
|
97 | + if (!in_array($conn->getConfig()['driver'], CRUD::getSqlDriverList())) { |
|
98 | 98 | return false; |
99 | 99 | } |
100 | 100 |
@@ -29,10 +29,10 @@ discard block |
||
29 | 29 | // construct the validation rules array |
30 | 30 | // (eg. ['name' => 'required|min:2']) |
31 | 31 | $rules = collect($fields) |
32 | - ->filter(function ($value, $key) { |
|
32 | + ->filter(function($value, $key) { |
|
33 | 33 | // only keep fields where 'validationRules' attribute is defined |
34 | 34 | return array_key_exists('validationRules', $value); |
35 | - })->map(function ($item, $key) { |
|
35 | + })->map(function($item, $key) { |
|
36 | 36 | // only keep the rules, not the entire field definition |
37 | 37 | return $item['validationRules']; |
38 | 38 | })->toArray(); |
@@ -41,10 +41,10 @@ discard block |
||
41 | 41 | // (eg. ['title.required' => 'You gotta write smth man.']) |
42 | 42 | $messages = []; |
43 | 43 | collect($fields) |
44 | - ->filter(function ($value, $key) { |
|
44 | + ->filter(function($value, $key) { |
|
45 | 45 | // only keep fields where 'validationMessages' attribute is defined |
46 | 46 | return array_key_exists('validationMessages', $value); |
47 | - })->each(function ($item, $key) use (&$messages) { |
|
47 | + })->each(function($item, $key) use (&$messages) { |
|
48 | 48 | foreach ($item['validationMessages'] as $rule => $message) { |
49 | 49 | $messages[$key.'.'.$rule] = $message; |
50 | 50 | } |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function setValidation($classOrRulesArray = false, $messages = []) |
76 | 76 | { |
77 | - if (! $classOrRulesArray) { |
|
77 | + if (!$classOrRulesArray) { |
|
78 | 78 | $this->setValidationFromFields(); |
79 | 79 | } elseif (is_array($classOrRulesArray)) { |
80 | 80 | $this->setValidationFromArray($classOrRulesArray, $messages); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | */ |
203 | 203 | public function isRequired($inputKey) |
204 | 204 | { |
205 | - if (! $this->hasOperationSetting('requiredFields')) { |
|
205 | + if (!$this->hasOperationSetting('requiredFields')) { |
|
206 | 206 | return false; |
207 | 207 | } |
208 | 208 |
@@ -33,35 +33,35 @@ |
||
33 | 33 | $old_primary_dependency = old_empty_or_null($primary_dependency['name'], false) ?? false; |
34 | 34 | $old_secondary_dependency = old_empty_or_null($secondary_dependency['name'], false) ?? false; |
35 | 35 | |
36 | - //for update form, get initial state of the entity |
|
37 | - if (isset($id) && $id) { |
|
36 | + //for update form, get initial state of the entity |
|
37 | + if (isset($id) && $id) { |
|
38 | 38 | |
39 | 39 | //get entity with relations for primary dependency |
40 | - $entity_dependencies = $entity_model->with($primary_dependency['entity']) |
|
41 | - ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary']) |
|
42 | - ->find($id); |
|
40 | + $entity_dependencies = $entity_model->with($primary_dependency['entity']) |
|
41 | + ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary']) |
|
42 | + ->find($id); |
|
43 | 43 | |
44 | - $secondaries_from_primary = []; |
|
44 | + $secondaries_from_primary = []; |
|
45 | 45 | |
46 | - //convert relation in array |
|
47 | - $primary_array = $entity_dependencies->{$primary_dependency['entity']}->toArray(); |
|
46 | + //convert relation in array |
|
47 | + $primary_array = $entity_dependencies->{$primary_dependency['entity']}->toArray(); |
|
48 | 48 | |
49 | - $secondary_ids = []; |
|
50 | - //create secondary dependency from primary relation, used to check what checkbox must be checked from second checklist |
|
51 | - if ($old_primary_dependency) { |
|
52 | - foreach ($old_primary_dependency as $primary_item) { |
|
53 | - foreach ($dependencyArray[$primary_item] as $second_item) { |
|
54 | - $secondary_ids[$second_item] = $second_item; |
|
55 | - } |
|
56 | - } |
|
57 | - } else { //create dependencies from relation if not from validate error |
|
58 | - foreach ($primary_array as $primary_item) { |
|
59 | - foreach ($primary_item[$secondary_dependency['entity']] as $second_item) { |
|
60 | - $secondary_ids[$second_item['id']] = $second_item['id']; |
|
61 | - } |
|
62 | - } |
|
63 | - } |
|
64 | - } |
|
49 | + $secondary_ids = []; |
|
50 | + //create secondary dependency from primary relation, used to check what checkbox must be checked from second checklist |
|
51 | + if ($old_primary_dependency) { |
|
52 | + foreach ($old_primary_dependency as $primary_item) { |
|
53 | + foreach ($dependencyArray[$primary_item] as $second_item) { |
|
54 | + $secondary_ids[$second_item] = $second_item; |
|
55 | + } |
|
56 | + } |
|
57 | + } else { //create dependencies from relation if not from validate error |
|
58 | + foreach ($primary_array as $primary_item) { |
|
59 | + foreach ($primary_item[$secondary_dependency['entity']] as $second_item) { |
|
60 | + $secondary_ids[$second_item['id']] = $second_item['id']; |
|
61 | + } |
|
62 | + } |
|
63 | + } |
|
64 | + } |
|
65 | 65 | |
66 | 66 | //json encode of dependency matrix |
67 | 67 | $dependencyJson = json_encode($dependencyArray); |