From b4212c73e9927c277c14a94e069f42e6e177883c Mon Sep 17 00:00:00 2001
From: saeid <saeideng@yahoo.com>
Date: Tue, 28 Feb 2017 00:52:38 +0330
Subject: [PATCH] change "Cake\Network\Response" to "Cake\Http\Response"

---
 src/Auth/BaseAuthenticate.php                 |  8 +++---
 src/Auth/BasicAuthenticate.php                |  6 ++---
 src/Auth/FormAuthenticate.php                 |  4 +--
 src/Auth/Storage/SessionStorage.php           |  4 +--
 src/Controller/Component.php                  |  2 +-
 src/Controller/Component/AuthComponent.php    | 12 ++++-----
 src/Controller/Component/CookieComponent.php  |  8 +++---
 src/Controller/Component/CsrfComponent.php    |  4 +--
 .../Component/RequestHandlerComponent.php     | 14 +++++-----
 src/Controller/Controller.php                 | 26 +++++++++----------
 src/Core/Exception/Exception.php              |  4 +--
 src/Error/ErrorHandler.php                    |  2 +-
 src/Error/ExceptionRenderer.php               | 12 ++++-----
 src/Error/ExceptionRendererInterface.php      |  2 +-
 src/Http/ActionDispatcher.php                 |  4 +--
 src/Http/ControllerFactory.php                |  2 +-
 src/Http/Response.php                         |  2 +-
 src/Http/ResponseTransformer.php              |  8 +++---
 src/Network/CorsBuilder.php                   |  8 +++---
 src/Routing/Dispatcher.php                    |  2 +-
 src/Routing/DispatcherFilter.php              |  2 +-
 src/Routing/Filter/AssetFilter.php            | 10 +++----
 .../Filter/ControllerFactoryFilter.php        |  2 +-
 src/Routing/Filter/RoutingFilter.php          |  4 +--
 src/Routing/RequestActionTrait.php            |  2 +-
 src/Routing/Route/RedirectRoute.php           |  2 +-
 src/Routing/Router.php                        |  2 +-
 src/View/AjaxView.php                         |  4 +--
 src/View/Cell.php                             |  6 ++---
 src/View/Helper/HtmlHelper.php                |  4 +--
 src/View/SerializedView.php                   |  4 +--
 src/View/View.php                             |  6 ++---
 src/View/ViewBuilder.php                      |  4 +--
 tests/TestCase/Error/ErrorHandlerTest.php     |  2 +-
 tests/TestCase/Http/ActionDispatcherTest.php  |  2 +-
 tests/TestCase/Network/CorsBuilderTest.php    |  4 +--
 .../TestApp/Auth/TestAuthenticate.php         |  2 +-
 .../TestApp/Controller/AuthTestController.php |  4 +--
 .../TestApp/Controller/CakesController.php    |  4 +--
 .../Component/TestAuthComponent.php           |  2 +-
 .../TestApp/Controller/PagesController.php    |  2 +-
 .../Controller/RequestActionController.php    | 22 ++++++++--------
 .../Controller/SomePagesController.php        |  2 +-
 43 files changed, 116 insertions(+), 116 deletions(-)

diff --git a/src/Auth/BaseAuthenticate.php b/src/Auth/BaseAuthenticate.php
index 0b3254c0b26..f3a8ce7e84d 100644
--- a/src/Auth/BaseAuthenticate.php
+++ b/src/Auth/BaseAuthenticate.php
@@ -16,8 +16,8 @@
 use Cake\Controller\ComponentRegistry;
 use Cake\Core\InstanceConfigTrait;
 use Cake\Event\EventListenerInterface;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Network\Response;
 use Cake\ORM\TableRegistry;
 
 /**
@@ -194,7 +194,7 @@ public function needsPasswordRehash()
      * Authenticate a user based on the request information.
      *
      * @param \Cake\Http\ServerRequest $request Request to get authentication information from.
-     * @param \Cake\Network\Response $response A response object that can have headers added.
+     * @param \Cake\Http\Response $response A response object that can have headers added.
      * @return mixed Either false on failure, or an array of user data on success.
      */
     abstract public function authenticate(ServerRequest $request, Response $response);
@@ -216,11 +216,11 @@ public function getUser(ServerRequest $request)
      * can be:
      *
      * - Null - No action taken, AuthComponent should return appropriate response.
-     * - Cake\Network\Response - A response object, which will cause AuthComponent to
+     * - Cake\Http\Response - A response object, which will cause AuthComponent to
      *   simply return that response.
      *
      * @param \Cake\Http\ServerRequest $request A request object.
-     * @param \Cake\Network\Response $response A response object.
+     * @param \Cake\Http\Response $response A response object.
      * @return void
      */
     public function unauthenticated(ServerRequest $request, Response $response)
diff --git a/src/Auth/BasicAuthenticate.php b/src/Auth/BasicAuthenticate.php
index e9310624065..47c6adf13d1 100644
--- a/src/Auth/BasicAuthenticate.php
+++ b/src/Auth/BasicAuthenticate.php
@@ -14,9 +14,9 @@
  */
 namespace Cake\Auth;
 
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Network\Exception\UnauthorizedException;
-use Cake\Network\Response;
 
 /**
  * Basic Authentication adapter for AuthComponent.
@@ -57,7 +57,7 @@ class BasicAuthenticate extends BaseAuthenticate
      * login using HTTP auth.
      *
      * @param \Cake\Http\ServerRequest $request The request to authenticate with.
-     * @param \Cake\Network\Response $response The response to add headers to.
+     * @param \Cake\Http\Response $response The response to add headers to.
      * @return mixed Either false on failure, or an array of user data on success.
      */
     public function authenticate(ServerRequest $request, Response $response)
@@ -87,7 +87,7 @@ public function getUser(ServerRequest $request)
      * Handles an unauthenticated access attempt by sending appropriate login headers
      *
      * @param \Cake\Http\ServerRequest $request A request object.
-     * @param \Cake\Network\Response $response A response object.
+     * @param \Cake\Http\Response $response A response object.
      * @return void
      * @throws \Cake\Network\Exception\UnauthorizedException
      */
