Fix a bug with laravel-collective

Author: MikeAlhayek

src/HtmlGenerators/LaravelCollectiveHtml.php

@@ -20,6 +20,7 @@ protected function getFieldMinValueWithName($minValue)
     {
         return is_null($minValue) ? '' : sprintf(" 'min' => '%s',", $minValue);
     }
+
     /**
      * Gets the maxValue attribute.
      *
@@ -31,6 +32,7 @@ protected function getFieldMaxValueWithName($maxValue)
     {
         return is_null($maxValue) ? '' : sprintf(" 'max' => '%s',", $maxValue);
     }
+
     /**
      * Get the minLength attribute.
      *
@@ -42,6 +44,7 @@ protected function getFieldMinLengthName($minLength)
     {
         return empty($minLength) ? '' : sprintf(" 'minlength' => '%s',", $minLength);
     }
+
     /**
      * Gets the maxLength attribute.
      *
@@ -53,6 +56,7 @@ protected function getFieldMaxLengthName($maxLength)
     {
         return empty($maxLength) ? '' : sprintf(" 'maxlength' => '%s',", $maxLength);
     }
+
     /**
      * Gets the required attribute.
      *
@@ -64,6 +68,7 @@ protected function getFieldRequired($required)
     {
         return $required ? sprintf(" 'required' => %s,", ($required ? 'true' : 'false')) : '';
     }
+
     /**
      * Get the placeholder attribute.
      *
@@ -75,6 +80,7 @@ protected function getFieldPlaceHolder(Label $placeholder = null)
     {
         return is_null($placeholder) ? '' : sprintf(" 'placeholder' => %s,", $this->getTitle($placeholder));
     }
+
     /**
      * Get the placeholder attribute for a menu.
      *
@@ -87,6 +93,7 @@ protected function getFieldPlaceHolderForMenu(Label $placeholder = null, $name =
     {
         return $this->getFieldPlaceHolder($placeholder);
     }
+
     /**
      * Get the multiple attribute.
      *
@@ -98,8 +105,9 @@ protected function getFieldMultiple($isMulti)
     {
         return $isMulti ? "'multiple' => 'multiple'," : '';
     }
+
     /**
-     * It gets converts an array to a stringbase array for the views.
+     * It gets converts an array to a string based array for the views.
      *
      * @param CrestApps\CodeGenerator\Models\Field $field
      *
@@ -113,6 +121,7 @@ protected function getFieldItems(Field $field)
         $labels = $field->getOptionsByLang();
         return sprintf('[%s]', implode(',' . PHP_EOL, $this->getKeyValueStringsFromLabels($labels)));
     }
+
     /**
      * Gets a plain title from a giving label.
      *
@@ -125,6 +134,7 @@ protected function getPlainTitle(Label $label, $raw = false)
     {
         return sprintf(!$raw ? "'%s'" : "%s", $label->text);
     }
+
     /**
      * Gets the fields value
      *
@@ -142,6 +152,7 @@ protected function getFieldValue($value, $name)
         }
         return 'null';
     }
+
     /**
      * Gets checked item attribute.
      *
@@ -159,6 +170,7 @@ protected function getCheckedItem($value, $name, $defaultValue)
             $value
         );
     }
+
     /**
      * Gets selected value attribute.
      *
@@ -186,6 +198,7 @@ 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.
      *
@@ -201,6 +214,7 @@ protected function getRawOptionValue($name, $value)
         $accessor = $this->getDefaultValueAccessor($modelVariable, $name, $valueString);
         return sprintf("old('%s', %s)", $name, $accessor);
     }
+
     /**
      * Gets a raw value for a giving field's name.
      *
@@ -223,8 +237,10 @@ protected function getMultipleRawOptionValue($name, $value, $defaultValue)
             $defaultValueString = sprintf('[%s]', $joinedValues);
         }
         $accessor = $this->getDefaultValueAccessor($modelVariable, $name, $defaultValueString);
-        return sprintf("in_array(%s, old('%s', %s))", $valueString, $name, $accessor);
+
+        return sprintf("in_array(%s, old('%s', %s) ?: [])", $valueString, $name, $accessor);
     }
+
     /**
      * Gets the best value accessor for the view
      *
@@ -245,6 +261,7 @@ protected function getDefaultValueAccessor($modelVariable, $property, $value)
         }
         return sprintf("isset(\$%s->%s) ? \$%s->%s : %s", $modelVariable, $property, $modelVariable, $property, $value);
     }
+
     /**
      * Gets selected value attribute.
      *
@@ -258,6 +275,7 @@ protected function getMultipleSelectedValue($name, $valueAccessor, $defaultValue
     {
         return sprintf(" (%s ? true : null) ", $name);
     }
+
     /**
      * Gets the html steps attribute.
      *
@@ -269,6 +287,7 @@ protected function getStepsValue($value)
     {
         return ($value) > 0 ? "'step' => \"any\"," : '';
     }
+
     /**
      * Gets an instance of ViewLabelsGenerator
      *

src/HtmlGenerators/StandardHtml.php

@@ -289,11 +289,7 @@ protected function getMultipleRawOptionValue($name, $value, $defaultValue)
 
         $accessor = $this->getDefaultValueAccessor($modelVariable, $name, $defaultValueString);
 
-        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);
+        return sprintf("in_array(%s, old('%s', %s) ?: [])", $valueString, $name, $accessor);
     }
 
     /**