Fixes a bug in the Laravel-Collective selectMonth and selectRange

Author: MikeAlhayek

src/HtmlGenerators/LaravelCollectiveHtml.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace CrestApps\CodeGenerator\HtmlGenerators;
 
 use CrestApps\CodeGenerator\HtmlGenerators\HtmlGeneratorBase;
@@ -21,7 +20,6 @@ protected function getFieldMinValueWithName($minValue)
     {
         return is_null($minValue) ? '' : sprintf(" 'min' => '%s',", $minValue);
     }
-
     /**
      * Gets the maxValue attribute.
      *
@@ -33,7 +31,6 @@ protected function getFieldMaxValueWithName($maxValue)
     {
         return is_null($maxValue) ? '' : sprintf(" 'max' => '%s',", $maxValue);
     }
-
     /**
      * Get the minLength attribute.
      *
@@ -45,7 +42,6 @@ protected function getFieldMinLengthName($minLength)
     {
         return empty($minLength) ? '' : sprintf(" 'minlength' => '%s',", $minLength);
     }
-
     /**
      * Gets the maxLength attribute.
      *
@@ -57,7 +53,6 @@ protected function getFieldMaxLengthName($maxLength)
     {
         return empty($maxLength) ? '' : sprintf(" 'maxlength' => '%s',", $maxLength);
     }
-
     /**
      * Gets the required attribute.
      *
@@ -69,7 +64,6 @@ protected function getFieldRequired($required)
     {
         return $required ? sprintf(" 'required' => %s,", ($required ? 'true' : 'false')) : '';
     }
-
     /**
      * Get the placeholder attribute.
      *
@@ -81,7 +75,6 @@ protected function getFieldPlaceHolder(Label $placeholder = null)
     {
         return is_null($placeholder) ? '' : sprintf(" 'placeholder' => %s,", $this->getTitle($placeholder));
     }
-
     /**
      * Get the placeholder attribute for a menu.
      *
@@ -94,7 +87,6 @@ protected function getFieldPlaceHolderForMenu(Label $placeholder = null, $name =
     {
         return $this->getFieldPlaceHolder($placeholder);
     }
-
     /**
      * Get the multiple attribute.
      *
@@ -106,7 +98,6 @@ protected function getFieldMultiple($isMulti)
     {
         return $isMulti ? "'multiple' => 'multiple'," : '';
     }
-
     /**
      * It gets converts an array to a stringbase array for the views.
      *
@@ -119,12 +110,9 @@ protected function getFieldItems(Field $field)
         if ($field->hasForeignRelation() && $field->isOnFormView) {
             return sprintf('$%s', $field->getForeignRelation()->getCollectionName());
         }
-
         $labels = $field->getOptionsByLang();
-
         return sprintf('[%s]', implode(',' . PHP_EOL, $this->getKeyValueStringsFromLabels($labels)));
     }
-
     /**
      * Gets a plain title from a giving label.
      *
@@ -137,7 +125,6 @@ protected function getPlainTitle(Label $label, $raw = false)
     {
         return sprintf(!$raw ? "'%s'" : "%s", $label->text);
     }
-
     /**
      * Gets the fields value
      *
@@ -151,13 +138,10 @@ protected function getFieldValue($value, $name)
     {
         if (!is_null($value)) {
             $modelVariable = $this->getSingularVariable($this->modelName);
-
             return sprintf("(!isset(\$%s->%s) ? '%s' : null)", $modelVariable, $name, $value);
         }
-
         return 'null';
     }
-
     /**
      * Gets checked item attribute.
      *
@@ -175,7 +159,6 @@ protected function getCheckedItem($value, $name, $defaultValue)
             $value
         );
     }
-
     /**
      * Gets selected value attribute.
      *
@@ -187,7 +170,7 @@ protected function getCheckedItem($value, $name, $defaultValue)
      */
     protected function getSelectedValue($name, $valueAccessor, $defaultValue)
     {
-        return sprintf(" (%s == %s ? true : null) ", $this->getRawOptionValue($name, $defaultValue), $valueAccessor);
+        return sprintf(" (%s == %s ? true : null) ", $this->getRawOptionValue($name, 'null'), 'null');
     }
 
     /**
@@ -203,7 +186,6 @@ protected function getMultipleCheckedItem($value, $name, $defaultValue)
     {
         return sprintf(" (%s ? true : null) ", $this->getMultipleRawOptionValue($name, $value, $defaultValue));
     }
-
     /**
      * Gets a raw value for a giving field's name.
      *
@@ -215,12 +197,10 @@ protected function getMultipleCheckedItem($value, $name, $defaultValue)
     protected function getRawOptionValue($name, $value)
     {
         $modelVariable = $this->getSingularVariable($this->modelName);
-
-        $valueString = is_null($value) ? 'null' : sprintf("'%s'", $value);
-
-        return sprintf("old('%s', isset(\$%s->%s) ? \$%s->%s : %s)", $name, $modelVariable, $name, $modelVariable, $name, $valueString);
+        $valueString = is_null($value) || $value == 'null' ? 'null' : sprintf("'%s'", $value);
+        $accessor = $this->getDefaultValueAccessor($modelVariable, $name, $valueString);
+        return sprintf("old('%s', %s)", $name, $accessor);
     }
-
     /**
      * Gets a raw value for a giving field's name.
      *
@@ -234,21 +214,37 @@ protected function getMultipleRawOptionValue($name, $value, $defaultValue)
     {
         $modelVariable = $this->getSingularVariable($this->modelName);
         $valueString = 'null';
-
         if (!is_null($value)) {
             $valueString = starts_with('$', $value) ? sprintf("%s", $value) : sprintf("'%s'", $value);
         }
-
         $defaultValueString = '[]';
-
         if (!empty($defaultValue)) {
             $joinedValues = implode(',', Helpers::wrapItems((array) $defaultValue));
             $defaultValueString = sprintf('[%s]', $joinedValues);
         }
-
-        return sprintf("in_array(%s, old('%s', isset(\$%s->%s) ? \$%s->%s : %s))", $valueString, $name, $modelVariable, $name, $modelVariable, $name, $defaultValueString);
+        $accessor = $this->getDefaultValueAccessor($modelVariable, $name, $defaultValueString);
+        return sprintf("in_array(%s, old('%s', %s))", $valueString, $name, $accessor);
+    }
+    /**
+     * Gets the best value accessor for the view
+     *
+     * @param string $modelVariable
+     * @param string $property
+     * @param string $value
+     *
+     * @return string
+     */
+    protected function getDefaultValueAccessor($modelVariable, $property, $value)
+    {
+        if (Helpers::isNewerThanOrEqualTo('5.5')) {
+            $template = sprintf('optional($%s)->%s', $modelVariable, $property);
+            if (is_null($value) || in_array($value, ['null', '[]'])) {
+                return $template;
+            }
+            return $template . ' ?: ' . $value;
+        }
+        return sprintf("isset(\$%s->%s) ? \$%s->%s : %s", $modelVariable, $property, $modelVariable, $property, $value);
     }
