Merge pull request #8 from RonasIT/dpankratov/version-update

Dpankratov/version update

Author: DenTray

src/Commands/MakeEntityCommand.php

@@ -216,10 +216,10 @@ protected function customVarExport($expression)
             '/\)/' => ']',
             '/=> \\n/' => '=>',
             '/=>.+\[/' => '=> [',
-            '/^ {8}/m' => "\t\t\t\t",
-            '/^ {6}/m' => "\t\t\t",
-            '/^ {4}/m' => "\t\t",
-            '/^ {2}/m' => "\t",
+            '/^ {8}/m' => str_repeat(' ', 10),
+            '/^ {6}/m' => str_repeat(' ', 8),
+            '/^ {4}/m' => str_repeat(' ', 6),
+            '/^ {2}/m' => str_repeat(' ', 4),
         ];
 
         return preg_replace(array_keys($patterns), array_values($patterns), $defaultExpression);

src/Generators/RequestsGenerator.php

@@ -86,7 +86,7 @@ protected function getGetValidationParameters()
         $parameters['array'] = ['with'];
 
         $parameters['string-required'] = ['with.*'];
-        
+
         return $this->getValidationParameters($parameters, true);
     }
 
@@ -104,7 +104,9 @@ protected function getSearchValidationParameters()
 
         $parameters['boolean'] = ['desc'];
 
-        $parameters['string'] = ['query', 'order_by'];
+        $parameters['string'] = ['order_by'];
+
+        $parameters['string-nullable'] = ['query'];
 
         $parameters['string-required'] = ['with.*'];
 
@@ -117,19 +119,21 @@ public function getValidationParameters($parameters, $requiredAvailable)
 
         foreach ($parameters as $type => $parameterNames) {
             $isRequired = Str::contains($type, 'required');
+            $isNullable = Str::contains($type, 'nullable');
             $type = head(explode('-', $type));
 
             foreach ($parameterNames as $name) {
                 $required = $isRequired && $requiredAvailable;
+                $nullable = $isNullable;
 
-                $result[] = $this->getRules($name, $type, $required);
+                $result[] = $this->getRules($name, $type, $required, $nullable);
             }
         }
 
         return $result;
     }
 
-    protected function getRules($name, $type, $required)
+    protected function getRules($name, $type, $required, $nullable)
     {
         $replaces = [
             'timestamp' => 'date',
@@ -153,6 +157,10 @@ protected function getRules($name, $type, $required)
             $rules[] = 'required';
         }
 
+        if ($nullable) {
+            $rules[] = 'nullable';
+        }
+
         return [
             'name' => $name,
             'rules' => $rules

stubs/service.blade.php

@@ -1,7 +1,7 @@
 namespace App\Services;
 
-use App\Repositories\{{$entity}}Repository;
 use RonasIT\Support\Services\EntityService;
+use App\Repositories\{{$entity}}Repository;
 {{--
     Laravel inserts two spaces between @property and type, so we are forced
     to use hack here to preserve one space