Merge pull request #93 from adamwathan/aw-avoid-array-functions

Manually split key/values in arrays to prevent breaking anything that was passing a collection

src/AdamWathan/Form/Elements/Element.php

@@ -105,9 +105,25 @@ public function __toString()
 
     protected function renderAttributes()
     {
+        list($attributes, $values) = $this->splitKeysAndValues($this->attributes);
+
         return implode(array_map(function ($attribute, $value) {
             return sprintf(' %s="%s"', $attribute, $value);
-        }, array_keys($this->attributes), $this->attributes));
+        }, $attributes, $values));
+    }
+
+    protected function splitKeysAndValues($array)
+    {
+        // Disgusting crap because people might have passed a collection
+        $keys = [];
+        $values = [];
+
+        foreach ($array as $key => $value) {
+            $keys[] = $key;
+            $values[] = $value;
+        }
+
+        return [$keys, $values];
     }
 
     public function __call($method, $params)

src/AdamWathan/Form/Elements/Select.php

@@ -44,21 +44,25 @@ public function render()
 
     protected function renderOptions()
     {
+        list($values, $labels) = $this->splitKeysAndValues($this->options);
+
         $tags = array_map(function ($value, $label) {
             if (is_array($label)) {
                 return $this->renderOptGroup($value, $label);
             }
             return $this->renderOption($value, $label);
-        }, array_keys($this->options), $this->options);
+        }, $values, $labels);
 
         return implode($tags);
     }
 
     protected function renderOptGroup($label, $options)
     {
+        list($values, $labels) = $this->splitKeysAndValues($options);
+
         $options = array_map(function ($value, $label) {
             return $this->renderOption($value, $label);
-        }, array_keys($options), $options);
+        }, $values, $labels);
 
         return implode([
             sprintf('<optgroup label="%s">', $label),