Merge branch '3.next' of github.com:cakephp/cakephp into 3.next

src/Controller/Component.php

@@ -65,7 +65,7 @@ class Component implements EventListenerInterface
     /**
      * Request object
      *
-     * @var \Cake\Network\Request
+     * @var \Cake\Http\ServerRequest
      */
     public $request;
 

src/Controller/Component/SecurityComponent.php

@@ -87,7 +87,7 @@ class SecurityComponent extends Component
     /**
      * Request object
      *
-     * @var \Cake\Network\Request
+     * @var \Cake\Http\ServerRequest
      */
     public $request;
 

src/Controller/Controller.php

@@ -122,7 +122,7 @@ class Controller implements EventListenerInterface, EventDispatcherInterface
      * This object contains all the information about a request and several methods for reading
      * additional information about the request.
      *
-     * @var \Cake\Network\Request
+     * @var \Cake\Http\ServerRequest
      * @link http://book.cakephp.org/3.0/en/controllers/request-response.html#request
      */
     public $request;

src/View/Cell.php

@@ -70,7 +70,7 @@ abstract class Cell
      * This object contains all the information about a request and several methods for reading
      * additional information about the request.
      *
-     * @var \Cake\Network\Request
+     * @var \Cake\Http\ServerRequest
      */
     public $request;
 

src/View/Form/ArrayContext.php

@@ -63,7 +63,7 @@ class ArrayContext implements ContextInterface
     /**
      * The request object.
      *
-     * @var \Cake\Network\Request
+     * @var \Cake\Http\ServerRequest
      */
     protected $_request;
 

src/View/Form/EntityContext.php

@@ -48,7 +48,7 @@ class EntityContext implements ContextInterface
     /**
      * The request object.
      *
-     * @var \Cake\Network\Request
+     * @var \Cake\Http\ServerRequest
      */
     protected $_request;
 

src/View/Form/FormContext.php

@@ -29,7 +29,7 @@ class FormContext implements ContextInterface
     /**
      * The request object.
      *
-     * @var \Cake\Network\Request
+     * @var \Cake\Http\ServerRequest
      */
     protected $_request;
 

src/View/Form/NullContext.php

@@ -28,7 +28,7 @@ class NullContext implements ContextInterface
     /**
      * The request object.
      *
-     * @var \Cake\Network\Request
+     * @var \Cake\Http\ServerRequest
      */
     protected $_request;
 

src/View/Helper.php

@@ -74,7 +74,7 @@ class Helper implements EventListenerInterface
     /**
      * Request object
      *
-     * @var \Cake\Network\Request
+     * @var \Cake\Http\ServerRequest
      */
     public $request = null;
 

src/View/View.php

@@ -200,7 +200,7 @@ class View implements EventDispatcherInterface
      * This object contains all the information about a request and several methods for reading
      * additional information about the request.
      *
-     * @var \Cake\Network\Request
+     * @var \Cake\Http\ServerRequest
      */
     public $request;
 

tests/test_app/TestApp/View/Cell/ArticlesCell.php

@@ -29,7 +29,7 @@ class ArticlesCell extends \Cake\View\Cell
     /**
      * Counter used to test the cache cell feature
      *
-     * @return void
+     * @var int
      */
     public $counter = 0;