Laravel-Backpack / CRUD

src/app/Library/CrudPanel/Traits/SaveActions.php

Spacing +16 added lines, -17 removed lines

@@ -28,7 +28,7 @@ 
         $higherAction = $this->getSaveActionByOrder(1);
 
         //if there is an higher action and that action is not the backpack default higher one `save_and_back` we return it.
-        if (! empty($higherAction) && key($higherAction) !== 'save_and_back') {
+        if (!empty($higherAction) && key($higherAction) !== 'save_and_back') {
             return key($higherAction);
         }
 
@@ -47,7 +47,7 @@ 
      */
     public function getSaveActionByOrder($order)
     {
-        return array_filter($this->getOperationSetting('save_actions') ?? [], function ($arr) use ($order) {
+        return array_filter($this->getOperationSetting('save_actions') ?? [], function($arr) use ($order) {
             return $arr['order'] == $order;
         });
     }
@@ -81,7 +81,7 @@ 
         $orderCounter = $this->getOperationSetting('save_actions') !== null ? (count($this->getOperationSetting('save_actions')) + 1) : 1;
         //check for some mandatory fields
         $saveAction['name'] ?? abort(500, 'Please define save action name.');
-        $saveAction['redirect'] = $saveAction['redirect'] ?? function ($crud, $request, $itemId) {
+        $saveAction['redirect'] = $saveAction['redirect'] ?? function($crud, $request, $itemId) {
             return $request->has('_http_referrer') ? $request->get('_http_referrer') : $crud->route;
         };
         $saveAction['visible'] = $saveAction['visible'] ?? true;
@@ -90,7 +90,7 @@ 
 
         $actions = $this->getOperationSetting('save_actions') ?? [];
 
-        if (! in_array($saveAction['name'], $actions)) {
+        if (!in_array($saveAction['name'], $actions)) {
             $actions[$saveAction['name']] = $saveAction;
         }
 
@@ -107,7 +107,7 @@ 
     public function orderSaveAction(string $saveAction, int $wantedOrder)
     {
         $actions = $this->getOperationSetting('save_actions') ?? [];
-        if (! empty($actions)) {
+        if (!empty($actions)) {
             $replaceOrder = isset($actions[$saveAction]) ? $actions[$saveAction]['order'] : count($actions) + 1;
 
             foreach ($actions as $key => $sv) {
@@ -201,7 +201,7 @@ 
     public function orderSaveActions(array $saveActions)
     {
         foreach ($saveActions as $sv => $order) {
-            if (! is_int($order)) {
+            if (!is_int($order)) {
                 $this->orderSaveAction($order, $sv + 1);
             } else {
                 $this->orderSaveAction($sv, $order);
@@ -218,7 +218,7 @@ 
     {
         $actions = $this->getOperationSetting('save_actions') ?? [];
 
-        uasort($actions, function ($a, $b) {
+        uasort($actions, function($a, $b) {
             return $a['order'] <=> $b['order'];
         });
 
@@ -240,7 +240,7 @@ 
             }
         }
 
-        return array_filter($actions, function ($action) {
+        return array_filter($actions, function($action) {
             return $action['visible'] == true;
         }, ARRAY_FILTER_USE_BOTH);
     }
@@ -303,8 +303,7 @@ 
      */
     public function setSaveAction($forceSaveAction = null)
     {
-        $saveAction = $forceSaveAction ?:
-            \Request::input('_save_action', $this->getFallBackSaveAction());
+        $saveAction = $forceSaveAction ?: \Request::input('_save_action', $this->getFallBackSaveAction());
 
         $showBubble = $this->getOperationSetting('showSaveActionChange') ?? config('backpack.crud.operations.'.$this->getCurrentOperation().'.showSaveActionChange') ?? true;
 
@@ -371,20 +370,20 @@ 
         $defaultSaveActions = [
             [
                 'name' => 'save_and_back',
-                'visible' => function ($crud) {
+                'visible' => function($crud) {
                     return $crud->hasAccess('list');
                 },
-                'redirect' => function ($crud, $request, $itemId = null) {
+                'redirect' => function($crud, $request, $itemId = null) {
                     return $request->request->has('_http_referrer') ? $request->request->get('_http_referrer') : $crud->route;
                 },
                 'button_text' => trans('backpack::crud.save_action_save_and_back'),
             ],
             [
                 'name' => 'save_and_edit',
-                'visible' => function ($crud) {
+                'visible' => function($crud) {
                     return $crud->hasAccess('update');
                 },
-                'redirect' => function ($crud, $request, $itemId = null) {
+                'redirect' => function($crud, $request, $itemId = null) {
                     $itemId = $itemId ?: $request->request->get('id');
                     $redirectUrl = $crud->route.'/'.$itemId.'/edit';
                     if ($request->request->has('_locale')) {
@@ -396,17 +395,17 @@ 
 
                     return $redirectUrl;
                 },
-                'referrer_url' => function ($crud, $request, $itemId) {
+                'referrer_url' => function($crud, $request, $itemId) {
                     return url($crud->route.'/'.$itemId.'/edit');
                 },
                 'button_text' => trans('backpack::crud.save_action_save_and_edit'),
             ],
             [
                 'name' => 'save_and_new',
-                'visible' => function ($crud) {
+                'visible' => function($crud) {
                     return $crud->hasAccess('create');
                 },
-                'redirect' => function ($crud, $request, $itemId = null) {
+                'redirect' => function($crud, $request, $itemId = null) {
                     return $this->route.'/create';
                 },
                 'button_text' => trans('backpack::crud.save_action_save_and_new'),

tests/Unit/CrudPanel/CrudPanelFieldsTest.php

Spacing +3 added lines, -3 removed lines

@@ -609,7 +609,7 @@ 
     {
         $this->crudPanel->setOperationSetting(
             'strippedRequest',
-            static function (Request $request) {
+            static function(Request $request) {
                 return $request->toArray();
             },
             'update'
@@ -743,7 +743,7 @@ 
                         ->validationMessages(['required' => 'is_required', 'min' => 'min_2'])
                         ->store_in('some')
                         ->size(6)
-                        ->on('created', function () {
+                        ->on('created', function() {
                         })
                         ->subfields([['name' => 'sub_1']])
                         ->entity('bang');
@@ -775,7 +775,7 @@ 
                 'class' => 'form-group col-md-6',
             ],
             'events' => [
-                'created' => function () {
+                'created' => function() {
                 },
             ],
             'subfields' => [

tests/Unit/CrudPanel/CrudPanelFiltersTest.php

Spacing +8 added lines, -8 removed lines

@@ -48,7 +48,7 @@ 
     {
         $this->crudPanel->setModel(User::class);
         $request = request()->create('/admin/users', 'GET', ['my_custom_filter' => 'foo']);
-        $request->setRouteResolver(function () use ($request) {
+        $request->setRouteResolver(function() use ($request) {
             return (new Route('GET', 'admin/users', ['UserCrudController', 'index']))->bind($request);
         });
         $this->crudPanel->setRequest($request);
@@ -64,10 +64,10 @@ 
                     ->options(['test' => 'test'])
                     ->view('simple')
                     ->viewNamespace('crud::filters')
-                    ->ifActive(function () {
+                    ->ifActive(function() {
                         return true;
                     })
-                    ->ifInactive(function () {
+                    ->ifInactive(function() {
                         return true;
                     });
 
@@ -84,10 +84,10 @@ 
     public function testWhenActiveAndWhenInactiveAliases()
     {
         $filter = CrudFilter::name('my_filter')
-                        ->whenActive(function () {
+                        ->whenActive(function() {
                             return true;
                         })
-                        ->whenInactive(function () {
+                        ->whenInactive(function() {
                             return true;
                         });
 
@@ -98,7 +98,7 @@ 
 
     public function testWhenNotActiveAlias()
     {
-        $filter = CrudFilter::name('my_filter')->whenNotActive(function () {
+        $filter = CrudFilter::name('my_filter')->whenNotActive(function() {
             return true;
         });
         $this->assertCount(1, $this->crudPanel->filters());
@@ -107,7 +107,7 @@ 
 
     public function testIfNotActiveAlias()
     {
-        $filter = CrudFilter::name('my_filter')->ifNotActive(function () {
+        $filter = CrudFilter::name('my_filter')->ifNotActive(function() {
             return true;
         });
         $this->assertCount(1, $this->crudPanel->filters());
@@ -116,7 +116,7 @@ 
 
     public function testElseAlias()
     {
-        $filter = CrudFilter::name('my_filter')->else(function () {
+        $filter = CrudFilter::name('my_filter')->else(function() {
             return true;
         });
         $this->assertCount(1, $this->crudPanel->filters());

src/app/Library/CrudPanel/CrudPanel.php

Spacing +16 added lines, -16 removed lines

@@ -109,11 +109,11 @@ 
      */
     public function setModel($model_namespace)
     {
-        if (! class_exists($model_namespace)) {
+        if (!class_exists($model_namespace)) {
             throw new \Exception('The model does not exist.', 500);
         }
 
-        if (! method_exists($model_namespace, 'hasCrudTrait')) {
+        if (!method_exists($model_namespace, 'hasCrudTrait')) {
             throw new \Exception('Please use CrudTrait on the model.', 500);
         }
 
@@ -205,7 +205,7 @@ 
 
         $complete_route = $route.'.index';
 
-        if (! \Route::has($complete_route)) {
+        if (!\Route::has($complete_route)) {
             throw new \Exception('There are no routes for this route name.', 404);
         }
 
@@ -303,7 +303,7 @@ 
      */
     public function getFirstOfItsTypeInArray($type, $array)
     {
-        return Arr::first($array, function ($item) use ($type) {
+        return Arr::first($array, function($item) use ($type) {
             return $item['type'] == $type;
         });
     }
@@ -322,8 +322,8 @@ 
      */
     public function sync($type, $fields, $attributes)
     {
-        if (! empty($this->{$type})) {
-            $this->{$type} = array_map(function ($field) use ($fields, $attributes) {
+        if (!empty($this->{$type})) {
+            $this->{$type} = array_map(function($field) use ($fields, $attributes) {
                 if (in_array($field['name'], (array) $fields)) {
                     $field = array_merge($field, $attributes);
                 }
@@ -353,15 +353,15 @@ 
     {
         $relationArray = explode('.', $relationString);
 
-        if (! isset($length)) {
+        if (!isset($length)) {
             $length = count($relationArray);
         }
 
-        if (! isset($model)) {
+        if (!isset($model)) {
             $model = $this->model;
         }
 
-        $result = array_reduce(array_splice($relationArray, 0, $length), function ($obj, $method) {
+        $result = array_reduce(array_splice($relationArray, 0, $length), function($obj, $method) {
             try {
                 $result = $obj->$method();
 
@@ -396,7 +396,7 @@ 
             if (is_array($entries)) {
                 //if attribute does not exist in main array we have more than one entry OR the attribute
                 //is an acessor that is not in $appends property of model.
-                if (! isset($entries[$attribute])) {
+                if (!isset($entries[$attribute])) {
                     //we first check if we don't have the attribute because it's an acessor that is not in appends.
                     if ($model_instance->hasGetMutator($attribute) && isset($entries[$modelKey])) {
                         $entry_in_database = $model_instance->find($entries[$modelKey]);
@@ -435,21 +435,21 @@ 
      */
     public function parseTranslatableAttributes($model, $attribute, $value)
     {
-        if (! method_exists($model, 'isTranslatableAttribute')) {
+        if (!method_exists($model, 'isTranslatableAttribute')) {
             return $value;
         }
 
-        if (! $model->isTranslatableAttribute($attribute)) {
+        if (!$model->isTranslatableAttribute($attribute)) {
             return $value;
         }
 
-        if (! is_array($value)) {
+        if (!is_array($value)) {
             $decodedAttribute = json_decode($value, true);
         } else {
             $decodedAttribute = $value;
         }
 
-        if (is_array($decodedAttribute) && ! empty($decodedAttribute)) {
+        if (is_array($decodedAttribute) && !empty($decodedAttribute)) {
             if (isset($decodedAttribute[app()->getLocale()])) {
                 return $decodedAttribute[app()->getLocale()];
             } else {
@@ -475,7 +475,7 @@ 
         $relation = $model->{$firstRelationName};
 
         $results = [];
-        if (! is_null($relation)) {
+        if (!is_null($relation)) {
             if ($relation instanceof Collection) {
                 $currentResults = $relation->all();
             } elseif (is_array($relation)) {
@@ -488,7 +488,7 @@ 
 
             array_shift($relationArray);
 
-            if (! empty($relationArray)) {
+            if (!empty($relationArray)) {
                 foreach ($currentResults as $currentResult) {
                     $results = array_merge_recursive($results, $this->getRelatedEntries($currentResult, implode('.', $relationArray)));
                 }

tests/Unit/CrudPanel/CrudPanelSaveActionsTest.php

Spacing +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@ 
         $this->singleSaveAction = [
             'name' => 'save_action_one',
             'button_text' => 'custom',
-            'redirect' => function ($crud, $request, $itemId) {
+            'redirect' => function($crud, $request, $itemId) {
                 return $crud->route;
             },
-            'visible' => function ($crud) {
+            'visible' => function($crud) {
                 return true;
             },
         ];
@@ -36,19 +36,19 @@ 
         $this->multipleSaveActions = [
             [
                 'name' => 'save_action_one',
-                'redirect' => function ($crud, $request, $itemId) {
+                'redirect' => function($crud, $request, $itemId) {
                     return $crud->route;
                 },
-                'visible' => function ($crud) {
+                'visible' => function($crud) {
                     return true;
                 },
             ],
             [
                 'name' => 'save_action_two',
-                'redirect' => function ($crud, $request, $itemId) {
+                'redirect' => function($crud, $request, $itemId) {
                     return $crud->route;
                 },
-                'visible' => function ($crud) {
+                'visible' => function($crud) {
                     return true;
                 },
             ],

tests/Unit/CrudPanel/CrudPanelButtonsTest.php

Spacing +2 added lines, -2 removed lines

@@ -285,7 +285,7 @@ 
     public function testAddButtonFluently()
     {
         $button1 = CrudButton::name('lineTest')->to('line')->view('crud::buttons.test')->type('view');
-        $button2 = CrudButton::add('modelFunction')->model_function(function () {
+        $button2 = CrudButton::add('modelFunction')->model_function(function() {
             return 'test';
         })->section('top')->makeFirst();
         $this->assertEquals($button1->toArray(), $this->crudPanel->buttons()->last()->toArray());
@@ -295,7 +295,7 @@ 
 
     private function getButtonByName($name)
     {
-        return $this->crudPanel->buttons()->first(function ($value) use ($name) {
+        return $this->crudPanel->buttons()->first(function($value) use ($name) {
             return $value->name == $name;
         });
     }

src/app/Http/Controllers/CrudController.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
         //
         // It's done inside a middleware closure in order to have
         // the complete request inside the CrudPanel object.
-        $this->middleware(function ($request, $next) {
+        $this->middleware(function($request, $next) {
             $this->crud = app('crud');
 
             $this->crud->setRequest($request);
@@ -96,7 +96,7 @@ 
     protected function setupConfigurationForCurrentOperation()
     {
         $operationName = $this->crud->getCurrentOperation();
-        if (! $operationName) {
+        if (!$operationName) {
             return;
         }
 

src/app/Library/CrudPanel/Traits/Query.php

Spacing +4 added lines, -4 removed lines

@@ -99,7 +99,7 @@ 
      */
     public function customOrderBy($column, $columnDirection = 'asc')
     {
-        if (! isset($column['orderLogic'])) {
+        if (!isset($column['orderLogic'])) {
             return $this->query;
         }
 
@@ -189,7 +189,7 @@ 
      */
     public function getTotalQueryCount()
     {
-        if (! $this->getOperationSetting('showEntryCount')) {
+        if (!$this->getOperationSetting('showEntryCount')) {
             return 0;
         }
 
@@ -228,7 +228,7 @@ 
      */
     private function getCountFromQuery(Builder $query)
     {
-        if (! $this->driverIsSql()) {
+        if (!$this->driverIsSql()) {
             return $query->count();
         }
 
@@ -247,7 +247,7 @@ 
         $expressionColumns = [];
 
         foreach ($crudQuery->columns ?? [] as $column) {
-            if (! is_string($column) && is_a($column, 'Illuminate\Database\Query\Expression')) {
+            if (!is_string($column) && is_a($column, 'Illuminate\Database\Query\Expression')) {
                 $expressionColumns[] = $column;
             }
         }

src/app/Models/Traits/HasEnumFields.php

Spacing +1 added lines, -2 removed lines

@@ -23,8 +23,7 @@
 
         try {
             $select = app()->version() < 10 ?
-                        DB::raw('SHOW COLUMNS FROM `'.$table_prefix.$instance->getTable().'` WHERE Field = "'.$field_name.'"') :
-                        DB::raw('SHOW COLUMNS FROM `'.$table_prefix.$instance->getTable().'` WHERE Field = "'.$field_name.'"')->getValue($connection->getQueryGrammar());
+                        DB::raw('SHOW COLUMNS FROM `'.$table_prefix.$instance->getTable().'` WHERE Field = "'.$field_name.'"') : DB::raw('SHOW COLUMNS FROM `'.$table_prefix.$instance->getTable().'` WHERE Field = "'.$field_name.'"')->getValue($connection->getQueryGrammar());
 
             $type = $connection->select($select)[0]->Type;
         } catch (\Exception $e) {