[RF] refactor to ValidationRule class

Author: tswonke

src/Schemas/MigrationField.php

@@ -57,7 +57,7 @@ private function fillObject(string $param)
     /**
      * @return string
      */
-    public function getName()
+    public function getField()
     {
         return $this->name;
     }

src/Schemas/ValidationRule.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace Webfactor\Laravel\Generators\Schemas;
+
+class ValidationRule
+{
+    private $type;
+
+    private $field;
+
+    private $required = true;
+
+    public function __construct(MigrationField $migrationField)
+    {
+        if ($migrationField->isNullable()) {
+            $this->required = false;
+        }
+
+        $this->type = $migrationField->getType();
+        $this->field = $migrationField->getField();
+    }
+
+    public function generateRuleString(): ?string
+    {
+        if ($this->isRequired()) {
+            return 'required';
+        }
+
+        return null;
+    }
+
+    /**
+     * @return string
+     */
+    public function getField()
+    {
+        return $this->field;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isRequired()
+    {
+        return $this->required;
+    }
+}

src/Services/BackpackCrudRequestService.php

@@ -4,12 +4,14 @@
 
 use Webfactor\Laravel\Generators\Contracts\ServiceAbstract;
 use Webfactor\Laravel\Generators\Contracts\ServiceInterface;
+use Webfactor\Laravel\Generators\Helper\ShortSyntaxArray;
+use Webfactor\Laravel\Generators\Schemas\ValidationRule;
 
 class BackpackCrudRequestService extends ServiceAbstract implements ServiceInterface
 {
     protected $relativeToBasePath = 'app/Http/Requests/Admin';
 
-    private $rules;
+    private $rules = [];
 
     public function call()
     {
@@ -18,34 +20,45 @@ public function call()
         ]);
 
         $this->addLatestFileToIdeStack();
-        $this->fillRulesInGeneratedRequestFromSchema();
+
+        $this->setRulesFromSchema();
+        $this->fillRulesInGeneratedRequest();
     }
 
     public function getName(string $entity): string
     {
         return ucfirst($entity);
     }
 
-    private function fillRulesInGeneratedRequestFromSchema()
+    private function fillRulesInGeneratedRequest()
     {
         $requestFile = end($this->command->filesToBeOpened);
 
         $request = $this->filesystem->get($requestFile);
-        $request = str_replace('__rules__', $this->getRulesFromSchema(), $request);
+        $request = str_replace('__rules__', $this->getRulesAsString(), $request);
         $this->filesystem->put($requestFile, $request);
     }
 
     /**
      * @return string
      */
-    private function getRulesFromSchema()
+    private function setRulesFromSchema()
     {
         $this->command->schema->getStructure()->each(function ($field) {
-            if (!$field->isNullable()) {
-                $this->rules .= "'" . $field->getName() . "' => '" . $field->makeValidationRule() . "',\n";
-            }
+            array_push($this->rules, new ValidationRule($field));
         });
+    }
+
+    private function getRulesAsString()
+    {
+        $rulesArray = [];
+
+        foreach ($this->rules as $validationRule) {
+            if ($ruleString = $validationRule->generateRuleString()) {
+                $rulesArray[$validationRule->getField()] = $ruleString;
+            }
+        }
 
-        return $this->rules;
+        return ShortSyntaxArray::parse($rulesArray);
     }
 }

stubs/crud-request.stub

@@ -25,8 +25,7 @@ class DummyClassRequest extends FormRequest
      */
     public function rules()
     {
-        return [
-            __rules__        ];
+        return __rules__;
     }
 
     /**