diff --git a/composer.json b/composer.json
index 30e2c2da..4fff3fc2 100755
--- a/composer.json
+++ b/composer.json
@@ -19,14 +19,14 @@
],
"require": {
"php": ">=7.0.0",
- "illuminate/http": "5.6.x-dev",
- "illuminate/routing": "5.6.x-dev",
- "illuminate/session": "5.6.x-dev",
- "illuminate/support": "5.6.x-dev",
- "illuminate/view": "5.6.x-dev"
+ "illuminate/http": "5.5.*",
+ "illuminate/routing": "5.5.*",
+ "illuminate/session": "5.5.*",
+ "illuminate/support": "5.5.*",
+ "illuminate/view": "5.5.*"
},
"require-dev": {
- "illuminate/database": "5.6.x-dev",
+ "illuminate/database": "5.5.*",
"mockery/mockery": "~0.9.4",
"phpunit/phpunit": "~5.4"
},
@@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "5.6-dev"
+ "dev-master": "5.5-dev"
},
"laravel": {
"providers": [
@@ -51,7 +51,5 @@
"Html": "Collective\\Html\\HtmlFacade"
}
}
- },
- "minimum-stability": "dev",
- "prefer-stable": true
+ }
}
diff --git a/src/FormBuilder.php b/src/FormBuilder.php
index 1c7e22d9..00ba728f 100644
--- a/src/FormBuilder.php
+++ b/src/FormBuilder.php
@@ -572,7 +572,7 @@ protected function setQuickTextAreaSize($options)
*
* @param string $name
* @param array $list
- * @param string $selected
+ * @param string|bool $selected
* @param array $selectAttributes
* @param array $optionsAttributes
* @param array $optgroupsAttributes
@@ -784,7 +784,9 @@ protected function getSelectedValue($value, $selected)
} elseif ($selected instanceof Collection) {
return $selected->contains($value) ? 'selected' : null;
}
-
+ if (is_int($value) && is_bool($selected)) {
+ return (bool)$value === $selected;
+ }
return ((string) $value === (string) $selected) ? 'selected' : null;
}
@@ -1181,7 +1183,7 @@ public function getValueAttribute($name, $value = null)
}
$request = $this->request($name);
- if (! is_null($request)) {
+ if (! is_null($request) && $name !== '_method') {
return $request;
}
diff --git a/tests/FormBuilderTest.php b/tests/FormBuilderTest.php
index e6b1765d..834afaae 100644
--- a/tests/FormBuilderTest.php
+++ b/tests/FormBuilderTest.php
@@ -464,6 +464,12 @@ public function testSelect()
'',
$result
);
+
+ $select = $this->formBuilder->select('avc', [1 => 'Yes', 0 => 'No'], true, ['placeholder' => 'Select']);
+ $this->assertEquals(
+ '',
+ $select
+ );
}
public function testSelectCollection()