diff --git a/src/Auth/FormAuthenticate.php b/src/Auth/FormAuthenticate.php
index f3c05ed1b16..2d48e9348bc 100644
--- a/src/Auth/FormAuthenticate.php
+++ b/src/Auth/FormAuthenticate.php
@@ -15,8 +15,8 @@
  */
 namespace Cake\Auth;
 
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Network\Response;
 
 /**
  * An authentication adapter for AuthComponent. Provides the ability to authenticate using POST
@@ -63,7 +63,7 @@ protected function _checkFields(ServerRequest $request, array $fields)
      * there is no post data, either username or password is missing, or if the scope conditions have not been met.
      *
      * @param \Cake\Http\ServerRequest $request The request that contains login information.
-     * @param \Cake\Network\Response $response Unused response object.
+     * @param \Cake\Http\Response $response Unused response object.
      * @return mixed False on login failure. An array of User data on success.
      */
     public function authenticate(ServerRequest $request, Response $response)
diff --git a/src/Auth/Storage/SessionStorage.php b/src/Auth/Storage/SessionStorage.php
index 55264865d2e..4d8c64f81b6 100644
--- a/src/Auth/Storage/SessionStorage.php
+++ b/src/Auth/Storage/SessionStorage.php
@@ -15,8 +15,8 @@
 namespace Cake\Auth\Storage;
 
 use Cake\Core\InstanceConfigTrait;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Network\Response;
 
 /**
  * Session based persistent storage for authenticated user record.
@@ -62,7 +62,7 @@ class SessionStorage implements StorageInterface
      * Constructor.
      *
      * @param \Cake\Http\ServerRequest $request Request instance.
-     * @param \Cake\Network\Response $response Response instance.
+     * @param \Cake\Http\Response $response Response instance.
      * @param array $config Configuration list.
      */
     public function __construct(ServerRequest $request, Response $response, array $config = [])
diff --git a/src/Controller/Component.php b/src/Controller/Component.php
index 7ab480d2b08..d74f11efae6 100644
--- a/src/Controller/Component.php
+++ b/src/Controller/Component.php
@@ -74,7 +74,7 @@ class Component implements EventListenerInterface
     /**
      * Response object
      *
-     * @var \Cake\Network\Response
+     * @var \Cake\Http\Response
      * @deprecated 3.4.0 Storing references to the response is deprecated. Use Component::getController()
      *   or callback $event->getSubject() to access the controller & response instead.
      */
diff --git a/src/Controller/Component/AuthComponent.php b/src/Controller/Component/AuthComponent.php
index 8735c9d0ef3..f691f776326 100644
--- a/src/Controller/Component/AuthComponent.php
+++ b/src/Controller/Component/AuthComponent.php
@@ -21,9 +21,9 @@
 use Cake\Core\Exception\Exception;
 use Cake\Event\Event;
 use Cake\Event\EventDispatcherTrait;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Network\Exception\ForbiddenException;
-use Cake\Network\Response;
 use Cake\Routing\Router;
 use Cake\Utility\Hash;
 
@@ -214,7 +214,7 @@ class AuthComponent extends Component
     /**
      * Response object
      *
-     * @var \Cake\Network\Response
+     * @var \Cake\Http\Response
      */
     public $response;
 
