Merge remote-tracking branch 'upstream/master'

zendframework · Mar 13, 2013 · b31816b · b31816b
commit b31816b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/AbstractContainer.php b/src/AbstractContainer.php
@@ -159,6 +159,9 @@ public function addPages($pages)
         }
 
         foreach ($pages as $page) {
+            if (null === $page) {
+                continue;
+            }
             $this->addPage($page);
         }
 

diff --git a/test/ContainerTest.php b/test/ContainerTest.php
@@ -114,6 +114,23 @@ public function testConstructorShouldThrowExceptionOnInvalidArgument()
         }
     }
 
+    /**
+     * @group 3823
+     * @group 3840
+     */
+    public function testAddPagesWithNullValueSkipsPage()
+    {
+        $nav = new Navigation\Navigation(array(
+            array(
+                'label' => 'Page 1',
+                'uri' => '#'
+            ),
+            null
+        ));
+        $count = count($nav->getPages());
+        $this->assertEquals(1, $count);
+    }
+
     public function testIterationShouldBeOrderAware()
     {
         $nav = new Navigation\Navigation(array(