-
     /**
      * Gets selected value attribute.
      *
@@ -262,7 +258,6 @@ protected function getMultipleSelectedValue($name, $valueAccessor, $defaultValue
     {
         return sprintf(" (%s ? true : null) ", $name);
     }
-
     /**
      * Gets the html steps attribute.
      *
@@ -274,7 +269,6 @@ protected function getStepsValue($value)
     {
         return ($value) > 0 ? "'step' => \"any\"," : '';
     }
-
     /**
      * Gets an instance of ViewLabelsGenerator
      *

src/HtmlGenerators/StandardHtml.php

@@ -289,7 +289,11 @@ protected function getMultipleRawOptionValue($name, $value, $defaultValue)
 
         $accessor = $this->getDefaultValueAccessor($modelVariable, $name, $defaultValueString);
 
-        return sprintf("in_array(%s, old('%s', %s))", $valueString, $name, $accessor);
+        if (Helpers::isNewerThanOrEqualTo('5.5')) {
+            return sprintf("in_array(%s, old('%s', %s) ?? [])", $valueString, $name, $accessor);
+        }
+
+        return sprintf("in_array(%s, (array) old('%s', %s))", $valueString, $name, $accessor);
     }
 
     /**

src/Traits/CommonCommand.php

@@ -541,7 +541,7 @@ protected function getPathToTemplates($template = null)
         $path = Helpers::getPathWithSlash($basePath);
 
         if (!$this->isFileExists($path)) {
-            throw new Exception('Invalid template name or the templates is invalid. Make sure the following path exists: "' . $path . '"');
+            throw new Exception('Invalid template. Make sure the following path exists: "' . $path . '"');
         }
 
         return $path;