We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | { |
| 25 | 25 | parent::setUp(); |
| 26 | 26 | |
| 27 | - $this->app->singleton('crud', function ($app) { |
|
| 27 | + $this->app->singleton('crud', function($app) { |
|
| 28 | 28 | return new CrudPanel($app); |
| 29 | 29 | }); |
| 30 | 30 | $this->crudPanel = app('crud'); |
@@ -389,10 +389,12 @@ |
||
| 389 | 389 | return $this->fallbackLogic($value); |
| 390 | 390 | } |
| 391 | 391 | |
| 392 | - public function else($value) |
|
| 392 | + public function else { |
|
| 393 | + ($value) |
|
| 393 | 394 | { |
| 394 | 395 | return $this->fallbackLogic($value); |
| 395 | 396 | } |
| 397 | + } |
|
| 396 | 398 | |
| 397 | 399 | // --------------- |
| 398 | 400 | // PRIVATE METHODS |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | |
| 27 | 27 | public function __construct($options, $values, $logic, $fallbackLogic) |
| 28 | 28 | { |
| 29 | - if (! backpack_pro()) { |
|
| 29 | + if (!backpack_pro()) { |
|
| 30 | 30 | throw new BackpackProRequiredException('Filter'); |
| 31 | 31 | } |
| 32 | 32 | // if filter exists |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | */ |
| 90 | 90 | public function wasNotApplied() |
| 91 | 91 | { |
| 92 | - return ! $this->applied; |
|
| 92 | + return !$this->applied; |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -110,7 +110,7 @@ discard block |
||
| 110 | 110 | |
| 111 | 111 | $input = $input ?? new ParameterBag($this->crud()->getRequest()->all()); |
| 112 | 112 | |
| 113 | - if (! $input->has($this->name)) { |
|
| 113 | + if (!$input->has($this->name)) { |
|
| 114 | 114 | // if fallback logic was supplied and is a closure |
| 115 | 115 | if (is_callable($this->fallbackLogic)) { |
| 116 | 116 | return ($this->fallbackLogic)(); |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | $namespaces = array_merge([$this->viewNamespace], $namespaces); |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - return array_map(function ($item) use ($type) { |
|
| 155 | + return array_map(function($item) use ($type) { |
|
| 156 | 156 | return $item.'.'.$type; |
| 157 | 157 | }, $namespaces); |
| 158 | 158 | } |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | */ |
| 315 | 315 | public function values($value) |
| 316 | 316 | { |
| 317 | - $this->values = (! is_string($value) && is_callable($value)) ? $value() : $value; |
|
| 317 | + $this->values = (!is_string($value) && is_callable($value)) ? $value() : $value; |
|
| 318 | 318 | |
| 319 | 319 | return $this->save(); |
| 320 | 320 | } |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | $otherButtons = collect([]); |
| 26 | 26 | |
| 27 | 27 | // we get the buttons that belong to the specified stack |
| 28 | - $stackButtons = $this->buttons()->reject(function ($item) use ($stack, $otherButtons) { |
|
| 28 | + $stackButtons = $this->buttons()->reject(function($item) use ($stack, $otherButtons) { |
|
| 29 | 29 | if ($item->stack != $stack) { |
| 30 | 30 | // if the button does not belong to this stack we just add it for merging later |
| 31 | 31 | $otherButtons->push($item); |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | }); |
| 38 | 38 | |
| 39 | 39 | // we parse the ordered buttons |
| 40 | - collect($order)->each(function ($btnKey) use ($newButtons, $stackButtons) { |
|
| 41 | - if (! $button = $stackButtons->where('name', $btnKey)->first()) { |
|
| 40 | + collect($order)->each(function($btnKey) use ($newButtons, $stackButtons) { |
|
| 41 | + if (!$button = $stackButtons->where('name', $btnKey)->first()) { |
|
| 42 | 42 | abort(500, 'Button name [«'.$btnKey.'»] not found.'); |
| 43 | 43 | } |
| 44 | 44 | $newButtons->push($button); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | // we add the remaining buttons to the end of the ordered ones |
| 49 | 49 | if (count($newButtons) < count($stackButtons)) { |
| 50 | 50 | foreach ($stackButtons as $button) { |
| 51 | - if (! $newButtons->where('name', $button->name)->first()) { |
|
| 51 | + if (!$newButtons->where('name', $button->name)->first()) { |
|
| 52 | 52 | $newButtons->push($button); |
| 53 | 53 | } |
| 54 | 54 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | */ |
| 115 | 115 | $button = $this->buttons()->firstWhere('name', $name); |
| 116 | 116 | |
| 117 | - if (! $button) { |
|
| 117 | + if (!$button) { |
|
| 118 | 118 | abort(500, 'CRUD Button "'.$name.'" not found. Please check the button exists before you modify it.'); |
| 119 | 119 | } |
| 120 | 120 | |
@@ -135,7 +135,7 @@ discard block |
||
| 135 | 135 | */ |
| 136 | 136 | public function removeButton($name, $stack = null) |
| 137 | 137 | { |
| 138 | - $this->setOperationSetting('buttons', $this->buttons()->reject(function ($button) use ($name, $stack) { |
|
| 138 | + $this->setOperationSetting('buttons', $this->buttons()->reject(function($button) use ($name, $stack) { |
|
| 139 | 139 | return $stack == null ? $button->name == $name : ($button->stack == $stack) && ($button->name == $name); |
| 140 | 140 | })); |
| 141 | 141 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | */ |
| 147 | 147 | public function removeButtons($names, $stack = null) |
| 148 | 148 | { |
| 149 | - if (! empty($names)) { |
|
| 149 | + if (!empty($names)) { |
|
| 150 | 150 | foreach ($names as $name) { |
| 151 | 151 | $this->removeButton($name, $stack); |
| 152 | 152 | } |
@@ -160,14 +160,14 @@ discard block |
||
| 160 | 160 | |
| 161 | 161 | public function removeAllButtonsFromStack($stack) |
| 162 | 162 | { |
| 163 | - $this->setOperationSetting('buttons', $this->buttons()->reject(function ($button) use ($stack) { |
|
| 163 | + $this->setOperationSetting('buttons', $this->buttons()->reject(function($button) use ($stack) { |
|
| 164 | 164 | return $button->stack == $stack; |
| 165 | 165 | })); |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | public function removeButtonFromStack($name, $stack) |
| 169 | 169 | { |
| 170 | - $this->setOperationSetting('buttons', $this->buttons()->reject(function ($button) use ($name, $stack) { |
|
| 170 | + $this->setOperationSetting('buttons', $this->buttons()->reject(function($button) use ($name, $stack) { |
|
| 171 | 171 | return $button->name == $name && $button->stack == $stack; |
| 172 | 172 | })); |
| 173 | 173 | } |
@@ -185,15 +185,15 @@ discard block |
||
| 185 | 185 | $destinationButton = $this->firstButtonWhere('name', $destination); |
| 186 | 186 | $destinationKey = $this->getButtonKey($destination); |
| 187 | 187 | $newDestinationKey = ($where == 'before' ? $destinationKey : $destinationKey + 1); |
| 188 | - $newButtons = $this->buttons()->filter(function ($value, $key) use ($target) { |
|
| 188 | + $newButtons = $this->buttons()->filter(function($value, $key) use ($target) { |
|
| 189 | 189 | return $value->name != $target; |
| 190 | 190 | }); |
| 191 | 191 | |
| 192 | - if (! $targetButton) { |
|
| 192 | + if (!$targetButton) { |
|
| 193 | 193 | return; |
| 194 | 194 | } |
| 195 | 195 | |
| 196 | - if (! $destinationButton) { |
|
| 196 | + if (!$destinationButton) { |
|
| 197 | 197 | return; |
| 198 | 198 | } |
| 199 | 199 | |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | $lastSlice = $newButtons->slice($newDestinationKey, null); |
| 202 | 202 | |
| 203 | 203 | $newButtons = $firstSlice->push($targetButton); |
| 204 | - $lastSlice->each(function ($item, $key) use ($newButtons) { |
|
| 204 | + $lastSlice->each(function($item, $key) use ($newButtons) { |
|
| 205 | 205 | $newButtons->push($item); |
| 206 | 206 | }); |
| 207 | 207 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $this->enableFilters(); |
| 73 | 73 | |
| 74 | 74 | // check if another filter with the same name exists |
| 75 | - if (! isset($options['name'])) { |
|
| 75 | + if (!isset($options['name'])) { |
|
| 76 | 76 | abort(500, 'All your filters need names.'); |
| 77 | 77 | } |
| 78 | 78 | |
@@ -120,7 +120,7 @@ discard block |
||
| 120 | 120 | { |
| 121 | 121 | $unappliedFilters = $this->filters()->where('applied', false); |
| 122 | 122 | if ($unappliedFilters->count()) { |
| 123 | - $unappliedFilters->each(function ($filter) { |
|
| 123 | + $unappliedFilters->each(function($filter) { |
|
| 124 | 124 | $filter->apply(); |
| 125 | 125 | }); |
| 126 | 126 | } |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | { |
| 171 | 171 | $filter = $this->filters()->firstWhere('name', $name); |
| 172 | 172 | |
| 173 | - if (! $filter) { |
|
| 173 | + if (!$filter) { |
|
| 174 | 174 | abort(500, 'CRUD Filter "'.$name.'" not found. Please check the filter exists before you modify it.'); |
| 175 | 175 | } |
| 176 | 176 | |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | |
| 186 | 186 | public function replaceFilter($name, $newFilter) |
| 187 | 187 | { |
| 188 | - $newFilters = $this->filters()->map(function ($filter, $key) use ($name, $newFilter) { |
|
| 188 | + $newFilters = $this->filters()->map(function($filter, $key) use ($name, $newFilter) { |
|
| 189 | 189 | if ($filter->name != $name) { |
| 190 | 190 | return $filter; |
| 191 | 191 | } |
@@ -198,7 +198,7 @@ discard block |
||
| 198 | 198 | |
| 199 | 199 | public function removeFilter($name) |
| 200 | 200 | { |
| 201 | - $strippedCollection = $this->filters()->reject(function ($filter) use ($name) { |
|
| 201 | + $strippedCollection = $this->filters()->reject(function($filter) use ($name) { |
|
| 202 | 202 | return $filter->name == $name; |
| 203 | 203 | }); |
| 204 | 204 | |
@@ -241,7 +241,7 @@ discard block |
||
| 241 | 241 | */ |
| 242 | 242 | public function makeFirstFilter() |
| 243 | 243 | { |
| 244 | - if (! $this->filters()) { |
|
| 244 | + if (!$this->filters()) { |
|
| 245 | 245 | return false; |
| 246 | 246 | } |
| 247 | 247 | |
@@ -271,15 +271,15 @@ discard block |
||
| 271 | 271 | $destinationFilter = $this->firstFilterWhere('name', $destination); |
| 272 | 272 | $destinationKey = $this->getFilterKey($destination); |
| 273 | 273 | $newDestinationKey = ($where == 'before' ? $destinationKey : $destinationKey + 1); |
| 274 | - $newFilters = $this->filters()->filter(function ($value, $key) use ($target) { |
|
| 274 | + $newFilters = $this->filters()->filter(function($value, $key) use ($target) { |
|
| 275 | 275 | return $value->name != $target; |
| 276 | 276 | }); |
| 277 | 277 | |
| 278 | - if (! $targetFilter) { |
|
| 278 | + if (!$targetFilter) { |
|
| 279 | 279 | return; |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - if (! $destinationFilter) { |
|
| 282 | + if (!$destinationFilter) { |
|
| 283 | 283 | return; |
| 284 | 284 | } |
| 285 | 285 | |
@@ -287,7 +287,7 @@ discard block |
||
| 287 | 287 | $lastSlice = $newFilters->slice($newDestinationKey, null); |
| 288 | 288 | |
| 289 | 289 | $newFilters = $firstSlice->push($targetFilter); |
| 290 | - $lastSlice->each(function ($item, $key) use ($newFilters) { |
|
| 290 | + $lastSlice->each(function($item, $key) use ($newFilters) { |
|
| 291 | 291 | $newFilters->push($item); |
| 292 | 292 | }); |
| 293 | 293 | |
@@ -13,5 +13,5 @@ |
||
| 13 | 13 | (array) config('backpack.base.middleware_key', 'admin') |
| 14 | 14 | ), |
| 15 | 15 | 'namespace' => 'App\Http\Controllers\Admin', |
| 16 | -], function () { // custom admin routes |
|
| 16 | +], function() { // custom admin routes |
|
| 17 | 17 | }); // this should be the absolute last line of this file |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | */ |
| 14 | 14 | public function up() |
| 15 | 15 | { |
| 16 | - Schema::create('addresses', function (Blueprint $table) { |
|
| 16 | + Schema::create('addresses', function(Blueprint $table) { |
|
| 17 | 17 | $table->increments('id'); |
| 18 | 18 | $table->integer('account_details_id')->unsigned(); |
| 19 | 19 | $table->string('city')->nullable(); |
@@ -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')) { |
@@ -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); |