Merge pull request zendframework#4572 from joshribakoff/master

Zend\Form Should throw exception if try to get() an element that does not exist
hinikato · Jun 10, 2013 · 69a35c8 · 69a35c8
2 parents ec48e67 + 4ebdb06
commit 69a35c8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/library/Zend/Form/Fieldset.php b/library/Zend/Form/Fieldset.php
@@ -206,14 +206,16 @@ public function has($elementOrFieldset)
     /**
      * Retrieve a named element or fieldset
      *
-     * @todo   Should this raise an exception if no entry is found?
      * @param  string $elementOrFieldset
      * @return ElementInterface
      */
     public function get($elementOrFieldset)
     {
         if (!$this->has($elementOrFieldset)) {
-            return null;
+            throw new Exception\InvalidElementException(sprintf(
+                "No element by the name of [%s] found in form",
+                $elementOrFieldset
+            ));
         }
         return $this->byName[$elementOrFieldset];
     }

diff --git a/tests/ZendTest/Form/FieldsetTest.php b/tests/ZendTest/Form/FieldsetTest.php
@@ -443,10 +443,12 @@ public function testSetOptionsUseAsBaseFieldset()
         $this->assertEquals('bar', $option);
     }
 
-    public function testGetReturnsNull()
+    /**
+     * @expectedException Zend\Form\Exception\InvalidElementException
+     */
+    public function testShouldThrowExceptionWhenGetInvalidElement()
     {
-        $foo = $this->fieldset->get('foo');
-        $this->assertNull($foo);
+        $this->fieldset->get('doesnt_exist');
     }
 
     public function testBindValuesHasNoName()

diff --git a/tests/ZendTest/Form/FormTest.php b/tests/ZendTest/Form/FormTest.php
@@ -166,6 +166,14 @@ public function testCanComposeAnInputFilter()
         $this->assertSame($filter, $this->form->getInputFilter());
     }
 
+    /**
+     * @expectedException Zend\Form\Exception\InvalidElementException
+     */
+    public function testShouldThrowExceptionWhenGetInvalidElement()
+    {
+        $this->form->get('doesnt_exist');
+    }
+
     public function testDefaultNonRequiredInputFilterIsSet()
     {
         $this->form->add(new Element('foo'));