Fix rule validations being populated after they are already required (#845)

This works around an edge case where the swagger documentation code is
attempting to determine if a field is required before the validation
rules have been generated for that particular field.

Co-authored-by: Andrew Keynes <[email protected]>

Author: Orteko

src/Generators/ModelGenerator.php

@@ -55,6 +55,7 @@ public function generate()
 
     private function fillTemplate($templateData)
     {
+        $rules = $this->generateRules();
         $templateData = fill_template($this->commandData->dynamicVars, $templateData);
 
         $templateData = $this->fillSoftDeletes($templateData);
@@ -81,7 +82,7 @@ private function fillTemplate($templateData)
 
         $templateData = str_replace('$FIELDS$', implode(','.infy_nl_tab(1, 2), $fillables), $templateData);
 
-        $templateData = str_replace('$RULES$', implode(','.infy_nl_tab(1, 2), $this->generateRules()), $templateData);
+        $templateData = str_replace('$RULES$', implode(','.infy_nl_tab(1, 2), $rules), $templateData);
 
         $templateData = str_replace('$CAST$', implode(','.infy_nl_tab(1, 2), $this->generateCasts()), $templateData);