Merge pull request #78 from JesseLeite/fix-checkbox-array-binding

Fix checkbox array binding
adamwathan · Feb 19, 2016 · a8fc8b9 · a8fc8b9
2 parents 4a26473 + c5a55bb
commit a8fc8b9
Show file tree

Hide file tree

Showing 22 changed files with 252 additions and 164 deletions.
diff --git a/src/AdamWathan/Form/Elements/Button.php b/src/AdamWathan/Form/Elements/Button.php
@@ -2,10 +2,9 @@
 
 class Button extends FormControl
 {
-
-    protected $attributes = array(
+    protected $attributes = [
         'type' => 'button',
-    );
+    ];
 
     protected $value;
 

diff --git a/src/AdamWathan/Form/Elements/Checkbox.php b/src/AdamWathan/Form/Elements/Checkbox.php
@@ -2,9 +2,9 @@
 
 class Checkbox extends Input
 {
-    protected $attributes = array(
+    protected $attributes = [
         'type' => 'checkbox',
-    );
+    ];
 
     private $checked;
 
@@ -76,11 +76,14 @@ protected function setChecked($checked = true)
 
     protected function checkBinding()
     {
-        $currentValue = $this->getAttribute('value');
+        $currentValue = (string) $this->getAttribute('value');
+
         $oldValue = $this->oldValue;
+        $oldValue = is_array($oldValue) ? $oldValue : [$oldValue];
+        $oldValue = array_map('strval', $oldValue);
 
-        if ($currentValue === $oldValue) {
-            $this->check();
+        if (in_array($currentValue, $oldValue)) {
+            return $this->check();
         }
     }
 

diff --git a/src/AdamWathan/Form/Elements/Date.php b/src/AdamWathan/Form/Elements/Date.php
@@ -2,9 +2,9 @@
 
 class Date extends Text
 {
-    protected $attributes = array(
+    protected $attributes = [
         'type' => 'date',
-    );
+    ];
 
     public function value($value)
     {

diff --git a/src/AdamWathan/Form/Elements/Element.php b/src/AdamWathan/Form/Elements/Element.php
@@ -2,7 +2,7 @@
 
 abstract class Element
 {
-    protected $attributes = array();
+    protected $attributes = [];
 
     protected function setAttribute($attribute, $value = null)
     {
@@ -109,9 +109,9 @@ protected function renderAttributes()
 
     public function __call($method, $params)
     {
-        $params = count($params) ? $params : array($method);
-        $params = array_merge(array($method), $params);
-        call_user_func_array(array($this, 'attribute'), $params);
+        $params = count($params) ? $params : [$method];
+        $params = array_merge([$method], $params);
+        call_user_func_array([$this, 'attribute'], $params);
         return $this;
     }
 }
diff --git a/src/AdamWathan/Form/Elements/Email.php b/src/AdamWathan/Form/Elements/Email.php
@@ -2,7 +2,7 @@
 
 class Email extends Text
 {
-    protected $attributes = array(
+    protected $attributes = [
         'type' => 'email',
-    );
+    ];
 }
diff --git a/src/AdamWathan/Form/Elements/File.php b/src/AdamWathan/Form/Elements/File.php
@@ -2,7 +2,7 @@
 
 class File extends Input
 {
-    protected $attributes = array(
+    protected $attributes = [
         'type' => 'file',
-    );
+    ];
 }
diff --git a/src/AdamWathan/Form/Elements/FormOpen.php b/src/AdamWathan/Form/Elements/FormOpen.php
@@ -2,10 +2,10 @@
 
 class FormOpen extends Element
 {
-    protected $attributes = array(
+    protected $attributes = [
         'method' => 'POST',
         'action' => '',
-    );
+    ];
 
     protected $token;
     protected $hiddenMethod;

diff --git a/src/AdamWathan/Form/Elements/Hidden.php b/src/AdamWathan/Form/Elements/Hidden.php
@@ -2,7 +2,7 @@
 
 class Hidden extends Input
 {
-    protected $attributes = array(
+    protected $attributes = [
         'type' => 'hidden',
-    );
+    ];
 }
diff --git a/src/AdamWathan/Form/Elements/Password.php b/src/AdamWathan/Form/Elements/Password.php
@@ -2,7 +2,7 @@
 
 class Password extends Text
 {
-    protected $attributes = array(
+    protected $attributes = [
         'type' => 'password',
-    );
+    ];
 }
diff --git a/src/AdamWathan/Form/Elements/RadioButton.php b/src/AdamWathan/Form/Elements/RadioButton.php
@@ -2,9 +2,9 @@
 
 class RadioButton extends Checkbox
 {
-    protected $attributes = array(
+    protected $attributes = [
         'type' => 'radio',
-    );
+    ];
 
     public function __construct($name, $value = null)
     {

diff --git a/src/AdamWathan/Form/Elements/Select.php b/src/AdamWathan/Form/Elements/Select.php
@@ -2,11 +2,10 @@
 
 class Select extends FormControl
 {
-
     private $options;
     private $selected;
 
-    public function __construct($name, $options = array())
+    public function __construct($name, $options = [])
     {
         $this->setName($name);
         $this->setOptions($options);

diff --git a/src/AdamWathan/Form/Elements/Text.php b/src/AdamWathan/Form/Elements/Text.php
@@ -2,10 +2,9 @@
 
 class Text extends Input
 {
-
-    protected $attributes = array(
+    protected $attributes = [
         'type' => 'text',
-    );
+    ];
 
     public function placeholder($placeholder)
     {

diff --git a/src/AdamWathan/Form/Elements/TextArea.php b/src/AdamWathan/Form/Elements/TextArea.php
@@ -2,12 +2,11 @@
 
 class TextArea extends FormControl
 {
-
-    protected $attributes = array(
+    protected $attributes = [
         'name' => '',
         'rows' => 10,
         'cols' => 50,
-    );
+    ];
 
     protected $value;
 

diff --git a/src/AdamWathan/Form/ErrorStore/IlluminateErrorStore.php b/src/AdamWathan/Form/ErrorStore/IlluminateErrorStore.php
@@ -43,6 +43,6 @@ protected function getErrors()
 
     protected function transformKey($key)
     {
-        return str_replace(array('.', '[]', '[', ']'), array('_', '', '.', ''), $key);
+        return str_replace(['.', '[]', '[', ']'], ['_', '', '.', ''], $key);
     }
 }
diff --git a/src/AdamWathan/Form/FormBuilder.php b/src/AdamWathan/Form/FormBuilder.php
@@ -153,7 +153,7 @@ public function submit($value = 'Submit')
         return $submit;
     }
 
-    public function select($name, $options = array())
+    public function select($name, $options = [])
     {
         $select = new Select($name, $options);
 
@@ -219,6 +219,8 @@ public function bind($model)
 
     public function getValueFor($name)
     {
+        $name = $this->transformKey($name);
+
         if ($this->hasOldInput()) {
             return $this->getOldInput($name);
         }
@@ -272,7 +274,7 @@ protected function unbindModel()
 
     public function selectMonth($name)
     {
-        $options = array(
+        $options = [
             "1" => "January",
             "2" => "February",
             "3" => "March",
@@ -285,8 +287,13 @@ public function selectMonth($name)
             "10" => "October",
             "11" => "November",
             "12" => "December",
-        );
+        ];
 
         return $this->select($name, $options);
     }
+
+    protected function transformKey($key)
+    {
+        return str_replace(['.', '[]', '[', ']'], ['_', '', '.', ''], $key);
+    }
 }
diff --git a/src/AdamWathan/Form/FormServiceProvider.php b/src/AdamWathan/Form/FormServiceProvider.php
@@ -58,6 +58,6 @@ protected function registerFormBuilder()
      */
     public function provides()
     {
-        return array('adamwathan.form');
+        return ['adamwathan.form'];
     }
 }
diff --git a/src/AdamWathan/Form/OldInput/IlluminateOldInputProvider.php b/src/AdamWathan/Form/OldInput/IlluminateOldInputProvider.php
@@ -23,6 +23,6 @@ public function getOldInput($key)
 
     protected function transformKey($key)
     {
-        return str_replace(array('.', '[]', '[', ']'), array('_', '', '.', ''), $key);
+        return str_replace(['.', '[]', '[', ']'], ['_', '', '.', ''], $key);
     }
 }