Merge pull request #36 from anavel/analysis-8ma6KV

Applied fixes from StyleCI
anavel · Jun 17, 2016 · 337f797 · 337f797
2 parents 3f296a8 + 6afe248
commit 337f797
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 35 deletions.
diff --git a/src/Abstractor/Eloquent/Model.php b/src/Abstractor/Eloquent/Model.php
@@ -224,7 +224,6 @@ public function getRelations()
                 } else {
                     $relations->put($relationName, $relation);
                 }
-
             }
         }
 

diff --git a/src/Abstractor/Eloquent/ModelFactory.php b/src/Abstractor/Eloquent/ModelFactory.php
@@ -89,7 +89,6 @@ public function getByName($name, $id = null)
 
     public function getByClassName($classname, array $config, $id = null)
     {
-
         $model = new Model(array_merge(['model' => $classname], $config), $this->modelManager->getAbstractionLayer($classname), $this->relationFactory, $this->fieldFactory, $this->generator);
         $model->setSlug($this->slugger->slugify((new ReflectionClass($classname))->getShortName()));
 

diff --git a/src/Abstractor/Eloquent/Relation/MiniCrud.php b/src/Abstractor/Eloquent/Relation/MiniCrud.php
@@ -326,4 +326,3 @@ public function addSecondaryRelationFields(array $fields)
         return $fields;
     }
 }
-
diff --git a/src/Abstractor/Eloquent/Relation/MiniCrudPolymorphic.php b/src/Abstractor/Eloquent/Relation/MiniCrudPolymorphic.php
@@ -40,4 +40,3 @@ public function getDisplayType()
         return self::DISPLAY_TYPE_TAB;
     }
 }
-
diff --git a/src/Abstractor/Eloquent/Relation/MiniCrudSingle.php b/src/Abstractor/Eloquent/Relation/MiniCrudSingle.php
@@ -26,7 +26,7 @@ public function setup()
      */
     public function getEditFields($arrayKey = null)
     {
-        if(empty($arrayKey)) {
+        if (empty($arrayKey)) {
             $arrayKey = $this->name;
         }
 
@@ -154,4 +154,3 @@ public function getDisplayType()
         return self::DISPLAY_TYPE_TAB;
     }
 }
-
diff --git a/src/Abstractor/Eloquent/Relation/SelectMultipleManyToMany.php b/src/Abstractor/Eloquent/Relation/SelectMultipleManyToMany.php
@@ -45,5 +45,4 @@ protected function getColumn($dbal)
     {
         return $dbal->getTableColumn($this->eloquentRelation->getRelated()->getKeyName());
     }
-
 }
diff --git a/src/Abstractor/Eloquent/Relation/Traits/CheckRelationCompatibility.php b/src/Abstractor/Eloquent/Relation/Traits/CheckRelationCompatibility.php
@@ -1,7 +1,6 @@
 <?php
 namespace Anavel\Crud\Abstractor\Eloquent\Relation\Traits;
 
-
 use Anavel\Crud\Abstractor\Exceptions\RelationException;
 
 trait CheckRelationCompatibility
@@ -12,4 +11,4 @@ public function checkRelationCompatibility()
             throw new RelationException(get_class($this->eloquentRelation)." eloquent relation is not compatible with ".$this->getType()." type");
         }
     }
-}
+}
diff --git a/src/Abstractor/Eloquent/Relation/Traits/CheckRelationConfig.php b/src/Abstractor/Eloquent/Relation/Traits/CheckRelationConfig.php
@@ -1,7 +1,6 @@
 <?php
 namespace Anavel\Crud\Abstractor\Eloquent\Relation\Traits;
 
-
 use Anavel\Crud\Abstractor\Exceptions\RelationException;
 
 trait CheckRelationConfig
@@ -19,4 +18,4 @@ public function checkNameConfig($config)
             throw new RelationException('Relation name should be set');
         }
     }
-}
+}
diff --git a/src/Abstractor/Eloquent/Traits/HandleFiles.php b/src/Abstractor/Eloquent/Traits/HandleFiles.php
@@ -63,4 +63,4 @@ protected function handleField(Request $request, $item, array $fields, $groupNam
             'skip' => $skip
         ];
     }
-}
+}
diff --git a/src/Abstractor/Eloquent/Traits/ModelFields.php b/src/Abstractor/Eloquent/Traits/ModelFields.php
@@ -3,7 +3,6 @@
 
 namespace Anavel\Crud\Abstractor\Eloquent\Traits;
 
