Laravel up to 5.6 compatibility

Default values

Author: gabsource

README.md

@@ -88,6 +88,16 @@ By default this package will append an asterisk `*` to the label of required fie
 BootFormm:open([ 'label_required_mark' => '(required)', 'group_required_class' => 'field-required' ])
 ```
 
+### Default values
+
+You can force default values by passing the values to the `open` method :
+
+```
+BootFormm:open([ 'values' => ['foo' => 'bar'] ])
+```
+
+These values take precedence over the model values, but not the provided or the old/request ones.
+
 ## Usage
 
 When used in a blade template enclose the helper methods inside an unescaped block: `{!! !!}`

composer.json

@@ -19,10 +19,10 @@
   ],
   "require": {
     "php": ">=5.4.0",
-    "illuminate/config": "5.0.x|5.1.x|5.2.x|5.3.x|5.4.x|5.5.x",
-    "illuminate/session": "5.0.x|5.1.x|5.2.x|5.3.x|5.4.x|5.5.x",
-    "illuminate/support": "5.0.x|5.1.x|5.2.x|5.3.x|5.4.x|5.5.x",
-    "laravelcollective/html": "5.0.x|5.1.x|5.2.x|5.3.x|5.4.x|5.5.x"
+    "illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
+    "illuminate/session": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
+    "illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
+    "laravelcollective/html": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*"
   },
   "require-dev": {
     "phpunit/phpunit": "~5.7",

src/BootstrapForm.php

@@ -20,9 +20,9 @@ class BootstrapForm
     protected $html;
 
     /**
-     * Illuminate FormBuilder instance.
+     * Custom FormBuilder instance.
      *
-     * @var \Collective\Html\FormBuilder
+     * @var \Bnb\BootstrapForm\FormBuilder
      */
     protected $form;
 
@@ -154,6 +154,11 @@ public function open(array $options = [])
             $this->setErrorBag($options['errorbag']);
         }
 
+        if (array_key_exists('values', $options)) {
+            $this->form->setDefaultValues($options['values']);
+            unset($options['values']);
+        }
+
         return $this->form->open($options);
     }
 
@@ -1091,6 +1096,18 @@ protected function setErrorBag($errorBag)
         $this->errorBag = $errorBag;
     }
 
+    /**
+     * Set the errorBag used for validation
+     *
+     * @param $errorBag
+     *
+     * @return void
+     */
+    protected function setDefaultValues($values)
+    {
+        $this->form->setDefaultValues($values);
+    }
+
 
     /**
      * Flatten arrayed field names to work with the validator, including removing "[]",

src/FormBuilder.php

@@ -8,51 +8,47 @@
 
 namespace Bnb\BootstrapForm;
 
-use Illuminate\Support\Collection;
-
 class FormBuilder extends \Collective\Html\FormBuilder
 {
-    public function __construct(\Collective\Html\FormBuilder $form) {
-        parent::__construct($form->html, $form->url, $form->view, $form->csrfToken, $form->request);
-    }
-
 
     /**
-     * Create a placeholder select element option.
+     * Default values that prevail over models one (lower priority than old and request)
      *
-     * @param $display
-     * @param $selected
+     * @var array
+     */
+    protected $defaultValues = [];
+
+
+    /**
+     * FormBuilder constructor.
      *
-     * @return \Illuminate\Support\HtmlString
+     * @param \Collective\Html\FormBuilder $form
      */
-    protected function placeholderOption($display, $selected)
+    public function __construct($form)
     {
-        $selected = $this->getSelectedValue(null, $selected);
+        parent::__construct($form->html, $form->url, $form->view, $form->csrfToken, $form->request);
+    }
 
-        $options = [
-            'selected' => $selected,
-            'value' => ''
-        ];
 
-        return $this->toHtmlString('<option' . $this->html->attributes($options) . '>' . e($display) . '</option>');
+    public function getValueAttribute($name, $value = null)
+    {
+        if ($value === null && isset($this->defaultValues['name'])) {
+            $value = $this->defaultValues['name'];
+        }
+
+        return parent::getValueAttribute($name, $value);
     }
 
+
     /**
-     * Determine if the value is selected.
+     * Set the default values that prevail over model ones (useful for filter)
      *
-     * @param  string $value
-     * @param  string $selected
+     * @param array $values
      *
-     * @return null|string
+     * @return void
      */
-    protected function getSelectedValue($value, $selected)
+    public function setDefaultValues(array $values)
     {
-        if (is_array($selected)) {
-            return in_array($value, $selected, true) || in_array((string) $value, $selected, true) ? 'selected' : null;
-        } elseif ($selected instanceof Collection) {
-            return $selected->contains($value) ? 'selected' : null;
-        }
-
-        return ((string) $value == (string) $selected) ? 'selected' : null;
+        $this->defaultValues = $values;
     }
 }