anavel / crud

src/Abstractor/Eloquent/Model.php

Unused Use Statements -2 removed lines

@@ -16,8 +16,6 @@
 use Anavel\Crud\Abstractor\Exceptions\AbstractorException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Collection;
-use League\Flysystem\Adapter\Local;
-use League\Flysystem\Filesystem;
 
 class Model implements ModelAbstractorContract
 {

Spacing +26 added lines, -26 removed lines

@@ -143,10 +143,10 @@ 
         }
 
         $customDisplayedColumns = $this->getConfigValue($action, 'display');
-        $customHiddenColumns = $this->getConfigValue($action, 'hide') ? : [];
+        $customHiddenColumns = $this->getConfigValue($action, 'hide') ?: [];
 
         $columns = array();
-        if (! empty($customDisplayedColumns) && is_array($customDisplayedColumns)) {
+        if (!empty($customDisplayedColumns) && is_array($customDisplayedColumns)) {
             foreach ($customDisplayedColumns as $customColumn) {
                 if (strpos($customColumn, '.')) {
                     $customColumnRelation = explode('.', $customColumn);
@@ -161,14 +161,14 @@ 
 
                     $relationColumns = $nestedRelation->getModelAbstractor()->getColumns($action);
 
-                    if (! array_key_exists($customColumnRelationFieldName, $relationColumns)) {
-                        throw new AbstractorException("Column " . $customColumnRelationFieldName . " does not exist on relation " . implode('.', $customColumnRelation) . " of model " . $this->getModel());
+                    if (!array_key_exists($customColumnRelationFieldName, $relationColumns)) {
+                        throw new AbstractorException("Column ".$customColumnRelationFieldName." does not exist on relation ".implode('.', $customColumnRelation)." of model ".$this->getModel());
                     }
 
                     $columns[$customColumn] = $relationColumns[$customColumnRelationFieldName];
                 } else {
-                    if (! array_key_exists($customColumn, $tableColumns)) {
-                        throw new AbstractorException("Column " . $customColumn . " does not exist on " . $this->getModel());
+                    if (!array_key_exists($customColumn, $tableColumns)) {
+                        throw new AbstractorException("Column ".$customColumn." does not exist on ".$this->getModel());
                     }
 
                     $columns[$customColumn] = $tableColumns[$customColumn];
@@ -195,8 +195,8 @@ 
     {
         $relations = $modelAbstractor->getRelations();
 
-        if (! $relations->has($relationName)) {
-            throw new AbstractorException("Relation " . $relationName . " not configured on " . $modelAbstractor->getModel());
+        if (!$relations->has($relationName)) {
+            throw new AbstractorException("Relation ".$relationName." not configured on ".$modelAbstractor->getModel());
         }
 
         $relation = $relations->get($relationName);
@@ -217,7 +217,7 @@ 
 
         $relations = collect();
 
-        if (! empty($configRelations)) {
+        if (!empty($configRelations)) {
             foreach ($configRelations as $relationName => $configRelation) {
                 if (is_int($relationName)) {
                     $relationName = $configRelation;
@@ -225,7 +225,7 @@ 
 
                 $config = [];
                 if ($configRelation !== $relationName) {
-                    if (! is_array($configRelation)) {
+                    if (!is_array($configRelation)) {
                         $config['type'] = $configRelation;
                     } else {
                         $config = $configRelation;
@@ -240,7 +240,7 @@ 
                 $secondaryRelations = $relation->getSecondaryRelations();
 
 
-                if (! $secondaryRelations->isEmpty()) {
+                if (!$secondaryRelations->isEmpty()) {
                     $relations->put(
                         $relationName,
                         collect(['relation' => $relation, 'secondaryRelations' => $secondaryRelations])
@@ -263,7 +263,7 @@ 
     {
         $columns = $this->getColumns('list');
 
-        $fieldsPresentation = $this->getConfigValue('fields_presentation') ? : [];
+        $fieldsPresentation = $this->getConfigValue('fields_presentation') ?: [];
 
         $fields = array();
         foreach ($columns as $name => $column) {
@@ -298,7 +298,7 @@ 
     {
         $columns = $this->getColumns('detail');
 
-        $fieldsPresentation = $this->getConfigValue('fields_presentation') ? : [];
+        $fieldsPresentation = $this->getConfigValue('fields_presentation') ?: [];
 
         $fields = array();
         foreach ($columns as $name => $column) {
@@ -338,7 +338,7 @@ 
 
         $fields = array();
         foreach ($columns as $name => $column) {
-            if (! in_array($name, $this->getReadOnlyColumns())) {
+            if (!in_array($name, $this->getReadOnlyColumns())) {
                 $presentation = null;
                 if (array_key_exists($name, $this->fieldsPresentation)) {
                     $presentation = $this->fieldsPresentation[$name];
@@ -359,24 +359,24 @@ 
                     ->setConfig($config)
                     ->get();
 
-                if (! empty($this->instance) && ! empty($this->instance->getAttribute($name))) {
+                if (!empty($this->instance) && !empty($this->instance->getAttribute($name))) {
                     $field->setValue($this->instance->getAttribute($name));
                 }
 
                 $fields[$arrayKey][$name] = $field;
 
-                if (! empty($config['form_type']) && $config['form_type'] === 'file') {
+                if (!empty($config['form_type']) && $config['form_type'] === 'file') {
                     $field = $this->fieldFactory
                         ->setColumn($column)
                         ->setConfig([
-                            'name'         => $name . '__delete',
+                            'name'         => $name.'__delete',
                             'presentation' => null,
                             'form_type'    => 'checkbox',
                             'no_validate'  => true,
                             'functions'    => null
                         ])
                         ->get();
-                    $fields[$arrayKey][$name . '__delete'] = $field;
+                    $fields[$arrayKey][$name.'__delete'] = $field;
                 }
             }
         }
@@ -413,7 +413,7 @@ 
     {
         /** @var \ANavallaSuiza\Laravel\Database\Contracts\Manager\ModelManager $modelManager */
         $modelManager = App::make('ANavallaSuiza\Laravel\Database\Contracts\Manager\ModelManager');
-        if (! empty($this->instance)) {
+        if (!empty($this->instance)) {
             $item = $this->instance;
         } else {
             $item = $modelManager->getModelInstance($this->getModel());
@@ -425,7 +425,7 @@ 
             return;
         }
 
-        if (! empty($fields['main'])) {
+        if (!empty($fields['main'])) {
             $skip = null;
             foreach ($fields['main'] as $key => $field) {
                 /** @var FieldContract $field */
@@ -449,21 +449,21 @@ 
                 }
 
                 if (get_class($field->getFormField()) === \FormManager\Fields\File::class) {
-                    $handleResult = $this->handleField($request, $item, $fields['main'], 'main', $fieldName,$this->mustDeleteFilesInFilesystem);
-                    if (! empty($handleResult['skip'])) {
+                    $handleResult = $this->handleField($request, $item, $fields['main'], 'main', $fieldName, $this->mustDeleteFilesInFilesystem);
+                    if (!empty($handleResult['skip'])) {
                         $skip = $handleResult['skip'];
                     }
-                    if (! empty($handleResult['requestValue'])) {
+                    if (!empty($handleResult['requestValue'])) {
                         $requestValue = $handleResult['requestValue'];
                     }
                 }
 
 
-                if (! $field->saveIfEmpty() && empty($requestValue)) {
+                if (!$field->saveIfEmpty() && empty($requestValue)) {
                     continue;
                 }
 
-                if (! empty($requestValue) || (empty($requestValue) && ! empty($item->getAttribute($fieldName)))) {
+                if (!empty($requestValue) || (empty($requestValue) && !empty($item->getAttribute($fieldName)))) {
                     $item->setAttribute(
                         $fieldName,
                         $field->applyFunctions($requestValue)
@@ -477,7 +477,7 @@ 
         $this->setInstance($item);
 
 
-        if (! empty($relations = $this->getRelations())) {
+        if (!empty($relations = $this->getRelations())) {
             foreach ($relations as $relationKey => $relation) {
                 if ($relation instanceof Collection) {
                     $input = $request->input($relationKey);

src/Abstractor/Eloquent/Traits/HandleFiles.php

Doc Comments +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
      * @param Request $request
      * @param Model $item
      * @param array $fields
-     * @param $groupName
+     * @param string $groupName
      * @param $fieldName
      * @param bool $mustDeleteFilesInFilesystem
      * @return array

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 namespace Anavel\Crud\Abstractor\Eloquent\Traits;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\App;
 use League\Flysystem\Adapter\Local;
 use League\Flysystem\Filesystem;
 use Illuminate\Http\Request;

Spacing +20 added lines, -20 removed lines

@@ -21,26 +21,26 @@ 
      * @return array
      * @throws \Exception
      */
-    protected function handleField(Request $request, $item, array $fields, $groupName, $fieldName, $mustDeleteFilesInFilesystem=false)
+    protected function handleField(Request $request, $item, array $fields, $groupName, $fieldName, $mustDeleteFilesInFilesystem = false)
     {
 
 
-        $normalizeGroupName = str_replace('.','#',$groupName);
-        $contentFromUploadedField="uploaded-content.{$normalizeGroupName}#{$fieldName}#";
-        $modelFolder = $this->slug . DIRECTORY_SEPARATOR;
-        $basePath = base_path(DIRECTORY_SEPARATOR . 'public' . DIRECTORY_SEPARATOR .config('anavel-crud.uploads_path'));
-        $modelPath = $basePath . $modelFolder;
+        $normalizeGroupName = str_replace('.', '#', $groupName);
+        $contentFromUploadedField = "uploaded-content.{$normalizeGroupName}#{$fieldName}#";
+        $modelFolder = $this->slug.DIRECTORY_SEPARATOR;
+        $basePath = base_path(DIRECTORY_SEPARATOR.'public'.DIRECTORY_SEPARATOR.config('anavel-crud.uploads_path'));
+        $modelPath = $basePath.$modelFolder;
         $skip = null;
         $requestValue = null;
 
 
-        if (! empty($fields["{$fieldName}__delete"])) {
+        if (!empty($fields["{$fieldName}__delete"])) {
             //We never want to save this field, it doesn't exist in the DB
             $skip = "{$fieldName}__delete";
 
 
             //If user wants to delete the existing file
-            if (! empty($request->input("{$groupName}.{$fieldName}__delete"))) {
+            if (!empty($request->input("{$groupName}.{$fieldName}__delete"))) {
                 $adapter = new Local($basePath);
                 $filesystem = new Filesystem($adapter);
                 if ($filesystem->has($item->$fieldName) && $mustDeleteFilesInFilesystem) {
@@ -58,32 +58,32 @@ 
             }
         }
 
-        if($request->has($contentFromUploadedField))
+        if ($request->has($contentFromUploadedField))
         {
             $requestValue = $request->input($contentFromUploadedField);
 
-        }elseif ($request->hasFile($groupName .'.'.$fieldName)) {
-            $fileName = pathinfo($request->file($groupName .'.'.$fieldName)->getClientOriginalName(), PATHINFO_FILENAME);
-            $extension = pathinfo($request->file($groupName .'.'.$fieldName)->getClientOriginalName(), PATHINFO_EXTENSION);
+        }elseif ($request->hasFile($groupName.'.'.$fieldName)) {
+            $fileName = pathinfo($request->file($groupName.'.'.$fieldName)->getClientOriginalName(), PATHINFO_FILENAME);
+            $extension = pathinfo($request->file($groupName.'.'.$fieldName)->getClientOriginalName(), PATHINFO_EXTENSION);
 
-            $fileName = uniqid() . '_' . slugify($fileName);
-            if (! empty($extension)) {
-                $fileName .= '.' . $extension;
+            $fileName = uniqid().'_'.slugify($fileName);
+            if (!empty($extension)) {
+                $fileName .= '.'.$extension;
             }
 
 
-            $request->file($groupName .'.'.$fieldName)->move(
+            $request->file($groupName.'.'.$fieldName)->move(
                 $modelPath,
                 $fileName
             );
 
-            $requestValue = $modelFolder . $fileName;
-        } elseif (! empty($request->file($groupName .'.'.$fieldName)) && ! $request->file($groupName .'.'.$fieldName)->isValid()) {
-            throw new \Exception($request->file($groupName .'.'.$fieldName)->getErrorMessage());
+            $requestValue = $modelFolder.$fileName;
+        } elseif (!empty($request->file($groupName.'.'.$fieldName)) && !$request->file($groupName.'.'.$fieldName)->isValid()) {
+            throw new \Exception($request->file($groupName.'.'.$fieldName)->getErrorMessage());
         }
 
         //Avoid losing the existing filename if the user doesn't change it:
-        if (empty($requestValue) && (! empty($item->$fieldName))) {
+        if (empty($requestValue) && (!empty($item->$fieldName))) {
             $requestValue = $item->$fieldName;
         }
 

Braces +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
         {
             $requestValue = $request->input($contentFromUploadedField);
 
-        }elseif ($request->hasFile($groupName .'.'.$fieldName)) {
+        } elseif ($request->hasFile($groupName .'.'.$fieldName)) {
             $fileName = pathinfo($request->file($groupName .'.'.$fieldName)->getClientOriginalName(), PATHINFO_FILENAME);
             $extension = pathinfo($request->file($groupName .'.'.$fieldName)->getClientOriginalName(), PATHINFO_EXTENSION);
 

src/Abstractor/Eloquent/Relation/MiniCrud.php

Spacing +6 added lines, -6 removed lines

@@ -147,7 +147,7 @@ 
 
                 $config = [
                     'name' => $columnName,
-                    'presentation' => $this->name . ' ' . ucfirst(transcrud($columnName)),
+                    'presentation' => $this->name.' '.ucfirst(transcrud($columnName)),
                     'form_type' => $formType,
                     'no_validate' => true,
                     'validation' => null,
@@ -168,7 +168,7 @@ 
                     $field = $this->fieldFactory
                         ->setColumn($column)
                         ->setConfig([
-                            'name' => $columnName . '__delete',
+                            'name' => $columnName.'__delete',
                             'presentation' => null,
                             'form_type' => 'checkbox',
                             'no_validate' => true,
@@ -176,7 +176,7 @@ 
                             'functions' => null
                         ])
                         ->get();
-                    $fields[$columnName . '__delete'] = $field;
+                    $fields[$columnName.'__delete'] = $field;
                 }
             }
         }
@@ -221,12 +221,12 @@ 
 
                     if (get_class($field->getFormField()) === \FormManager\Fields\File::class) {
                         $handleResult = $this->handleField($request, $relationModel, $fieldsBase,
-                            $this->name . ".$relationIndex", $fieldName, $this->modelAbstractor->mustDeleteFilesInFilesystem());
-                        if (! empty($handleResult['skip'])) {
+                            $this->name.".$relationIndex", $fieldName, $this->modelAbstractor->mustDeleteFilesInFilesystem());
+                        if (!empty($handleResult['skip'])) {
                             $skip = $handleResult['skip'];
                             unset($relationArray[$relationIndex][$skip]);
                         }
-                        if (! empty($handleResult['requestValue'])) {
+                        if (!empty($handleResult['requestValue'])) {
                             $relationArray[$relationIndex][$fieldName] = $handleResult['requestValue'];
                         }
                     }