-
 use Anavel\Crud\Contracts\Abstractor\Field;
 
 trait ModelFields
@@ -51,4 +50,4 @@ public function setConfig(array $config, $columnName)
 
         return $config;
     }
-}
+}
diff --git a/src/Abstractor/Exceptions/AbstractorException.php b/src/Abstractor/Exceptions/AbstractorException.php
@@ -3,5 +3,4 @@
 
 class AbstractorException extends \Exception
 {
-
 }
diff --git a/src/Abstractor/Exceptions/FactoryException.php b/src/Abstractor/Exceptions/FactoryException.php
@@ -3,5 +3,4 @@
 
 class FactoryException extends \Exception
 {
-
 }
diff --git a/src/Abstractor/Exceptions/RelationException.php b/src/Abstractor/Exceptions/RelationException.php
@@ -3,5 +3,4 @@
 
 class RelationException extends \Exception
 {
-
 }
diff --git a/src/Contracts/Controllers/CustomController.php b/src/Contracts/Controllers/CustomController.php
@@ -23,4 +23,4 @@ public function edit($model, $id);
     public function update(Request $request, $model, $id);
 
     public function destroy(Request $request, $model, $id);
-}
+}
diff --git a/src/Http/Controllers/HomeController.php b/src/Http/Controllers/HomeController.php
@@ -23,12 +23,11 @@ public function index(ModelAbstractorFactory $modelFactory)
             $modelAbstractor = $modelFactory->getByName($modelSlug);
             $config = $modelAbstractor->getConfig();
 
-            if (! array_key_exists('authorize', $config) || ( $config['authorize'] === true && Gate::allows('adminIndex', $modelAbstractor->getInstance()) ||  $config['authorize'] === false )) {
+            if (! array_key_exists('authorize', $config) || ($config['authorize'] === true && Gate::allows('adminIndex', $modelAbstractor->getInstance()) ||  $config['authorize'] === false)) {
                 return new RedirectResponse(route('anavel-crud.model.index', $modelSlug));
             }
-
         }
 
         abort(403);
     }
-}
+}
diff --git a/src/Http/Form/Generator.php b/src/Http/Form/Generator.php
@@ -133,14 +133,14 @@ protected function addFormFields(array $fields, $key)
         $formFields = array();
         $tempFields = array();
 
-            foreach ($fields as $fieldKey => $field) {
-                if (is_array($field)) {
-                    $group = $this->addFormFields($field, $fieldKey);
-                    $tempFields[key($group)] = $this->factory->get('group', [$group[key($group)]]);
-                } else {
-                    $tempFields[$field->getName()] = $field->getFormField();
-                }
+        foreach ($fields as $fieldKey => $field) {
+            if (is_array($field)) {
+                $group = $this->addFormFields($field, $fieldKey);
+                $tempFields[key($group)] = $this->factory->get('group', [$group[key($group)]]);
+            } else {
+                $tempFields[$field->getName()] = $field->getFormField();
             }
+        }
         $formFields[$key] = $tempFields;
         return $formFields;
     }
@@ -160,4 +160,4 @@ protected function addValidationRules(array $fields, $key)
         $rules[$key] = $tempFields;
         return $rules;
     }
-}
+}
diff --git a/src/Providers/ViewComposersServiceProvider.php b/src/Providers/ViewComposersServiceProvider.php
@@ -12,7 +12,6 @@ class ViewComposersServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-
     }
 
     /**

diff --git a/src/View/Composers/SidebarComposer.php b/src/View/Composers/SidebarComposer.php
@@ -28,7 +28,6 @@ public function compose($view)
      */
     private function getSidebarItems()
     {
-
         $modelsGroups = config('anavel-crud.modelsGroups');
         $models = config('anavel-crud.models');
         $menuItems = [];
@@ -67,9 +66,8 @@ private function getSidebarItems()
         }
 
         //Sort alphabetically de menu items
-        usort($menuItems, function($itemA, $itemB)
-        {
-            return strcmp($itemA['name'],$itemB['name']);
+        usort($menuItems, function ($itemA, $itemB) {
+            return strcmp($itemA['name'], $itemB['name']);
         });
         return $menuItems;
     }

diff --git a/src/helpers.php b/src/helpers.php
@@ -41,4 +41,4 @@ function transcrud($text)
 
         return str_replace('anavel-crud::models.', '', $translation);
     }
-}
+}