Skip to content

Commit 290c68e

Browse files
authored
Merge pull request #45 from rene-springmann/master
Compatibility to laravelcollective/html v5.4.8
2 parents 0898369 + 87f0b67 commit 290c68e

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"require": {
1313
"php": ">=5.3.0",
14-
"laravelcollective/html": "^5.4",
14+
"laravelcollective/html": "^5.4.8",
1515
"illuminate/support": ">=4.2",
1616
"illuminate/validation": ">=4.0",
1717
"illuminate/routing": ">=4.0"

src/Bllim/Laravalid/FormBuilder.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,11 +119,12 @@ public function textarea($name, $value = null, $options = [])
119119
/**
120120
* @see Illuminate\Html\FormBuilder
121121
*/
122-
public function select($name, $list = [], $selected = null, $options = [])
122+
public function select($name, $list = [], $selected = null, array $selectAttributes = [], array $optionsAttributes = [])
123123
{
124-
$options = $this->converter->convert(Helper::getFormAttribute($name)) + $options;
124+
$optionsAttributes = $this->converter->convert(Helper::getFormAttribute($name)) + $optionsAttributes;
125+
$selectAttributes = $this->converter->convert(Helper::getFormAttribute($name)) + $selectAttributes;
125126

126-
return parent::select($name, $list, $selected, $options);
127+
return parent::select($name, $list, $selected, $selectAttributes, $optionsAttributes);
127128
}
128129

129130
protected function checkable($type, $name, $value, $checked, $options)

0 commit comments

Comments
 (0)