Merge branch 'hotfix/#6398-forward-controller-plugin-fluent-interface…

…-consistency'

Close #6398

library/Zend/Mvc/Controller/Plugin/Forward.php

@@ -39,7 +39,7 @@ class Forward extends AbstractPlugin
     protected $numNestedForwards = 0;
 
     /**
-     * @var array
+     * @var array[]|null
      */
     protected $listenersToDetach = null;
 
@@ -55,11 +55,12 @@ public function __construct(ControllerManager $controllers)
      * Set maximum number of nested forwards allowed
      *
      * @param  int $maxNestedForwards
-     * @return Forward
+     * @return self
      */
     public function setMaxNestedForwards($maxNestedForwards)
     {
         $this->maxNestedForwards = (int) $maxNestedForwards;
+
         return $this;
     }
 
@@ -94,11 +95,14 @@ public function getListenersToDetach()
      * Set information on listeners that need to be detached before dispatching.
      *
      * @param  array $listeners Listener information; see getListenersToDetach() for details on format.
-     * @return void
+     *
+     * @return self
      */
     public function setListenersToDetach($listeners)
     {
         $this->listenersToDetach = $listeners;
+
+        return $this;
     }
 
     /**

tests/ZendTest/Mvc/Controller/Plugin/ForwardTest.php

@@ -27,6 +27,26 @@
 
 class ForwardTest extends TestCase
 {
+    /**
+     * @var PluginManager
+     */
+    private $plugins;
+
+    /**
+     * @var ControllerManager
+     */
+    private $controllers;
+
+    /**
+     * @var SampleController
+     */
+    private $controller;
+
+    /**
+     * @var \Zend\Mvc\Controller\Plugin\Forward
+     */
+    private $plugin;
+
     public function setUp()
     {
         StaticEventManager::resetInstance();
@@ -193,4 +213,12 @@ public function testAllowsPassingEmptyArrayOfRouteParams()
         $this->assertTrue(isset($result['params']));
         $this->assertEquals(array(), $result['params']);
     }
+
+    /**
+     * @group 6398
+     */
+    public function testSetListenersToDetachIsFluent()
+    {
+        $this->assertSame($this->plugin, $this->plugin->setListenersToDetach(array()));
+    }
 }