Merge pull request #3936 from blanchonvincent/hotfix/improve-zend-tes…

…t-and-remove-sendresponselisetener Improve the remove of SendResponseListener
zendframework · Mar 11, 2013 · 4831c93 · 4831c93
2 parents 4805c2e + 6a211d3
commit 4831c93
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -15,7 +15,6 @@
 use Zend\Http\Request as HttpRequest;
 use Zend\Mvc\Application;
 use Zend\Mvc\MvcEvent;
-use Zend\Mvc\SendResponseListener;
 use Zend\Stdlib\Exception\LogicException;
 use Zend\Stdlib\Parameters;
 use Zend\Stdlib\ResponseInterface;
@@ -154,12 +153,8 @@ public function getApplication()
         $this->application = Application::init($appConfig);
 
         $events = $this->application->getEventManager();
-        foreach ($events->getListeners(MvcEvent::EVENT_FINISH) as $listener) {
+        $events->detach($this->application->getServiceManager()->get('SendResponseListener'));
-            $callback = $listener->getCallback();
+
-            if (is_array($callback) && $callback[0] instanceof SendResponseListener) {
-                $events->detach($listener);
-            }
-        }
         return $this->application;
     }