Merge pull request #45 from rene-springmann/master

Compatibility to laravelcollective/html v5.4.8
bgultekin · Jun 12, 2017 · 290c68e · 290c68e
2 parents 0898369 + 87f0b67
commit 290c68e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "laravelcollective/html": "^5.4",
+        "laravelcollective/html": "^5.4.8",
         "illuminate/support": ">=4.2",
         "illuminate/validation": ">=4.0",
         "illuminate/routing": ">=4.0"

diff --git a/src/Bllim/Laravalid/FormBuilder.php b/src/Bllim/Laravalid/FormBuilder.php
@@ -119,11 +119,12 @@ public function textarea($name, $value = null, $options = [])
     /**
      * @see Illuminate\Html\FormBuilder
      */
-    public function select($name, $list = [], $selected = null, $options = [])
+    public function select($name, $list = [], $selected = null, array $selectAttributes = [], array $optionsAttributes = [])
     {
-        $options = $this->converter->convert(Helper::getFormAttribute($name)) + $options;
+        $optionsAttributes = $this->converter->convert(Helper::getFormAttribute($name)) + $optionsAttributes;
+        $selectAttributes = $this->converter->convert(Helper::getFormAttribute($name)) + $selectAttributes;
 
-        return parent::select($name, $list, $selected, $options);
+        return parent::select($name, $list, $selected, $selectAttributes, $optionsAttributes);
     }
 
     protected function checkable($type, $name, $value, $checked, $options)