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 +20 added lines, -20 removed lines

@@ -127,13 +127,13 @@ 
         }
 
         $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 (! 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];
@@ -164,7 +164,7 @@ 
 
         $relations = collect();
 
-        if (! empty($configRelations)) {
+        if (!empty($configRelations)) {
             foreach ($configRelations as $relationName => $configRelation) {
                 if (is_int($relationName)) {
                     $relationName = $configRelation;
@@ -172,7 +172,7 @@ 
 
                 $config = [];
                 if ($configRelation !== $relationName) {
-                    if (! is_array($configRelation)) {
+                    if (!is_array($configRelation)) {
                         $config['type'] = $configRelation;
                     } else {
                         $config = $configRelation;
@@ -187,7 +187,7 @@ 
                 $secondaryRelations = $relation->getSecondaryRelations();
 
 
-                if (! $secondaryRelations->isEmpty()) {
+                if (!$secondaryRelations->isEmpty()) {
                     $relations->put($relationName,
                         collect(['relation' => $relation, 'secondaryRelations' => $secondaryRelations]));
                 } else {
@@ -209,7 +209,7 @@ 
     {
         $columns = $this->getColumns('list');
 
-        $fieldsPresentation = $this->getConfigValue('fields_presentation') ? : [];
+        $fieldsPresentation = $this->getConfigValue('fields_presentation') ?: [];
 
         $fields = array();
         foreach ($columns as $name => $column) {
@@ -244,7 +244,7 @@ 
     {
         $columns = $this->getColumns('detail');
 
-        $fieldsPresentation = $this->getConfigValue('fields_presentation') ? : [];
+        $fieldsPresentation = $this->getConfigValue('fields_presentation') ?: [];
 
         $fields = array();
         foreach ($columns as $name => $column) {
@@ -284,7 +284,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];
@@ -305,17 +305,17 @@ 
                     ->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][] = $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',
                             'validation'   => null,
@@ -359,7 +359,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());
@@ -371,7 +371,7 @@ 
             return;
         }
 
-        if (! empty($fields['main'])) {
+        if (!empty($fields['main'])) {
             $skipNext = false;
             foreach ($fields['main'] as $key => $field) {
                 if ($skipNext === true) {
@@ -382,19 +382,19 @@ 
 
                 if (get_class($field->getFormField()) === \FormManager\Fields\File::class) {
                     $handleResult = $this->handleField($request, $item, $fields, $key, 'main', $fieldName);
-                    if (! empty($handleResult['skipNext'])) {
+                    if (!empty($handleResult['skipNext'])) {
                         $skipNext = $handleResult['skipNext'];
                     }
-                    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)) {
+                if (!empty($requestValue)) {
                     $item->setAttribute(
                         $fieldName,
                         $field->applyFunctions($requestValue)
@@ -408,7 +408,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 +3 added lines

@@ -9,6 +9,9 @@
 
 trait HandleFiles
 {
+    /**
+     * @param string $groupName
+     */
     protected function handleField(Request $request, $item, array $fields, $currentKey,  $groupName, $fieldName)
     {
         $modelFolder = $this->slug . DIRECTORY_SEPARATOR;

Spacing +11 added lines, -11 removed lines

@@ -9,19 +9,19 @@ 
 
 trait HandleFiles
 {
-    protected function handleField(Request $request, $item, array $fields, $currentKey,  $groupName, $fieldName)
+    protected function handleField(Request $request, $item, array $fields, $currentKey, $groupName, $fieldName)
     {
-        $modelFolder = $this->slug . DIRECTORY_SEPARATOR;
+        $modelFolder = $this->slug.DIRECTORY_SEPARATOR;
         $basePath = base_path(config('anavel-crud.uploads_path'));
-        $modelPath = $basePath . $modelFolder;
+        $modelPath = $basePath.$modelFolder;
         $skipNext = false;
         $requestValue = null;
-        if (! empty($fields[$groupName][$currentKey + 1]) && $fields[$groupName][$currentKey + 1]->getName() === $fieldName . '__delete') {
+        if (!empty($fields[$groupName][$currentKey + 1]) && $fields[$groupName][$currentKey + 1]->getName() === $fieldName.'__delete') {
             //We never want to save this field, it doesn't exist in the DB
             $skipNext = true;
 
             //If user wants to delete the existing file
-            if (! empty($request->input("main.{$fieldName}__delete"))) {
+            if (!empty($request->input("main.{$fieldName}__delete"))) {
                 $adapter = new Local($basePath);
                 $filesystem = new Filesystem($adapter);
                 if ($filesystem->has($item->$fieldName)) {
@@ -38,18 +38,18 @@ 
                 ];
             }
         }
-        if ($request->hasFile($groupName .'.'.$fieldName)) {
-            $fileName = uniqid() . '.' . $request->file($groupName .'.'.$fieldName)->getClientOriginalExtension();
+        if ($request->hasFile($groupName.'.'.$fieldName)) {
+            $fileName = uniqid().'.'.$request->file($groupName.'.'.$fieldName)->getClientOriginalExtension();
 
 
-            $request->file($groupName .'.'.$fieldName)->move(
+            $request->file($groupName.'.'.$fieldName)->move(
                 $modelPath,
                 $fileName
             );
 
-            $requestValue = $modelFolder . $fileName;
-        } elseif (! $request->file($groupName .'.'.$fieldName)->isValid()) {
-            throw new \Exception($request->file($groupName .'.'.$fieldName)->getErrorMessage());
+            $requestValue = $modelFolder.$fileName;
+        } elseif (!$request->file($groupName.'.'.$fieldName)->isValid()) {
+            throw new \Exception($request->file($groupName.'.'.$fieldName)->getErrorMessage());
         }
 
         return [