From bc14b1778f0d0a4fae1c127baea55ee9ef7fe68f Mon Sep 17 00:00:00 2001 From: Mark Story Date: Fri, 8 Dec 2017 21:58:21 -0500 Subject: [PATCH] Fix annotations point to Network\Session --- src/Auth/Storage/SessionStorage.php | 2 +- src/Controller/Component/AuthComponent.php | 2 +- src/Controller/Component/FlashComponent.php | 2 +- src/Controller/Component/SecurityComponent.php | 2 +- src/Routing/RequestActionTrait.php | 2 +- src/TestSuite/IntegrationTestCase.php | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Auth/Storage/SessionStorage.php b/src/Auth/Storage/SessionStorage.php index d7a64be639f..1e4002fc5f2 100644 --- a/src/Auth/Storage/SessionStorage.php +++ b/src/Auth/Storage/SessionStorage.php @@ -41,7 +41,7 @@ class SessionStorage implements StorageInterface /** * Session object. * - * @var \Cake\Network\Session + * @var \Cake\Http\Session */ protected $_session; diff --git a/src/Controller/Component/AuthComponent.php b/src/Controller/Component/AuthComponent.php index 2471b4ef439..7696030677d 100644 --- a/src/Controller/Component/AuthComponent.php +++ b/src/Controller/Component/AuthComponent.php @@ -221,7 +221,7 @@ class AuthComponent extends Component /** * Instance of the Session object * - * @var \Cake\Network\Session + * @var \Cake\Http\Session * @deprecated 3.1.0 Will be removed in 4.0 */ public $session; diff --git a/src/Controller/Component/FlashComponent.php b/src/Controller/Component/FlashComponent.php index ab5be27e9d7..9a8ae726aa4 100644 --- a/src/Controller/Component/FlashComponent.php +++ b/src/Controller/Component/FlashComponent.php @@ -34,7 +34,7 @@ class FlashComponent extends Component /** * The Session object instance * - * @var \Cake\Network\Session + * @var \Cake\Http\Session */ protected $_session; diff --git a/src/Controller/Component/SecurityComponent.php b/src/Controller/Component/SecurityComponent.php index 3e538fa5e3d..3ee31822503 100644 --- a/src/Controller/Component/SecurityComponent.php +++ b/src/Controller/Component/SecurityComponent.php @@ -87,7 +87,7 @@ class SecurityComponent extends Component /** * The Session object * - * @var \Cake\Network\Session + * @var \Cake\Http\Session */ public $session; diff --git a/src/Routing/RequestActionTrait.php b/src/Routing/RequestActionTrait.php index b9b89fea83d..56242f3b68a 100644 --- a/src/Routing/RequestActionTrait.php +++ b/src/Routing/RequestActionTrait.php @@ -16,7 +16,7 @@ use Cake\Core\Configure; use Cake\Http\Response; use Cake\Http\ServerRequest; -use Cake\Network\Session; +use Cake\Http\Session; use Cake\Routing\Filter\ControllerFactoryFilter; use Cake\Routing\Filter\RoutingFilter; diff --git a/src/TestSuite/IntegrationTestCase.php b/src/TestSuite/IntegrationTestCase.php index e24c606236b..9851c54ff43 100644 --- a/src/TestSuite/IntegrationTestCase.php +++ b/src/TestSuite/IntegrationTestCase.php @@ -22,7 +22,7 @@ class_alias('PHPUnit_Exception', 'PHPUnit\Exception'); use Cake\Core\Configure; use Cake\Database\Exception as DatabaseException; -use Cake\Network\Session; +use Cake\Http\Session; use Cake\Routing\Router; use Cake\TestSuite\Stub\TestExceptionRenderer; use Cake\Utility\CookieCryptTrait; @@ -130,7 +130,7 @@ abstract class IntegrationTestCase extends TestCase /** * The session instance from the last request * - * @var \Cake\Network\Session|null + * @var \Cake\Http\Session|null */ protected $_requestSession;