ZF-11664: Allow manually setting Zend_Navigation_Page_Mvc::isActive

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@24857 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Navigation/Page/Mvc.php

@@ -94,7 +94,6 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page
      */
     protected $_resetParams = true;
 
-        
     /**
      * Whether href should be encoded when assembling URL
      *
@@ -104,6 +103,13 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page
     protected $_encodeUrl = true;
 
     /**
+     * Whether this page should be considered active
+     *
+     * @var bool
+     */
+    protected $_active = null;
+
+    /**
      * Cached href
      *
      * The use of this variable minimizes execution time when getHref() is
@@ -137,7 +143,7 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page
      */
     public function isActive($recursive = false)
     {
-        if (!$this->_active) {
+        if (null === $this->_active) {
             $front     = Zend_Controller_Front::getInstance();
             $request   = $front->getRequest();
             $reqParams = array();
@@ -186,6 +192,8 @@ class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page
                 $this->_active = true;
                 return true;
             }
+            
+            $this->_active = false;
         }
 
         return parent::isActive($recursive);

tests/Zend/Navigation/Page/MvcTest.php

@@ -267,6 +267,34 @@ class Zend_Navigation_Page_MvcTest extends PHPUnit_Framework_TestCase
         $this->assertEquals(true, $page->isActive());
     }
 
+    /**
+     * @group ZF-11664
+     */
+    public function testIsActiveWithoutAndWithRecursiveOption()
+    {
+        // Parent
+        $page = new Zend_Navigation_Page_Mvc(array(
+            'controller' => 'index',
+            'action'     => 'index',
+        ));
+
+        // Child
+        $page->addPage(new Zend_Navigation_Page_Mvc(array(
+            'controller' => 'index',
+            'action'     => 'foo',
+        )));
+
+        // Front controller
+        $this->_front->getRequest()->setParams(array(
+            'controller' => 'index',
+            'action'     => 'foo'
+        ));
+
+        $this->assertFalse($page->isActive());
+
+        $this->assertTrue($page->isActive(true));
+    }
+
     public function testActionAndControllerAccessors()
     {
         $page = new Zend_Navigation_Page_Mvc(array(
@@ -380,6 +408,29 @@ class Zend_Navigation_Page_MvcTest extends PHPUnit_Framework_TestCase
     }
 
     /**
+     * @group ZF-11664
+     */
+    public function testSetActiveAndIsActive()
+    {
+        // Page
+        $page = new Zend_Navigation_Page_Mvc(array(
+            'controller' => 'foo',
+            'action'     => 'bar',
+        ));
+
+        // Front controller
+        $this->_front->getRequest()->setParams(array(
+            'controller' => 'foo',
+            'action'     => 'bar'
+        ));
+
+        $this->assertTrue($page->isActive());
+
+        $page->setActive(false);
+        $this->assertFalse($page->isActive());
+    }
+
+    /**
      * @group ZF-10465
      */
     public function testSetAndGetEncodeUrl()