Merge branch 'hotfix/38'

Close #38

Author: weierophinney

CHANGELOG.md

@@ -23,6 +23,9 @@ All notable changes to this project will be documented in this file, in reverse
   instance, it is populated with the `InputFilterFactory` present in its own
   `FormFactory`. This ensures that any custom inputs, input filters, validators,
   or filters are available to the new instance.
+- [#38](https://github.com/zendframework/zend-form/pull/38) removes the
+  arbitrary restriction of only the "labelledby" and "describedby" aria
+  attributes on form element view helpers; any aria attribute is now allowed.
 
 ## 2.7.0 - 2016-02-22
 

src/View/Helper/AbstractHelper.php

@@ -130,8 +130,6 @@ abstract class AbstractHelper extends BaseAbstractHelper
         'onvolumechange'     => true,
         'onwaiting'          => true,
         'role'               => true,
-        'aria-labelledby'    => true,
-        'aria-describedby'   => true,
         'spellcheck'         => true,
         'style'              => true,
         'tabindex'           => true,
@@ -355,6 +353,7 @@ protected function prepareAttributes(array $attributes)
             if (!isset($this->validGlobalAttributes[$attribute])
                 && !isset($this->validTagAttributes[$attribute])
                 && 'data-' != substr($attribute, 0, 5)
+                && 'aria-' != substr($attribute, 0, 5)
                 && 'x-' != substr($attribute, 0, 2)
             ) {
                 // Invalid attribute for the current tag

test/ElementTest.php

@@ -330,4 +330,35 @@ public function testCanRemoveMultipleLabelOptions()
         $this->assertFalse($element->hasLabelOption('foo2'));
         $this->assertTrue($element->hasLabelOption('foo3'));
     }
+
+    public function testCanAddMultipleAriaAttributes()
+    {
+        $element = new Element();
+        $attributes = [
+            'type'             => 'text',
+            'aria-label'       => 'alb',
+            'aria-describedby' => 'adb',
+            'aria-orientation' => 'vertical'
+        ];
+        $element->setAttributes($attributes);
+        $this->assertTrue($element->hasAttribute('aria-describedby'));
+        $this->assertTrue($element->hasAttribute('aria-label'));
+        $this->assertTrue($element->hasAttribute('aria-orientation'));
+    }
+
+    public function testCanRemoveMultipleAriaAttributes()
+    {
+        $element = new Element();
+        $attributes = [
+            'type'             => 'text',
+            'aria-label'       => 'alb',
+            'aria-describedby' => 'adb',
+            'aria-orientation' => 'vertical'
+        ];
+        $element->setAttributes($attributes);
+        $element->removeAttributes(['aria-label', 'aria-describedby', 'aria-orientation']);
+        $this->assertFalse($element->hasAttribute('aria-describedby'));
+        $this->assertFalse($element->hasAttribute('aria-label'));
+        $this->assertFalse($element->hasAttribute('aria-orientation'));
+    }
 }