add attributes for select options; fixes

Author: Dmitry Kuharenok

src/Form/Element/Select.php

@@ -17,18 +17,15 @@ class Select extends Element
     protected $optionsAttributes = [];
     protected $multiple          = false;
 
-    public function setOptions($options, $attributes = null)
+    public function setOptions($options, $attributes = [])
     {
         if ($options instanceof Collection)
         {
             $options = $options->getDictionary();
         }
         $this->options = $options;
 
-        if ($attributes)
-        {
-            $this->optionsAttributes = $attributes;
-        }
+        $this->optionsAttributes = $attributes;
 
         return $this;
     }

src/resources/views/default/element/select.blade.php

@@ -6,8 +6,12 @@
                 @foreach($attributes as $attributeName => $attributeValue) {{$attributeName}}="{{$attributeValue}}" @endforeach
         >
             @foreach($options as $key => $option)
-                <option value="{{$key}}" @if (array_get($optionsAttributes, $key)) {{array_get($optionsAttributes, $key)}} @endif
-                        @if (($multiple && $value && in_array((string)$key, $value, true)) || $value === (string)$key) selected="selected" @endif>{{ $option }}</option>
+                <option value="{{$key}}"
+                    @if($optionAttributes = array_get($optionsAttributes, $key))
+                        @foreach($optionAttributes as $optionAttributeName => $optionAttributeValue) {{$optionAttributeName}}="{{$optionAttributeValue}}" @endforeach
+                    @endif
+                    @if (($multiple && $value && in_array((string)$key, $value, true)) || $value === (string)$key) selected="selected" @endif>{{ $option }}
+                </option>
             @endforeach
         </select>
             <div class="form__help">{{ $help }}</div>