We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | public function getEntry($id) |
| 58 | 58 | { |
| 59 | - if (! $this->entry) { |
|
| 59 | + if (!$this->entry) { |
|
| 60 | 60 | $this->entry = $this->model->findOrFail($id); |
| 61 | 61 | $this->entry = $this->entry->withFakes(); |
| 62 | 62 | } |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | // we will apply the same labels as the values to the menu if developer didn't |
| 259 | 259 | $this->abortIfInvalidPageLength($menu[0]); |
| 260 | 260 | |
| 261 | - if (! isset($menu[1]) || ! is_array($menu[1])) { |
|
| 261 | + if (!isset($menu[1]) || !is_array($menu[1])) { |
|
| 262 | 262 | $menu[1] = $menu[0]; |
| 263 | 263 | } |
| 264 | 264 | } else { |
@@ -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 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $column_number = (int) $order['column']; |
| 100 | 100 | $column_direction = (strtolower((string) $order['dir']) == 'asc' ? 'ASC' : 'DESC'); |
| 101 | 101 | $column = $this->crud->findColumnById($column_number); |
| 102 | - if ($column['tableColumn'] && ! isset($column['orderLogic'])) { |
|
| 102 | + if ($column['tableColumn'] && !isset($column['orderLogic'])) { |
|
| 103 | 103 | // apply the current orderBy rules |
| 104 | 104 | $this->crud->orderByWithPrefix($column['name'], $column_direction); |
| 105 | 105 | } |
@@ -119,12 +119,12 @@ discard block |
||
| 119 | 119 | $table = $this->crud->model->getTable(); |
| 120 | 120 | $key = $this->crud->model->getKeyName(); |
| 121 | 121 | |
| 122 | - $hasOrderByPrimaryKey = collect($orderBy)->some(function ($item) use ($key, $table) { |
|
| 122 | + $hasOrderByPrimaryKey = collect($orderBy)->some(function($item) use ($key, $table) { |
|
| 123 | 123 | return (isset($item['column']) && $item['column'] === $key) |
| 124 | 124 | || (isset($item['sql']) && str_contains($item['sql'], "$table.$key")); |
| 125 | 125 | }); |
| 126 | 126 | |
| 127 | - if (! $hasOrderByPrimaryKey) { |
|
| 127 | + if (!$hasOrderByPrimaryKey) { |
|
| 128 | 128 | $this->crud->orderByWithPrefix($this->crud->model->getKeyName(), 'DESC'); |
| 129 | 129 | } |
| 130 | 130 | |
@@ -83,7 +83,7 @@ discard block |
||
| 83 | 83 | |
| 84 | 84 | // otherwise, in case the last line HAS been modified |
| 85 | 85 | // return the last line that has an ending in it |
| 86 | - $possible_end_lines = array_filter($file_lines, function ($k) { |
|
| 86 | + $possible_end_lines = array_filter($file_lines, function($k) { |
|
| 87 | 87 | return strpos($k, '});') === 0; |
| 88 | 88 | }); |
| 89 | 89 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | */ |
| 105 | 105 | private function getLastLineNumberThatContains($needle, $haystack) |
| 106 | 106 | { |
| 107 | - $matchingLines = array_filter($haystack, function ($k) use ($needle) { |
|
| 107 | + $matchingLines = array_filter($haystack, function($k) use ($needle) { |
|
| 108 | 108 | return strpos($k, $needle) !== false; |
| 109 | 109 | }); |
| 110 | 110 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | $relation_model = $this->getRelationModel($relation_field['entity'], -1); |
| 56 | 56 | $related_method = Str::afterLast($relation_field['entity'], '.'); |
| 57 | 57 | |
| 58 | - if (! method_exists($relation_model, $related_method)) { |
|
| 58 | + if (!method_exists($relation_model, $related_method)) { |
|
| 59 | 59 | return Str::beforeLast($relation_field['entity'], '.'); |
| 60 | 60 | } |
| 61 | 61 | |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | return collect($this->fields()) |
| 195 | 195 | ->where('model') |
| 196 | 196 | ->whereIn('relation_type', $relation_types) |
| 197 | - ->filter(function ($item) { |
|
| 197 | + ->filter(function($item) { |
|
| 198 | 198 | $related_model = get_class($this->model->{Str::before($item['entity'], '.')}()->getRelated()); |
| 199 | 199 | |
| 200 | 200 | return Str::contains($item['entity'], '.') && $item['model'] !== $related_model ? false : true; |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | // Check if auth exists |
| 49 | 49 | $details = null; |
| 50 | 50 | $process = new Process(['composer', 'config', 'http-basic.backpackforlaravel.com']); |
| 51 | - $process->run(function ($type, $buffer) use (&$details) { |
|
| 51 | + $process->run(function($type, $buffer) use (&$details) { |
|
| 52 | 52 | if ($type !== Process::ERR && $buffer !== '') { |
| 53 | 53 | $details = json_decode($buffer); |
| 54 | 54 | } elseif (File::exists('auth.json')) { |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | }); |
| 59 | 59 | |
| 60 | 60 | // Create an auth.json file |
| 61 | - if (! $details) { |
|
| 61 | + if (!$details) { |
|
| 62 | 62 | $this->info(' Creating auth.json file with your authentication token'); |
| 63 | 63 | |
| 64 | 64 | $this->line(' (Find your access token details on https://backpackforlaravel.com/user/tokens)'); |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $password = $this->ask('Access token password'); |
| 67 | 67 | |
| 68 | 68 | $process = new Process(['composer', 'config', 'http-basic.backpackforlaravel.com', $username, $password]); |
| 69 | - $process->run(function ($type, $buffer) use ($username, $password) { |
|
| 69 | + $process->run(function($type, $buffer) use ($username, $password) { |
|
| 70 | 70 | if ($type === Process::ERR) { |
| 71 | 71 | // Fallback |
| 72 | 72 | $authFile = [ |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | if (File::exists('auth.json')) { |
| 82 | 82 | $currentFile = json_decode(File::get('auth.json'), true); |
| 83 | - if (! ($currentFile['http-basic']['backpackforlaravel.com'] ?? false)) { |
|
| 83 | + if (!($currentFile['http-basic']['backpackforlaravel.com'] ?? false)) { |
|
| 84 | 84 | $authFile = array_merge_recursive($authFile, $currentFile); |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | // Check if repositories exists |
| 95 | 95 | $details = null; |
| 96 | 96 | $process = new Process(['composer', 'config', 'repositories.backpack/devtools']); |
| 97 | - $process->run(function ($type, $buffer) use (&$details) { |
|
| 97 | + $process->run(function($type, $buffer) use (&$details) { |
|
| 98 | 98 | if ($type !== Process::ERR && $buffer !== '') { |
| 99 | 99 | $details = json_decode($buffer); |
| 100 | 100 | } else { |
@@ -104,11 +104,11 @@ discard block |
||
| 104 | 104 | }); |
| 105 | 105 | |
| 106 | 106 | // Create repositories |
| 107 | - if (! $details) { |
|
| 107 | + if (!$details) { |
|
| 108 | 108 | $this->info(' Creating repositories entry in composer.json'); |
| 109 | 109 | |
| 110 | 110 | $process = new Process(['composer', 'config', 'repositories.backpack/devtools', 'composer', 'https://repo.backpackforlaravel.com']); |
| 111 | - $process->run(function ($type, $buffer) { |
|
| 111 | + $process->run(function($type, $buffer) { |
|
| 112 | 112 | if ($type === Process::ERR) { |
| 113 | 113 | // Fallback |
| 114 | 114 | $composerJson = Str::of(File::get('composer.json')); |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | // Require package |
| 140 | 140 | $process = new Process(['composer', 'require', '--dev', '--with-all-dependencies', 'backpack/devtools']); |
| 141 | 141 | $process->setTimeout(300); |
| 142 | - $process->run(function ($type, $buffer) { |
|
| 142 | + $process->run(function($type, $buffer) { |
|
| 143 | 143 | $this->progressBar->advance(); |
| 144 | 144 | }); |
| 145 | 145 | |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | $this->info(' Now running the DevTools installation command.'); |
| 153 | 153 | |
| 154 | 154 | // manually include the command in the run-time |
| 155 | - if (! class_exists(\Backpack\DevTools\Console\Commands\InstallDevTools::class)) { |
|
| 155 | + if (!class_exists(\Backpack\DevTools\Console\Commands\InstallDevTools::class)) { |
|
| 156 | 156 | include base_path('vendor/backpack/devtools/src/Console/Commands/InstallDevTools.php'); |
| 157 | 157 | } |
| 158 | 158 | |
@@ -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 | } |
@@ -30,36 +30,36 @@ |
||
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - //for update form, get initial state of the entity |
|
| 34 | - if (isset($id) && $id) { |
|
| 33 | + //for update form, get initial state of the entity |
|
| 34 | + if (isset($id) && $id) { |
|
| 35 | 35 | |
| 36 | 36 | //get entity with relations for primary dependency |
| 37 | - $entity_dependencies = $entity_model->with($primary_dependency['entity']) |
|
| 38 | - ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary']) |
|
| 39 | - ->find($id); |
|
| 37 | + $entity_dependencies = $entity_model->with($primary_dependency['entity']) |
|
| 38 | + ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary']) |
|
| 39 | + ->find($id); |
|
| 40 | 40 | |
| 41 | - $secondaries_from_primary = []; |
|
| 41 | + $secondaries_from_primary = []; |
|
| 42 | 42 | |
| 43 | - //convert relation in array |
|
| 44 | - $primary_array = $entity_dependencies->{$primary_dependency['entity']}->toArray(); |
|
| 43 | + //convert relation in array |
|
| 44 | + $primary_array = $entity_dependencies->{$primary_dependency['entity']}->toArray(); |
|
| 45 | 45 | |
| 46 | - $secondary_ids = []; |
|
| 46 | + $secondary_ids = []; |
|
| 47 | 47 | |
| 48 | - //create secondary dependency from primary relation, used to check what checkbox must be checked from second checklist |
|
| 49 | - if (old($primary_dependency['name'])) { |
|
| 50 | - foreach (old($primary_dependency['name']) as $primary_item) { |
|
| 51 | - foreach ($dependencyArray[$primary_item] as $second_item) { |
|
| 52 | - $secondary_ids[$second_item] = $second_item; |
|
| 53 | - } |
|
| 54 | - } |
|
| 55 | - } else { //create dependencies from relation if not from validate error |
|
| 56 | - foreach ($primary_array as $primary_item) { |
|
| 57 | - foreach ($primary_item[$secondary_dependency['entity']] as $second_item) { |
|
| 58 | - $secondary_ids[$second_item['id']] = $second_item['id']; |
|
| 59 | - } |
|
| 60 | - } |
|
| 61 | - } |
|
| 62 | - } |
|
| 48 | + //create secondary dependency from primary relation, used to check what checkbox must be checked from second checklist |
|
| 49 | + if (old($primary_dependency['name'])) { |
|
| 50 | + foreach (old($primary_dependency['name']) as $primary_item) { |
|
| 51 | + foreach ($dependencyArray[$primary_item] as $second_item) { |
|
| 52 | + $secondary_ids[$second_item] = $second_item; |
|
| 53 | + } |
|
| 54 | + } |
|
| 55 | + } else { //create dependencies from relation if not from validate error |
|
| 56 | + foreach ($primary_array as $primary_item) { |
|
| 57 | + foreach ($primary_item[$secondary_dependency['entity']] as $second_item) { |
|
| 58 | + $secondary_ids[$second_item['id']] = $second_item['id']; |
|
| 59 | + } |
|
| 60 | + } |
|
| 61 | + } |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | 64 | //json encode of dependency matrix |
| 65 | 65 | $dependencyJson = json_encode($dependencyArray); |
@@ -3,11 +3,11 @@ discard block |
||
| 3 | 3 | <?php |
| 4 | 4 | // if the column has been cast to Carbon or Date (using attribute casting) |
| 5 | 5 | // get the value as a date string |
| 6 | - if (! function_exists('formatDate')) { |
|
| 6 | + if (!function_exists('formatDate')) { |
|
| 7 | 7 | function formatDate($entry, $dateFieldName) |
| 8 | 8 | { |
| 9 | 9 | $formattedDate = null; |
| 10 | - if (isset($entry) && ! empty($entry->{$dateFieldName})) { |
|
| 10 | + if (isset($entry) && !empty($entry->{$dateFieldName})) { |
|
| 11 | 11 | $dateField = $entry->{$dateFieldName}; |
| 12 | 12 | if ($dateField instanceof \Carbon\CarbonInterface) { |
| 13 | 13 | $formattedDate = $dateField->format('Y-m-d H:i:s'); |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | if (isset($field['value'])) { |
| 23 | - if (isset($entry) && ! is_array($field['value'])) { |
|
| 23 | + if (isset($entry) && !is_array($field['value'])) { |
|
| 24 | 24 | $start_value = formatDate($entry, $field['name'][0]); |
| 25 | 25 | $end_value = formatDate($entry, $field['name'][1]); |
| 26 | 26 | } elseif (is_array($field['value'])) { |
@@ -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'), |