Merge branch 'hotfix/form-csrf-options-inheritance' into release

zendframework · Sep 14, 2012 · c3fefd2 · c3fefd2
2 parents 9ff5e2c + 9d72376
commit c3fefd2
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 0 deletions.
diff --git a/library/Zend/Form/Element/Csrf.php b/library/Zend/Form/Element/Csrf.php
@@ -42,6 +42,24 @@ class Csrf extends Element implements InputProviderInterface, ElementPrepareAwar
      */
     protected $csrfValidator;
 
+    /**
+     * Accepted options for Csrf:
+     * - csrf_options: an array used in the Csrf
+     *
+     * @param array|\Traversable $options
+     * @return Csrf
+     */
+    public function setOptions($options)
+    {
+        parent::setOptions($options);
+
+        if (isset($options['csrf_options'])) {
+            $this->setCsrfValidatorOptions($options['csrf_options']);
+        }
+
+        return $this;
+    }
+
     /**
      * @return array
      */

diff --git a/tests/ZendTest/Form/Element/CsrfTest.php b/tests/ZendTest/Form/Element/CsrfTest.php
@@ -37,6 +37,7 @@ public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttri
                     break;
                 default:
                     break;
+
             }
         }
     }
@@ -57,4 +58,18 @@ public function testAllowSettingCsrfValidatorOptions()
         $this->assertEquals('foo', $validator->getName());
         $this->assertEquals(777, $validator->getTimeout());
     }
+
+    public function testAllowSettingCsrfOptions()
+    {
+        $element = new CsrfElement('foo');
+        $element->setOptions(array(
+            'csrf_options' => array(
+                'timeout' => 777,
+                'salt' => 'MySalt')
+            ));
+        $validator = $element->getCsrfValidator();
+        $this->assertEquals('foo', $validator->getName());
+        $this->assertEquals(777, $validator->getTimeOut());
+        $this->assertEquals('MySalt', $validator->getSalt());
+    }
 }