Merge branch 'hotfix/3543' into develop

Close #3543
zendframework · Jan 25, 2013 · d76e68e · d76e68e
2 parents c01501b + edfae48
commit d76e68e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/library/Zend/Http/PhpEnvironment/Response.php b/library/Zend/Http/PhpEnvironment/Response.php
@@ -69,7 +69,6 @@ public function headersSent()
 
     /**
      * @return bool
-     * @deprecated
      */
     public function contentSent()
     {
@@ -80,7 +79,6 @@ public function contentSent()
      * Send HTTP headers
      *
      * @return Response
-     * @deprecated
      */
     public function sendHeaders()
     {
@@ -108,7 +106,6 @@ public function sendHeaders()
      * Send content
      *
      * @return Response
-     * @deprecated
      */
     public function sendContent()
     {
@@ -125,7 +122,6 @@ public function sendContent()
      * Send HTTP response
      *
      * @return Response
-     * @deprecated
      */
     public function send()
     {

diff --git a/library/Zend/Mvc/Application.php b/library/Zend/Mvc/Application.php
@@ -13,6 +13,7 @@
 use Zend\EventManager\EventManagerInterface;
 use Zend\ServiceManager\ServiceManager;
 use Zend\Stdlib\ResponseInterface;
+use Zend\Stdlib\Nop;
 
 /**
  * Main application class for invoking applications
@@ -304,8 +305,16 @@ public function run()
 
         $response = $this->getResponse();
         $event->setResponse($response);
+        $this->completeRequest($event);
 
-        return $this->completeRequest($event);
+        return $this;
+    }
+
+    /**
+     * @deprecated
+     */
+    public function send()
+    {
     }
 
     /**

diff --git a/tests/ZendTest/Mvc/ApplicationTest.php b/tests/ZendTest/Mvc/ApplicationTest.php
@@ -368,7 +368,8 @@ public function testFinishEventIsTriggeredAfterDispatching()
         $this->application->getEventManager()->attach(MvcEvent::EVENT_FINISH, function ($e) {
             return $e->getResponse()->setContent($e->getResponse()->getBody() . 'foobar');
         });
-        $this->assertContains('foobar', $this->application->run()->getBody(), 'The "finish" event was not triggered ("foobar" not in response)');
+        $this->application->run();
+        $this->assertContains('foobar', $this->application->getResponse()->getBody(), 'The "finish" event was not triggered ("foobar" not in response)');
     }
 
     /**