Hotfix: Undeprecate PhpEnvironement Response methods #3543

Merged
merged 2 commits into from Jan 25, 2013
View
4 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()
{
View
11 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()
+ {
}
/**