@@ -261,7 +261,7 @@ public function initialize(array $config)
      * Callback for Controller.startup event.
      *
      * @param \Cake\Event\Event $event Event instance.
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      */
     public function startup(Event $event)
     {
@@ -276,7 +276,7 @@ public function startup(Event $event)
      * `checkAuthIn` config.
      *
      * @param \Cake\Event\Event $event Event instance.
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      */
     public function authCheck(Event $event)
     {
@@ -361,7 +361,7 @@ protected function _isAllowed(Controller $controller)
      * is returned.
      *
      * @param \Cake\Controller\Controller $controller A reference to the controller object.
-     * @return \Cake\Network\Response|null Null if current action is login action
+     * @return \Cake\Http\Response|null Null if current action is login action
      *   else response object returned by authenticate object or Controller::redirect().
      * @throws \Cake\Core\Exception\Exception
      */
@@ -447,7 +447,7 @@ protected function _isLoginAction(Controller $controller)
      * Handle unauthorized access attempt
      *
      * @param \Cake\Controller\Controller $controller A reference to the controller object
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      * @throws \Cake\Network\Exception\ForbiddenException
      */
     protected function _unauthorized(Controller $controller)
diff --git a/src/Controller/Component/CookieComponent.php b/src/Controller/Component/CookieComponent.php
index 07cbade981d..154e7b4277f 100644
--- a/src/Controller/Component/CookieComponent.php
+++ b/src/Controller/Component/CookieComponent.php
@@ -15,9 +15,9 @@
 namespace Cake\Controller\Component;
 
 use Cake\Controller\Component;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\I18n\Time;
-use Cake\Network\Response;
 use Cake\Utility\CookieCryptTrait;
 use Cake\Utility\Hash;
 use Cake\Utility\Security;
@@ -26,7 +26,7 @@
  * Cookie Component.
  *
  * Provides enhanced cookie handling features for use in the controller layer.
- * In addition to the basic features offered be Cake\Network\Response, this class lets you:
+ * In addition to the basic features offered be Cake\Http\Response, this class lets you:
  *
  * - Create and read encrypted cookies.
  * - Store non-scalar data.
@@ -101,10 +101,10 @@ class CookieComponent extends Component
     protected $_loaded = [];
 
     /**
-     * A reference to the Controller's Cake\Network\Response object.
+     * A reference to the Controller's Cake\Http\Response object.
      * Currently unused.
      *
-     * @var \Cake\Network\Response|null
+     * @var \Cake\Http\Response|null
      * @deprecated 3.4.0 Will be removed in 4.0.0
      */
     protected $_response = null;
diff --git a/src/Controller/Component/CsrfComponent.php b/src/Controller/Component/CsrfComponent.php
index d852d8bae27..cd1d0c65946 100644
--- a/src/Controller/Component/CsrfComponent.php
+++ b/src/Controller/Component/CsrfComponent.php
@@ -16,10 +16,10 @@
 
 use Cake\Controller\Component;
 use Cake\Event\Event;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\I18n\Time;
 use Cake\Network\Exception\InvalidCsrfTokenException;
-use Cake\Network\Response;
 use Cake\Utility\Security;
 
 /**
@@ -119,7 +119,7 @@ public function implementedEvents()
      * token is available in the request data.
      *
      * @param \Cake\Http\ServerRequest $request The request object.
-     * @param \Cake\Network\Response $response The response object.
+     * @param \Cake\Http\Response $response The response object.
      * @return void
      */
     protected function _setCookie(ServerRequest $request, Response $response)
diff --git a/src/Controller/Component/RequestHandlerComponent.php b/src/Controller/Component/RequestHandlerComponent.php
index afc29d8e87b..658302b6d0f 100644
--- a/src/Controller/Component/RequestHandlerComponent.php
+++ b/src/Controller/Component/RequestHandlerComponent.php
@@ -21,7 +21,7 @@
 use Cake\Core\Configure;
 use Cake\Core\Exception\Exception;
 use Cake\Event\Event;
-use Cake\Network\Response;
+use Cake\Http\Response;
 use Cake\Routing\Router;
 use Cake\Utility\Exception\XmlException;
 use Cake\Utility\Inflector;
@@ -149,7 +149,7 @@ public function initialize(array $config)
      * is to avoid issues with browsers that prefer HTML and several other content types.
      *
      * @param \Cake\Http\ServerRequest $request The request instance.
-     * @param \Cake\Network\Response $response The response instance.
+     * @param \Cake\Http\Response $response The response instance.
      * @return void
      */
     protected function _setExtension($request, $response)
@@ -247,8 +247,8 @@ public function convertXml($xml)
      *
      * @param \Cake\Event\Event $event The Controller.beforeRedirect event.
      * @param string|array $url A string or array containing the redirect location
-     * @param \Cake\Network\Response $response The response object.
-     * @return \Cake\Network\Response|null The response object if the redirect is caught.
+     * @param \Cake\Http\Response $response The response object.
+     * @return \Cake\Http\Response|null The response object if the redirect is caught.
      * @deprecated 3.3.5 This functionality will be removed in 4.0.0. You can disable this function
      *   now by setting the `enableBeforeRedirect` config option to false.
      */
@@ -299,9 +299,9 @@ public function beforeRedirect(Event $event, $url, Response $response)
      *   `app/View/Controller/xml/action.ctp`. Also if `controller/action` is
      *   requested with `Accept: application/xml` in the headers the view
      *   path will become `app/View/Controller/xml/action.ctp`. Layout and template
-     *   types will only switch to mime-types recognized by Cake\Network\Response.
+     *   types will only switch to mime-types recognized by Cake\Http\Response.
      *   If you need to declare additional mime-types, you can do so using
-     *   Cake\Network\Response::type() in your controller's beforeFilter() method.
+     *   Cake\Http\Response::type() in your controller's beforeFilter() method.
      * - If a helper with the same name as the extension exists, it is added to
      *   the controller.
      * - If the extension is of a type that RequestHandler understands, it will
@@ -607,7 +607,7 @@ public function renderAs(Controller $controller, $type, array $options = [])
 
     /**
      * Sets the response header based on type map index name. This wraps several methods
-     * available on Cake\Network\Response. It also allows you to use Content-Type aliases.
+     * available on Cake\Http\Response. It also allows you to use Content-Type aliases.
      *
      * @param string|array $type Friendly type name, i.e. 'html' or 'xml', or a full content-type,
      *    like 'application/x-shockwave'.
diff --git a/src/Controller/Controller.php b/src/Controller/Controller.php
index c934eb8530a..b415584cb73 100644
--- a/src/Controller/Controller.php
+++ b/src/Controller/Controller.php
@@ -20,9 +20,9 @@
 use Cake\Event\EventDispatcherInterface;
 use Cake\Event\EventDispatcherTrait;
 use Cake\Event\EventListenerInterface;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Log\LogTrait;
-use Cake\Network\Response;
 use Cake\ORM\Locator\LocatorAwareTrait;
 use Cake\Routing\RequestActionTrait;
 use Cake\Routing\Router;
@@ -130,7 +130,7 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
     /**
      * An instance of a Response object that contains information about the impending response
      *
-     * @var \Cake\Network\Response
+     * @var \Cake\Http\Response
      * @link http://book.cakephp.org/3.0/en/controllers/request-response.html#response
      */
     public $response;
@@ -140,7 +140,7 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
      *
      * @var string
      */
-    protected $_responseClass = 'Cake\Network\Response';
+    protected $_responseClass = 'Cake\Http\Response';
 
     /**
      * Settings for pagination.
@@ -224,7 +224,7 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
      *
      * @param \Cake\Http\ServerRequest|null $request Request object for this controller. Can be null for testing,
      *   but expect that features that use the request parameters will not work.
-     * @param \Cake\Network\Response|null $response Response object for this controller.
+     * @param \Cake\Http\Response|null $response Response object for this controller.
      * @param string|null $name Override the name useful in testing when using mocks.
      * @param \Cake\Event\EventManager|null $eventManager The event manager. Defaults to a new instance.
      * @param \Cake\Controller\ComponentRegistry|null $components The component registry. Defaults to a new instance.
@@ -495,7 +495,7 @@ protected function _loadComponents()
      * - Calls the controller `beforeFilter`.
      * - triggers Component `startup` methods.
      *
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      */
     public function startupProcess()
     {
@@ -518,7 +518,7 @@ public function startupProcess()
      * - triggers the component `shutdown` callback.
      * - calls the Controller's `afterFilter` method.
      *
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      */
     public function shutdownProcess()
     {
@@ -536,7 +536,7 @@ public function shutdownProcess()
      * @param string|array $url A string or array-based URL pointing to another location within the app,
      *     or an absolute URL
      * @param int $status HTTP status code (eg: 301)
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      * @link http://book.cakephp.org/3.0/en/controllers.html#Controller::redirect
      */
     public function redirect($url, $status = 302)
@@ -590,7 +590,7 @@ public function setAction($action, ...$args)
      *
      * @param string|null $view View to use for rendering
      * @param string|null $layout Layout to use
-     * @return \Cake\Network\Response A response object containing the rendered view.
+     * @return \Cake\Http\Response A response object containing the rendered view.
      * @link http://book.cakephp.org/3.0/en/controllers.html#rendering-a-view
      */
     public function render($view = null, $layout = null)
@@ -747,7 +747,7 @@ public function isAction($action)
      * or perform logic that needs to happen before each controller action.
      *
      * @param \Cake\Event\Event $event An Event instance
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      * @link http://book.cakephp.org/3.0/en/controllers.html#request-life-cycle-callbacks
      */
     public function beforeFilter(Event $event)
@@ -760,7 +760,7 @@ public function beforeFilter(Event $event)
      * to perform logic or set view variables that are required on every request.
      *
      * @param \Cake\Event\Event $event An Event instance
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      * @link http://book.cakephp.org/3.0/en/controllers.html#request-life-cycle-callbacks
      */
     public function beforeRender(Event $event)
@@ -780,8 +780,8 @@ public function beforeRender(Event $event)
      * @param \Cake\Event\Event $event An Event instance
      * @param string|array $url A string or array-based URL pointing to another location within the app,
      *     or an absolute URL
-     * @param \Cake\Network\Response $response The response object.
-     * @return \Cake\Network\Response|null
+     * @param \Cake\Http\Response $response The response object.
+     * @return \Cake\Http\Response|null
      * @link http://book.cakephp.org/3.0/en/controllers.html#request-life-cycle-callbacks
      */
     public function beforeRedirect(Event $event, $url, Response $response)
@@ -793,7 +793,7 @@ public function beforeRedirect(Event $event, $url, Response $response)
      * Called after the controller action is run and rendered.
      *
      * @param \Cake\Event\Event $event An Event instance
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      * @link http://book.cakephp.org/3.0/en/controllers.html#request-life-cycle-callbacks
      */
     public function afterFilter(Event $event)
diff --git a/src/Core/Exception/Exception.php b/src/Core/Exception/Exception.php
index df53db5478d..1884d48d5ff 100644
--- a/src/Core/Exception/Exception.php
+++ b/src/Core/Exception/Exception.php
@@ -36,7 +36,7 @@ class Exception extends RuntimeException
     protected $_messageTemplate = '';
 
     /**
-     * Array of headers to be passed to Cake\Network\Response::header()
+     * Array of headers to be passed to Cake\Http\Response::header()
      *
      * @var array|null
      */
@@ -75,7 +75,7 @@ public function getAttributes()
     /**
      * Get/set the response header to be used
      *
-     * See also Cake\Network\Response::header()
+     * See also Cake\Http\Response::header()
      *
      * @param string|array|null $header An array of header strings or a single header string
      *  - an associative array of "header name" => "header value"
diff --git a/src/Error/ErrorHandler.php b/src/Error/ErrorHandler.php
index 36cca1ba241..c5109362ff1 100644
--- a/src/Error/ErrorHandler.php
+++ b/src/Error/ErrorHandler.php
@@ -167,7 +167,7 @@ protected function _clearOutput()
     /**
      * Method that can be easily stubbed in testing.
      *
-     * @param string|\Cake\Network\Response $response Either the message or response object.
+     * @param string|\Cake\Http\Response $response Either the message or response object.
      * @return void
      */
     protected function _sendResponse($response)
diff --git a/src/Error/ExceptionRenderer.php b/src/Error/ExceptionRenderer.php
index bf75690261d..659a51206a0 100644
--- a/src/Error/ExceptionRenderer.php
+++ b/src/Error/ExceptionRenderer.php
@@ -20,9 +20,9 @@
 use Cake\Core\Exception\Exception as CakeException;
 use Cake\Core\Exception\MissingPluginException;
 use Cake\Event\Event;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Network\Exception\HttpException;
-use Cake\Network\Response;
 use Cake\Routing\DispatcherFactory;
 use Cake\Routing\Router;
 use Cake\Utility\Inflector;
@@ -149,7 +149,7 @@ protected function _getController()
     /**
      * Renders the response for the exception.
      *
-     * @return \Cake\Network\Response The response to be sent.
+     * @return \Cake\Http\Response The response to be sent.
      */
     public function render()
     {
@@ -200,7 +200,7 @@ public function render()
      *
      * @param string $method The method name to invoke.
      * @param \Exception $exception The exception to render.
-     * @return \Cake\Network\Response The response to send.
+     * @return \Cake\Http\Response The response to send.
      */
     protected function _customMethod($method, $exception)
     {
@@ -312,7 +312,7 @@ protected function _code(Exception $exception)
      * Generate the response using the controller object.
      *
      * @param string $template The template to render.
-     * @return \Cake\Network\Response A response object that can be sent.
+     * @return \Cake\Http\Response A response object that can be sent.
      */
     protected function _outputMessage($template)
     {
@@ -344,7 +344,7 @@ protected function _outputMessage($template)
      * and doesn't call component methods.
      *
      * @param string $template The template to render.
-     * @return \Cake\Network\Response A response object that can be sent.
+     * @return \Cake\Http\Response A response object that can be sent.
      */
     protected function _outputMessageSafe($template)
     {
@@ -367,7 +367,7 @@ protected function _outputMessageSafe($template)
      *
      * Triggers the afterFilter and afterDispatch events.
      *
-     * @return \Cake\Network\Response The response to serve.
+     * @return \Cake\Http\Response The response to serve.
      */
     protected function _shutdown()
     {
diff --git a/src/Error/ExceptionRendererInterface.php b/src/Error/ExceptionRendererInterface.php
index b94bfd045da..324a9a3fbc9 100644
--- a/src/Error/ExceptionRendererInterface.php
+++ b/src/Error/ExceptionRendererInterface.php
@@ -19,7 +19,7 @@ interface ExceptionRendererInterface
     /**
      * Renders the response for the exception.
      *
-     * @return \Cake\Network\Response The response to be sent.
+     * @return \Cake\Http\Response The response to be sent.
      */
     public function render();
 }
diff --git a/src/Http/ActionDispatcher.php b/src/Http/ActionDispatcher.php
index 87ffe6dbfb7..5cc9dc753d6 100644
--- a/src/Http/ActionDispatcher.php
+++ b/src/Http/ActionDispatcher.php
@@ -104,7 +104,7 @@ public function dispatch(ServerRequest $request, Response $response)
      * Invoke a controller's action and wrapping methods.
      *
      * @param \Cake\Controller\Controller $controller The controller to invoke.
-     * @return \Cake\Network\Response The response
+     * @return \Cake\Http\Response The response
      * @throws \LogicException If the controller action returns a non-response value.
      */
     protected function _invoke(Controller $controller)
@@ -118,7 +118,7 @@ protected function _invoke(Controller $controller)
 
         $response = $controller->invokeAction();
         if ($response !== null && !($response instanceof Response)) {
-            throw new LogicException('Controller actions can only return Cake\Network\Response or null.');
+            throw new LogicException('Controller actions can only return Cake\Http\Response or null.');
         }
 
         if (!$response && $controller->autoRender) {
diff --git a/src/Http/ControllerFactory.php b/src/Http/ControllerFactory.php
index b07ca035947..4fdb291470b 100644
--- a/src/Http/ControllerFactory.php
+++ b/src/Http/ControllerFactory.php
@@ -28,7 +28,7 @@ class ControllerFactory
      * Create a controller for a given request/response
      *
      * @param \Cake\Http\ServerRequest $request The request to build a controller for.
-     * @param \Cake\Network\Response $response The response to use.
+     * @param \Cake\Http\Response $response The response to use.
      * @return \Cake\Controller\Controller
      */
     public function create(ServerRequest $request, Response $response)
diff --git a/src/Http/Response.php b/src/Http/Response.php
index 5dc03a64289..aaae8f5f5b2 100644
--- a/src/Http/Response.php
+++ b/src/Http/Response.php
@@ -531,7 +531,7 @@ public function sendHeaders()
     }
 
     /**
-     * Sets the cookies that have been added via Cake\Network\Response::cookie() before any
+     * Sets the cookies that have been added via Cake\Http\Response::cookie() before any
      * other output is sent to the client. Will set the cookies in the order they
      * have been set.
      *
diff --git a/src/Http/ResponseTransformer.php b/src/Http/ResponseTransformer.php
index d3b29f98e72..185d776ed05 100644
--- a/src/Http/ResponseTransformer.php
+++ b/src/Http/ResponseTransformer.php
@@ -34,7 +34,7 @@ class ResponseTransformer
      * Convert a PSR7 Response into a CakePHP one.
      *
      * @param \Psr\Http\Message\ResponseInterface $response The response to convert.
-     * @return \Cake\Network\Response The equivalent CakePHP response
+     * @return \Cake\Http\Response The equivalent CakePHP response
      */
     public static function toCake(PsrResponse $response)
     {
@@ -152,7 +152,7 @@ protected static function collapseHeaders(PsrResponse $response)
     /**
      * Convert a CakePHP response into a PSR7 one.
      *
-     * @param \Cake\Network\Response $response The CakePHP response to convert
+     * @param \Cake\Http\Response $response The CakePHP response to convert
      * @return \Psr\Http\Message\ResponseInterface $response The equivalent PSR7 response.
      */
     public static function toPsr(CakeResponse $response)
@@ -175,7 +175,7 @@ public static function toPsr(CakeResponse $response)
      * Add in the Content-Type header if necessary.
      *
      * @param array $headers The headers to update
-     * @param \Cake\Network\Response $response The CakePHP response to convert
+     * @param \Cake\Http\Response $response The CakePHP response to convert
      * @return array The updated headers.
      */
     protected static function setContentType($headers, $response)
@@ -245,7 +245,7 @@ protected static function buildCookieHeader($cookies)
     /**
      * Get the stream for the new response.
      *
-     * @param \Cake\Network\Response $response The cake response to extract the body from.
+     * @param \Cake\Http\Response $response The cake response to extract the body from.
      * @return \Psr\Http\Message\StreamInterface|string The stream.
      */
     protected static function getStream($response)
diff --git a/src/Network/CorsBuilder.php b/src/Network/CorsBuilder.php
index 222d15f71eb..609f29144da 100644
--- a/src/Network/CorsBuilder.php
+++ b/src/Network/CorsBuilder.php
@@ -24,7 +24,7 @@
  *
  * It is most convenient to get this object via `Request::cors()`.
  *
- * @see \Cake\Network\Response::cors()
+ * @see \Cake\Http\Response::cors()
  */
 class CorsBuilder
 {
@@ -32,7 +32,7 @@ class CorsBuilder
     /**
      * The response object this builder is attached to.
      *
-     * @var \Cake\Network\Response
+     * @var \Cake\Http\Response
      */
     protected $_response;
 
@@ -60,7 +60,7 @@ class CorsBuilder
     /**
      * Constructor.
      *
-     * @param \Cake\Network\Response $response The response object to add headers onto.
+     * @param \Cake\Http\Response $response The response object to add headers onto.
      * @param string $origin The request's Origin header.
      * @param bool $isSsl Whether or not the request was over SSL.
      */
@@ -77,7 +77,7 @@ public function __construct(Response $response, $origin, $isSsl = false)
      * If the builder has no Origin, or if there are no allowed domains,
      * or if the allowed domains do not match the Origin header no headers will be applied.
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function build()
     {
diff --git a/src/Routing/Dispatcher.php b/src/Routing/Dispatcher.php
index d55f9436ddb..58f0ee2e58c 100644
--- a/src/Routing/Dispatcher.php
+++ b/src/Routing/Dispatcher.php
@@ -17,8 +17,8 @@
 use Cake\Event\EventDispatcherTrait;
 use Cake\Event\EventListenerInterface;
 use Cake\Http\ActionDispatcher;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Network\Response;
 
 /**
  * Dispatcher converts Requests into controller actions. It uses the dispatched Request
diff --git a/src/Routing/DispatcherFilter.php b/src/Routing/DispatcherFilter.php
index 66e7c0a9581..f2f5cc1e253 100644
--- a/src/Routing/DispatcherFilter.php
+++ b/src/Routing/DispatcherFilter.php
@@ -182,7 +182,7 @@ public function matches(Event $event)
      * If used with default priority, it will be called after the Router has parsed the
      * URL and set the routing params into the request object.
      *
-     * If a Cake\Network\Response object instance is returned, it will be served at the end of the
+     * If a Cake\Http\Response object instance is returned, it will be served at the end of the
      * event cycle, not calling any controller as a result. This will also have the effect of
      * not calling the after event in the dispatcher.
      *
diff --git a/src/Routing/Filter/AssetFilter.php b/src/Routing/Filter/AssetFilter.php
index b103ca17603..6241d007e8c 100644
--- a/src/Routing/Filter/AssetFilter.php
+++ b/src/Routing/Filter/AssetFilter.php
@@ -16,8 +16,8 @@
 
 use Cake\Core\Plugin;
 use Cake\Event\Event;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Network\Response;
 use Cake\Routing\DispatcherFilter;
 use Cake\Utility\Inflector;
 
@@ -61,7 +61,7 @@ public function __construct($config = [])
      * Checks if a requested asset exists and sends it to the browser
      *
      * @param \Cake\Event\Event $event Event containing the request and response object
-     * @return \Cake\Network\Response|null If the client is requesting a recognized asset, null otherwise
+     * @return \Cake\Http\Response|null If the client is requesting a recognized asset, null otherwise
      * @throws \Cake\Network\Exception\NotFoundException When asset not found
      */
     public function beforeDispatch(Event $event)
@@ -78,7 +78,7 @@ public function beforeDispatch(Event $event)
         if ($assetFile === null || !file_exists($assetFile)) {
             return null;
         }
-        /* @var \Cake\Network\Response $response */
+        /* @var \Cake\Http\Response $response */
         $response = $event->getData('response');
         $event->stopPropagation();
 
@@ -123,10 +123,10 @@ protected function _getAssetFile($url)
      * Sends an asset file to the client
      *
      * @param \Cake\Http\ServerRequest $request The request object to use.
-     * @param \Cake\Network\Response $response The response object to use.
+     * @param \Cake\Http\Response $response The response object to use.
      * @param string $assetFile Path to the asset file in the file system
      * @param string $ext The extension of the file to determine its mime type
-     * @return \Cake\Network\Response The updated response.
+     * @return \Cake\Http\Response The updated response.
      */
     protected function _deliverAsset(ServerRequest $request, Response $response, $assetFile, $ext)
     {
diff --git a/src/Routing/Filter/ControllerFactoryFilter.php b/src/Routing/Filter/ControllerFactoryFilter.php
index 0a606340dec..0416de2bb0d 100644
--- a/src/Routing/Filter/ControllerFactoryFilter.php
+++ b/src/Routing/Filter/ControllerFactoryFilter.php
@@ -53,7 +53,7 @@ public function beforeDispatch(Event $event)
      * Gets controller to use, either plugin or application controller.
      *
      * @param \Cake\Http\ServerRequest $request Request object
-     * @param \Cake\Network\Response $response Response for the controller.
+     * @param \Cake\Http\Response $response Response for the controller.
      * @return \Cake\Controller\Controller
      */
     protected function _getController($request, $response)
diff --git a/src/Routing/Filter/RoutingFilter.php b/src/Routing/Filter/RoutingFilter.php
index b2b2ef784b5..816dc40d765 100644
--- a/src/Routing/Filter/RoutingFilter.php
+++ b/src/Routing/Filter/RoutingFilter.php
@@ -43,7 +43,7 @@ class RoutingFilter extends DispatcherFilter
      * If Routes have not been loaded they will be loaded, and config/routes.php will be run.
      *
      * @param \Cake\Event\Event $event containing the request, response and additional params
-     * @return \Cake\Network\Response|null A response will be returned when a redirect route is encountered.
+     * @return \Cake\Http\Response|null A response will be returned when a redirect route is encountered.
      */
     public function beforeDispatch(Event $event)
     {
@@ -62,7 +62,7 @@ public function beforeDispatch(Event $event)
             return null;
         } catch (RedirectException $e) {
             $event->stopPropagation();
-            /* @var \Cake\Network\Response $response */
+            /* @var \Cake\Http\Response $response */
             $response = $event->getData('response');
             $response->statusCode($e->getCode());
             $response->header('Location', $e->getMessage());
diff --git a/src/Routing/RequestActionTrait.php b/src/Routing/RequestActionTrait.php
index 32a7c31d2f4..2880cb3a101 100644
--- a/src/Routing/RequestActionTrait.php
+++ b/src/Routing/RequestActionTrait.php
@@ -14,8 +14,8 @@
 namespace Cake\Routing;
 
 use Cake\Core\Configure;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Network\Response;
 use Cake\Network\Session;
 use Cake\Routing\Filter\ControllerFactoryFilter;
 use Cake\Routing\Filter\RoutingFilter;
diff --git a/src/Routing/Route/RedirectRoute.php b/src/Routing/Route/RedirectRoute.php
index 1fc62d7aa62..850850889c4 100644
--- a/src/Routing/Route/RedirectRoute.php
+++ b/src/Routing/Route/RedirectRoute.php
@@ -31,7 +31,7 @@ class RedirectRoute extends Route
     /**
      * A Response object
      *
-     * @var \Cake\Network\Response
+     * @var \Cake\Http\Response
      * @deprecated 3.2.0 This property is unused.
      */
     public $response = null;
diff --git a/src/Routing/Router.php b/src/Routing/Router.php
index a43536f0379..492a1fa37e3 100644
--- a/src/Routing/Router.php
+++ b/src/Routing/Router.php
@@ -817,7 +817,7 @@ public static function normalize($url = '/')
      * component to automatically switch to alternate layouts and templates, and
      * load helpers corresponding to the given content, i.e. RssHelper. Switching
      * layouts and helpers requires that the chosen extension has a defined mime type
-     * in `Cake\Network\Response`.
+     * in `Cake\Http\Response`.
      *
      * A string or an array of valid extensions can be passed to this method.
      * If called without any parameters it will return current list of set extensions.
diff --git a/src/View/AjaxView.php b/src/View/AjaxView.php
index 687717bd5a5..16c5d809627 100644
--- a/src/View/AjaxView.php
+++ b/src/View/AjaxView.php
@@ -15,8 +15,8 @@
 namespace Cake\View;
 
 use Cake\Event\EventManager;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Network\Response;
 
 /**
  * A view class that is used for AJAX responses.
@@ -36,7 +36,7 @@ class AjaxView extends View
      * Constructor
      *
      * @param \Cake\Http\ServerRequest|null $request The request object.
-     * @param \Cake\Network\Response|null $response The response object.
+     * @param \Cake\Http\Response|null $response The response object.
      * @param \Cake\Event\EventManager|null $eventManager Event manager object.
      * @param array $viewOptions View options.
      */
diff --git a/src/View/Cell.php b/src/View/Cell.php
index 4fc0f9a838e..4126b8b6b30 100644
--- a/src/View/Cell.php
+++ b/src/View/Cell.php
@@ -19,8 +19,8 @@
 use Cake\Datasource\ModelAwareTrait;
 use Cake\Event\EventDispatcherTrait;
 use Cake\Event\EventManager;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Network\Response;
 use Cake\ORM\Locator\LocatorAwareTrait;
 use Cake\Utility\Inflector;
 use Cake\View\Exception\MissingCellViewException;
@@ -77,7 +77,7 @@ abstract class Cell
     /**
      * An instance of a Response object that contains information about the impending response
      *
-     * @var \Cake\Network\Response
+     * @var \Cake\Http\Response
      */
     public $response;
 
@@ -134,7 +134,7 @@ abstract class Cell
      * Constructor.
      *
      * @param \Cake\Http\ServerRequest|null $request The request to use in the cell.
-     * @param \Cake\Network\Response|null $response The response to use in the cell.
+     * @param \Cake\Http\Response|null $response The response to use in the cell.
      * @param \Cake\Event\EventManager|null $eventManager The eventManager to bind events to.
      * @param array $cellOptions Cell options to apply.
      */
diff --git a/src/View/Helper/HtmlHelper.php b/src/View/Helper/HtmlHelper.php
index be5051533fc..a11fca14ba0 100644
--- a/src/View/Helper/HtmlHelper.php
+++ b/src/View/Helper/HtmlHelper.php
@@ -15,7 +15,7 @@
 namespace Cake\View\Helper;
 
 use Cake\Core\Configure;
-use Cake\Network\Response;
+use Cake\Http\Response;
 use Cake\View\Helper;
 use Cake\View\StringTemplateTrait;
 use Cake\View\View;
@@ -43,7 +43,7 @@ class HtmlHelper extends Helper
     /**
      * Reference to the Response object
      *
-     * @var \Cake\Network\Response
+     * @var \Cake\Http\Response
      */
     public $response;
 
diff --git a/src/View/SerializedView.php b/src/View/SerializedView.php
index 0218f65b370..4ad4a1722e6 100644
--- a/src/View/SerializedView.php
+++ b/src/View/SerializedView.php
@@ -15,8 +15,8 @@
 namespace Cake\View;
 
 use Cake\Event\EventManager;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Network\Response;
 use RuntimeException;
 
 /**
@@ -36,7 +36,7 @@ abstract class SerializedView extends View
      * Constructor
      *
      * @param \Cake\Http\ServerRequest|null $request Request instance.
-     * @param \Cake\Network\Response|null $response Response instance.
+     * @param \Cake\Http\Response|null $response Response instance.
      * @param \Cake\Event\EventManager|null $eventManager EventManager instance.
      * @param array $viewOptions An array of view options
      */
diff --git a/src/View/View.php b/src/View/View.php
index 714b51713f4..2dfcce15c83 100644
--- a/src/View/View.php
+++ b/src/View/View.php
@@ -20,9 +20,9 @@
 use Cake\Event\EventDispatcherInterface;
 use Cake\Event\EventDispatcherTrait;
 use Cake\Event\EventManager;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Log\LogTrait;
-use Cake\Network\Response;
 use Cake\Routing\RequestActionTrait;
 use Cake\Routing\Router;
 use Cake\Utility\Inflector;
@@ -211,7 +211,7 @@ class View implements EventDispatcherInterface
     /**
      * Reference to the Response object
      *
-     * @var \Cake\Network\Response
+     * @var \Cake\Http\Response
      */
     public $response;
 
@@ -311,7 +311,7 @@ class View implements EventDispatcherInterface
      * Constructor
      *
      * @param \Cake\Http\ServerRequest|null $request Request instance.
-     * @param \Cake\Network\Response|null $response Response instance.
+     * @param \Cake\Http\Response|null $response Response instance.
      * @param \Cake\Event\EventManager|null $eventManager Event manager instance.
      * @param array $viewOptions View options. See View::$_passedVars for list of
      *   options which get set as class properties.
diff --git a/src/View/ViewBuilder.php b/src/View/ViewBuilder.php
index 0315e8b5895..b56be42bd36 100644
--- a/src/View/ViewBuilder.php
+++ b/src/View/ViewBuilder.php
@@ -16,8 +16,8 @@
 
 use Cake\Core\App;
 use Cake\Event\EventManager;
+use Cake\Http\Response;
 use Cake\Http\ServerRequest;
-use Cake\Network\Response;
 use Cake\View\Exception\MissingViewException;
 use JsonSerializable;
 use Serializable;
@@ -592,7 +592,7 @@ public function className($name = null)
      *
      * @param array $vars The view variables/context to use.
      * @param \Cake\Http\ServerRequest|null $request The request to use.
-     * @param \Cake\Network\Response|null $response The response to use.
+     * @param \Cake\Http\Response|null $response The response to use.
      * @param \Cake\Event\EventManager|null $events The event manager to use.
      * @return \Cake\View\View
      * @throws \Cake\View\Exception\MissingViewException
diff --git a/tests/TestCase/Error/ErrorHandlerTest.php b/tests/TestCase/Error/ErrorHandlerTest.php
index 80b5a04dd9a..2a6a939c91b 100644
--- a/tests/TestCase/Error/ErrorHandlerTest.php
+++ b/tests/TestCase/Error/ErrorHandlerTest.php
@@ -37,7 +37,7 @@ class TestErrorHandler extends ErrorHandler
     /**
      * Access the response used.
      *
-     * @var \Cake\Network\Response
+     * @var \Cake\Http\Response
      */
     public $response;
 
diff --git a/tests/TestCase/Http/ActionDispatcherTest.php b/tests/TestCase/Http/ActionDispatcherTest.php
index bbe385f4010..34ca3981f56 100644
--- a/tests/TestCase/Http/ActionDispatcherTest.php
+++ b/tests/TestCase/Http/ActionDispatcherTest.php
@@ -219,7 +219,7 @@ public function testDispatchSetsRequestContext()
      * test invalid response from dispatch process.
      *
      * @expectedException \LogicException
-     * @expectedExceptionMessage Controller actions can only return Cake\Network\Response or null
+     * @expectedExceptionMessage Controller actions can only return Cake\Http\Response or null
      * @return void
      */
     public function testDispatchInvalidResponse()
diff --git a/tests/TestCase/Network/CorsBuilderTest.php b/tests/TestCase/Network/CorsBuilderTest.php
index d480fb029be..7b32d19de0d 100644
--- a/tests/TestCase/Network/CorsBuilderTest.php
+++ b/tests/TestCase/Network/CorsBuilderTest.php
@@ -163,7 +163,7 @@ public function testInvalidAllowedOriginNoHeadersSet()
      * Helper for checking header values.
      *
      * @param string $expected The expected value
-     * @param \Cake\Network\Response $response The Response object.
+     * @param \Cake\Http\Response $response The Response object.
      * @params string $header The header key to check
      */
     protected function assertHeader($expected, Response $response, $header)
@@ -176,7 +176,7 @@ protected function assertHeader($expected, Response $response, $header)
     /**
      * Helper for checking header values.
      *
-     * @param \Cake\Network\Response $response The Response object.
+     * @param \Cake\Http\Response $response The Response object.
      * @params string $header The header key to check
      */
     protected function assertNoHeader(Response $response, $header)
diff --git a/tests/test_app/TestApp/Auth/TestAuthenticate.php b/tests/test_app/TestApp/Auth/TestAuthenticate.php
index 795495966c6..6ce6b1d0c6d 100644
--- a/tests/test_app/TestApp/Auth/TestAuthenticate.php
+++ b/tests/test_app/TestApp/Auth/TestAuthenticate.php
@@ -38,7 +38,7 @@ public function implementedEvents()
 
     /**
      * @param \Cake\Http\ServerRequest $request
-     * @param \Cake\Network\Response $response
+     * @param \Cake\Http\Response $response
      * @return array
      */
     public function authenticate(Request $request, Response $response)
diff --git a/tests/test_app/TestApp/Controller/AuthTestController.php b/tests/test_app/TestApp/Controller/AuthTestController.php
index ad2e5c06b46..563341a6da1 100644
--- a/tests/test_app/TestApp/Controller/AuthTestController.php
+++ b/tests/test_app/TestApp/Controller/AuthTestController.php
@@ -41,7 +41,7 @@ class AuthTestController extends Controller
      *
      * @param \Cake\Http\ServerRequest|null $request Request object for this controller. Can be null for testing,
      *   but expect that features that use the request parameters will not work.
-     * @param \Cake\Network\Response|null $response Response object for this controller.
+     * @param \Cake\Http\Response|null $response Response object for this controller.
      */
     public function __construct($request = null, $response = null)
     {
@@ -105,7 +105,7 @@ public function camelCase()
      *
      * @param string|array $url
      * @param int $status
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      */
     public function redirect($url, $status = null)
     {
diff --git a/tests/test_app/TestApp/Controller/CakesController.php b/tests/test_app/TestApp/Controller/CakesController.php
index 5e84be7d665..57eaaa143e5 100644
--- a/tests/test_app/TestApp/Controller/CakesController.php
+++ b/tests/test_app/TestApp/Controller/CakesController.php
@@ -19,7 +19,7 @@ class CakesController extends Controller
     /**
      * index method
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function index()
     {
@@ -42,7 +42,7 @@ public function noRender()
     /**
      * invalid method
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function invalid()
     {
diff --git a/tests/test_app/TestApp/Controller/Component/TestAuthComponent.php b/tests/test_app/TestApp/Controller/Component/TestAuthComponent.php
index 06ffb748798..447c9e14ed4 100644
--- a/tests/test_app/TestApp/Controller/Component/TestAuthComponent.php
+++ b/tests/test_app/TestApp/Controller/Component/TestAuthComponent.php
@@ -28,7 +28,7 @@ class TestAuthComponent extends AuthComponent
 
     /**
      * @param Event $event
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      */
     public function authCheck(Event $event)
     {
diff --git a/tests/test_app/TestApp/Controller/PagesController.php b/tests/test_app/TestApp/Controller/PagesController.php
index 31b7cb73ce3..cea2182f312 100644
--- a/tests/test_app/TestApp/Controller/PagesController.php
+++ b/tests/test_app/TestApp/Controller/PagesController.php
@@ -44,7 +44,7 @@ class PagesController extends AppController
      * Displays a view
      *
      * @param mixed What page to display
-     * @return \Cake\Network\Response|null
+     * @return \Cake\Http\Response|null
      * @throws \Cake\Network\Exception\NotFoundException When the view file could not be found
      *  or Cake\View\Exception\MissingTemplateException in debug mode.
      */
diff --git a/tests/test_app/TestApp/Controller/RequestActionController.php b/tests/test_app/TestApp/Controller/RequestActionController.php
index 8589e2a46d4..50296f8ec41 100644
--- a/tests/test_app/TestApp/Controller/RequestActionController.php
+++ b/tests/test_app/TestApp/Controller/RequestActionController.php
@@ -31,7 +31,7 @@ class RequestActionController extends AppController
     /**
      * test_request_action method
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function test_request_action()
     {
@@ -45,7 +45,7 @@ public function test_request_action()
      *
      * @param mixed $id
      * @param mixed $other
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function another_ra_test($id, $other)
     {
@@ -57,7 +57,7 @@ public function another_ra_test($id, $other)
     /**
      * normal_request_action method
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function normal_request_action()
     {
@@ -69,7 +69,7 @@ public function normal_request_action()
     /**
      * returns $this->here as body
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function return_here()
     {
@@ -92,7 +92,7 @@ public function paginate_request_action()
     /**
      * post pass, testing post passing
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function post_pass()
     {
@@ -104,7 +104,7 @@ public function post_pass()
     /**
      * query pass, testing query passing
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function query_pass()
     {
@@ -116,7 +116,7 @@ public function query_pass()
     /**
      * cookie pass, testing cookie passing
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function cookie_pass()
     {
@@ -128,7 +128,7 @@ public function cookie_pass()
     /**
      * test param passing and parsing.
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function params_pass()
     {
@@ -149,7 +149,7 @@ public function params_pass()
     /**
      * param check method.
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function param_check()
     {
@@ -166,7 +166,7 @@ public function param_check()
     /**
      * Tests session transmission
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function session_test()
     {
@@ -178,7 +178,7 @@ public function session_test()
     /**
      * Tests input data transmission
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function input_test()
     {
diff --git a/tests/test_app/TestApp/Controller/SomePagesController.php b/tests/test_app/TestApp/Controller/SomePagesController.php
index e86ef02df39..75abdf6b139 100644
--- a/tests/test_app/TestApp/Controller/SomePagesController.php
+++ b/tests/test_app/TestApp/Controller/SomePagesController.php
@@ -45,7 +45,7 @@ public function index()
     /**
      * Test method for returning responses.
      *
-     * @return \Cake\Network\Response
+     * @return \Cake\Http\Response
      */
     public function responseGenerator()
     {