Laravel-Backpack / CRUD

src/app/Console/Commands/AddCustomRouteContent.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
 
         // otherwise, in case the last line HAS been modified
         // return the last line that has an ending in it
-        $possible_end_lines = array_filter($file_lines, function ($k) {
+        $possible_end_lines = array_filter($file_lines, function($k) {
             return strpos($k, '});') === 0;
         });
 
@@ -104,7 +104,7 @@ 
      */
     private function getLastLineNumberThatContains($needle, $haystack)
     {
-        $matchingLines = array_filter($haystack, function ($k) use ($needle) {
+        $matchingLines = array_filter($haystack, function($k) use ($needle) {
             return strpos($k, $needle) !== false;
         });
 

src/app/Console/Commands/RequireDevTools.php

Spacing +9 added lines, -9 removed lines

@@ -48,7 +48,7 @@ 
         // Check if auth exists
         $details = null;
         $process = new Process(['composer', 'config', 'http-basic.backpackforlaravel.com']);
-        $process->run(function ($type, $buffer) use (&$details) {
+        $process->run(function($type, $buffer) use (&$details) {
             if ($type !== Process::ERR && $buffer !== '') {
                 $details = json_decode($buffer);
             } elseif (File::exists('auth.json')) {
@@ -58,7 +58,7 @@ 
         });
 
         // Create an auth.json file
-        if (! $details) {
+        if (!$details) {
             $this->info(' Creating auth.json file with your authentication token');
 
             $this->line(' (Find your access token details on https://backpackforlaravel.com/user/tokens)');
@@ -66,7 +66,7 @@ 
             $password = $this->ask('Access token password');
 
             $process = new Process(['composer', 'config', 'http-basic.backpackforlaravel.com', $username, $password]);
-            $process->run(function ($type, $buffer) use ($username, $password) {
+            $process->run(function($type, $buffer) use ($username, $password) {
                 if ($type === Process::ERR) {
                     // Fallback
                     $authFile = [
@@ -80,7 +80,7 @@ 
 
                     if (File::exists('auth.json')) {
                         $currentFile = json_decode(File::get('auth.json'), true);
-                        if (! ($currentFile['http-basic']['backpackforlaravel.com'] ?? false)) {
+                        if (!($currentFile['http-basic']['backpackforlaravel.com'] ?? false)) {
                             $authFile = array_merge_recursive($authFile, $currentFile);
                         }
                     }
@@ -94,7 +94,7 @@ 
         // Check if repositories exists
         $details = null;
         $process = new Process(['composer', 'config', 'repositories.backpack/devtools']);
-        $process->run(function ($type, $buffer) use (&$details) {
+        $process->run(function($type, $buffer) use (&$details) {
             if ($type !== Process::ERR && $buffer !== '') {
                 $details = json_decode($buffer);
             } else {
@@ -104,11 +104,11 @@ 
         });
 
         // Create repositories
-        if (! $details) {
+        if (!$details) {
             $this->info(' Creating repositories entry in composer.json');
 
             $process = new Process(['composer', 'config', 'repositories.backpack/devtools', 'composer', 'https://repo.backpackforlaravel.com']);
-            $process->run(function ($type, $buffer) {
+            $process->run(function($type, $buffer) {
                 if ($type === Process::ERR) {
                     // Fallback
                     $composerJson = Str::of(File::get('composer.json'));
@@ -139,7 +139,7 @@ 
         // Require package
         $process = new Process(['composer', 'require', '--dev', '--with-all-dependencies', 'backpack/devtools']);
         $process->setTimeout(300);
-        $process->run(function ($type, $buffer) {
+        $process->run(function($type, $buffer) {
             $this->progressBar->advance();
         });
 
@@ -152,7 +152,7 @@ 
         $this->info(' Now running the DevTools installation command.');
 
         // manually include the command in the run-time
-        if (! class_exists(\Backpack\DevTools\Console\Commands\InstallDevTools::class)) {
+        if (!class_exists(\Backpack\DevTools\Console\Commands\InstallDevTools::class)) {
             include base_path('vendor/backpack/devtools/src/Console/Commands/InstallDevTools.php');
         }
 

src/app/Library/CrudPanel/CrudPanel.php

Spacing +16 added lines, -16 removed lines

@@ -102,11 +102,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);
         }
 
@@ -195,7 +195,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);
         }
 
@@ -293,7 +293,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;
         });
     }
@@ -310,8 +310,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);
                 }
@@ -341,15 +341,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();
 
@@ -384,7 +384,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]);
@@ -423,21 +423,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 {
@@ -463,7 +463,7 @@ 
         $relation = $model->{$firstRelationName};
 
         $results = [];
-        if (! is_null($relation)) {
+        if (!is_null($relation)) {
             if ($relation instanceof Collection) {
                 $currentResults = $relation->all();
             } elseif (is_array($relation)) {
@@ -476,7 +476,7 @@ 
 
             array_shift($relationArray);
 
-            if (! empty($relationArray)) {
+            if (!empty($relationArray)) {
                 foreach ($currentResults as $currentResult) {
                     $results = array_merge_recursive($results, $this->getRelatedEntries($currentResult, implode('.', $relationArray)));
                 }

src/resources/views/crud/fields/checklist_dependency.blade.php

Indentation +24 added lines, -24 removed lines

@@ -30,36 +30,36 @@
             }
         }
 
-      //for update form, get initial state of the entity
-      if (isset($id) && $id) {
+        //for update form, get initial state of the entity
+        if (isset($id) && $id) {
 
         //get entity with relations for primary dependency
-          $entity_dependencies = $entity_model->with($primary_dependency['entity'])
-          ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary'])
-          ->find($id);
+            $entity_dependencies = $entity_model->with($primary_dependency['entity'])
+            ->with($primary_dependency['entity'].'.'.$primary_dependency['entity_secondary'])
+            ->find($id);
 
-          $secondaries_from_primary = [];
+            $secondaries_from_primary = [];
 
-          //convert relation in array
-          $primary_array = $entity_dependencies->{$primary_dependency['entity']}->toArray();
+            //convert relation in array
+            $primary_array = $entity_dependencies->{$primary_dependency['entity']}->toArray();
 
-          $secondary_ids = [];
+            $secondary_ids = [];
 
-          //create secondary dependency from primary relation, used to check what checkbox must be checked from second checklist
-          if (old($primary_dependency['name'])) {
-              foreach (old($primary_dependency['name']) as $primary_item) {
-                  foreach ($dependencyArray[$primary_item] as $second_item) {
-                      $secondary_ids[$second_item] = $second_item;
-                  }
-              }
-          } else { //create dependencies from relation if not from validate error
-              foreach ($primary_array as $primary_item) {
-                  foreach ($primary_item[$secondary_dependency['entity']] as $second_item) {
-                      $secondary_ids[$second_item['id']] = $second_item['id'];
-                  }
-              }
-          }
-      }
+            //create secondary dependency from primary relation, used to check what checkbox must be checked from second checklist
+            if (old($primary_dependency['name'])) {
+                foreach (old($primary_dependency['name']) as $primary_item) {
+                    foreach ($dependencyArray[$primary_item] as $second_item) {
+                        $secondary_ids[$second_item] = $second_item;
+                    }
+                }
+            } else { //create dependencies from relation if not from validate error
+                foreach ($primary_array as $primary_item) {
+                    foreach ($primary_item[$secondary_dependency['entity']] as $second_item) {
+                        $secondary_ids[$second_item['id']] = $second_item['id'];
+                    }
+                }
+            }
+        }
 
         //json encode of dependency matrix
         $dependencyJson = json_encode($dependencyArray);

src/resources/views/crud/fields/date_range.blade.php

Spacing +3 added lines, -3 removed lines

@@ -3,11 +3,11 @@ 
 <?php
     // if the column has been cast to Carbon or Date (using attribute casting)
     // get the value as a date string
-    if (! function_exists('formatDate')) {
+    if (!function_exists('formatDate')) {
         function formatDate($entry, $dateFieldName)
         {
             $formattedDate = null;
-            if (isset($entry) && ! empty($entry->{$dateFieldName})) {
+            if (isset($entry) && !empty($entry->{$dateFieldName})) {
                 $dateField = $entry->{$dateFieldName};
                 if ($dateField instanceof \Carbon\CarbonInterface) {
                     $formattedDate = $dateField->format('Y-m-d H:i:s');
@@ -20,7 +20,7 @@ 
         }
     }
     if (isset($field['value'])) {
-        if (isset($entry) && ! is_array($field['value'])) {
+        if (isset($entry) && !is_array($field['value'])) {
             $start_value = formatDate($entry, $field['name'][0]);
             $end_value = formatDate($entry, $field['name'][1]);
         } elseif (is_array($field['value'])) {

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->has('_http_referrer') ? $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->input('id');
                     $redirectUrl = $crud->route.'/'.$itemId.'/edit';
                     if ($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'),

src/BackpackServiceProvider.php

Spacing +6 added lines, -6 removed lines

@@ -58,18 +58,18 @@ 
     public function register()
     {
         // Bind the CrudPanel object to Laravel's service container
-        $this->app->singleton('crud', function ($app) {
+        $this->app->singleton('crud', function($app) {
             return new CrudPanel($app);
         });
 
         // Bind the widgets collection object to Laravel's service container
-        $this->app->singleton('widgets', function ($app) {
+        $this->app->singleton('widgets', function($app) {
             return new Collection();
         });
 
         // load a macro for Route,
         // helps developers load all routes for a CRUD resource in one line
-        if (! Route::hasMacro('crud')) {
+        if (!Route::hasMacro('crud')) {
             $this->addRouteMacro();
         }
 
@@ -85,7 +85,7 @@ 
         $middleware_key = config('backpack.base.middleware_key');
         $middleware_class = config('backpack.base.middleware_class');
 
-        if (! is_array($middleware_class)) {
+        if (!is_array($middleware_class)) {
             $router->pushMiddlewareToGroup($middleware_key, $middleware_class);
 
             return;
@@ -187,7 +187,7 @@ 
      */
     private function addRouteMacro()
     {
-        Route::macro('crud', function ($name, $controller) {
+        Route::macro('crud', function($name, $controller) {
             // put together the route name prefix,
             // as passed to the Route::group() statements
             $routeName = '';
@@ -242,7 +242,7 @@ 
         $operationConfigs = scandir(__DIR__.'/config/backpack/operations/');
         $operationConfigs = array_diff($operationConfigs, ['.', '..']);
 
-        if (! count($operationConfigs)) {
+        if (!count($operationConfigs)) {
             return;
         }
 

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

Spacing +7 added lines, -7 removed lines

@@ -16,8 +16,8 @@ 
             $this->getDbColumnTypes();
         }
 
-        array_map(function ($field) use ($setFields, $setColumns) {
-            if ($setFields && ! isset($this->getCleanStateFields()[$field])) {
+        array_map(function($field) use ($setFields, $setColumns) {
+            if ($setFields && !isset($this->getCleanStateFields()[$field])) {
                 $this->addField([
                     'name'       => $field,
                     'label'      => $this->makeLabel($field),
@@ -30,7 +30,7 @@ 
                 ]);
             }
 
-            if ($setColumns && ! in_array($field, $this->model->getHidden()) && ! isset($this->columns()[$field])) {
+            if ($setColumns && !in_array($field, $this->model->getHidden()) && !isset($this->columns()[$field])) {
                 $this->addColumn([
                     'name'    => $field,
                     'label'   => $this->makeLabel($field),
@@ -107,7 +107,7 @@ 
 
         $dbColumnTypes = $this->getDbColumnTypes();
 
-        if (! isset($dbColumnTypes[$fieldName])) {
+        if (!isset($dbColumnTypes[$fieldName])) {
             return 'text';
         }
 
@@ -165,7 +165,7 @@ 
         $types = ['enum' => 'string'];
         $platform = $this->getSchema()->getConnection()->getDoctrineSchemaManager()->getDatabasePlatform();
         foreach ($types as $type_key => $type_value) {
-            if (! $platform->hasDoctrineTypeMappingFor($type_key)) {
+            if (!$platform->hasDoctrineTypeMappingFor($type_key)) {
                 $platform->registerDoctrineTypeMapping($type_key, $type_value);
             }
         }
@@ -216,13 +216,13 @@ 
     {
         $fillable = $this->model->getFillable();
 
-        if (! $this->driverIsSql()) {
+        if (!$this->driverIsSql()) {
             $columns = $fillable;
         } else {
             // Automatically-set columns should be both in the database, and in the $fillable variable on the Eloquent Model
             $columns = $this->model->getConnection()->getSchemaBuilder()->getColumnListing($this->model->getTable());
 
-            if (! empty($fillable)) {
+            if (!empty($fillable)) {
                 $columns = array_intersect($columns, $fillable);
             }
         }

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

Spacing +13 added lines, -13 removed lines

@@ -88,7 +88,7 @@ 
      */
     public function afterField($targetFieldName)
     {
-        $this->transformFields(function ($fields) use ($targetFieldName) {
+        $this->transformFields(function($fields) use ($targetFieldName) {
             return $this->moveField($fields, $targetFieldName, false);
         });
     }
@@ -100,7 +100,7 @@ 
      */
     public function beforeField($targetFieldName)
     {
-        $this->transformFields(function ($fields) use ($targetFieldName) {
+        $this->transformFields(function($fields) use ($targetFieldName) {
             return $this->moveField($fields, $targetFieldName, true);
         });
     }
@@ -112,7 +112,7 @@ 
      */
     public function makeFirstField()
     {
-        if (! $this->fields()) {
+        if (!$this->fields()) {
             return false;
         }
 
@@ -127,7 +127,7 @@ 
      */
     public function removeField($name)
     {
-        $this->transformFields(function ($fields) use ($name) {
+        $this->transformFields(function($fields) use ($name) {
             Arr::forget($fields, $name);
 
             return $fields;
@@ -141,7 +141,7 @@ 
      */
     public function removeFields($array_of_names)
     {
-        if (! empty($array_of_names)) {
+        if (!empty($array_of_names)) {
             foreach ($array_of_names as $name) {
                 $this->removeField($name);
             }
@@ -154,7 +154,7 @@ 
     public function removeAllFields()
     {
         $current_fields = $this->getCleanStateFields();
-        if (! empty($current_fields)) {
+        if (!empty($current_fields)) {
             foreach ($current_fields as $field) {
                 $this->removeField($field['name']);
             }
@@ -246,7 +246,7 @@ 
                 $jsonCastables = ['array', 'object', 'json'];
                 $fieldCasting = $casted_attributes[$field['name']];
 
-                if (in_array($fieldCasting, $jsonCastables) && isset($data[$field['name']]) && ! empty($data[$field['name']]) && ! is_array($data[$field['name']])) {
+                if (in_array($fieldCasting, $jsonCastables) && isset($data[$field['name']]) && !empty($data[$field['name']]) && !is_array($data[$field['name']])) {
                     try {
                         $data[$field['name']] = json_decode($data[$field['name']]);
                     } catch (\Exception $e) {
@@ -275,7 +275,7 @@ 
      */
     public function orderFields($order)
     {
-        $this->transformFields(function ($fields) use ($order) {
+        $this->transformFields(function($fields) use ($order) {
             return $this->applyOrderToFields($fields, $order);
         });
     }
@@ -301,7 +301,7 @@ 
     public function hasUploadFields()
     {
         $fields = $this->getCleanStateFields();
-        $upload_fields = Arr::where($fields, function ($value, $key) {
+        $upload_fields = Arr::where($fields, function($value, $key) {
             return isset($value['upload']) && $value['upload'] == true;
         });
 
@@ -364,7 +364,7 @@ 
         $alreadyLoaded = $this->getLoadedFieldTypes();
         $type = $this->getFieldTypeWithNamespace($field);
 
-        if (! in_array($type, $this->getLoadedFieldTypes(), true)) {
+        if (!in_array($type, $this->getLoadedFieldTypes(), true)) {
             $alreadyLoaded[] = $type;
             $this->setLoadedFieldTypes($alreadyLoaded);
 
@@ -405,7 +405,7 @@ 
      */
     public function fieldTypeNotLoaded($field)
     {
-        return ! in_array($this->getFieldTypeWithNamespace($field), $this->getLoadedFieldTypes());
+        return !in_array($this->getFieldTypeWithNamespace($field), $this->getLoadedFieldTypes());
     }
 
     /**
@@ -445,7 +445,7 @@ 
      */
     public function hasFieldWhere($attribute, $value)
     {
-        $match = Arr::first($this->getCleanStateFields(), function ($field, $fieldKey) use ($attribute, $value) {
+        $match = Arr::first($this->getCleanStateFields(), function($field, $fieldKey) use ($attribute, $value) {
             return isset($field[$attribute]) && $field[$attribute] == $value;
         });
 
@@ -461,7 +461,7 @@ 
      */
     public function firstFieldWhere($attribute, $value)
     {
-        return Arr::first($this->getCleanStateFields(), function ($field, $fieldKey) use ($attribute, $value) {
+        return Arr::first($this->getCleanStateFields(), function($field, $fieldKey) use ($attribute, $value) {
             return isset($field[$attribute]) && $field[$attribute] == $value;
         });
     }