[5.6] Validation in select field for boolean value of selected option (…

…#491)
LaravelCollective · Feb 12, 2018 · 41cd929 · 41cd929
1 parent 818efc2
commit 41cd929
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -787,7 +787,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;
     }
 

diff --git a/tests/FormBuilderTest.php b/tests/FormBuilderTest.php
@@ -464,6 +464,12 @@ public function testSelect()
             '<select name="countries"><option value="1" selected="selected">L</option><option value="2">M</option></select>',
             $result
         );
+
+        $select = $this->formBuilder->select('avc', [1 => 'Yes', 0 => 'No'], true, ['placeholder' => 'Select']);
+        $this->assertEquals(
+            '<select name="avc"><option value="" hidden="hidden">Select</option><option value="1" selected>Yes</option><option value="0" >No</option></select>',
+            $select
+        );
     }
 
     public function testSelectCollection()