From 69dcc122010c3a93e97221de39801554fd30be47 Mon Sep 17 00:00:00 2001 From: saeid Date: Fri, 24 Mar 2017 01:25:30 +0430 Subject: [PATCH] use Cake\Http\ServerRequest on tests --- tests/TestCase/Auth/BasicAuthenticateTest.php | 18 ++-- .../TestCase/Auth/ControllerAuthorizeTest.php | 6 +- .../TestCase/Auth/DigestAuthenticateTest.php | 22 ++--- tests/TestCase/Auth/FormAuthenticateTest.php | 32 +++---- .../Auth/Storage/SessionStorageTest.php | 4 +- .../Component/AuthComponentTest.php | 24 +++--- .../Component/CookieComponentTest.php | 4 +- .../Component/CsrfComponentTest.php | 24 +++--- .../Component/FlashComponentTest.php | 4 +- .../Component/PaginatorComponentTest.php | 4 +- .../Component/RequestHandlerComponentTest.php | 34 ++++---- .../Component/SecurityComponentTest.php | 8 +- .../Controller/ComponentRegistryTest.php | 4 +- tests/TestCase/Controller/ControllerTest.php | 60 ++++++------- tests/TestCase/Error/ErrorHandlerTest.php | 4 +- .../TestCase/Error/ExceptionRendererTest.php | 20 ++--- tests/TestCase/Http/ActionDispatcherTest.php | 28 +++--- tests/TestCase/Http/ControllerFactoryTest.php | 24 +++--- .../TestCase/Http/RequestTransformerTest.php | 1 - tests/TestCase/Http/ResponseTest.php | 20 ++--- tests/TestCase/Http/ServerRequestTest.php | 2 +- tests/TestCase/Network/MoveToHttpTest.php | 2 +- .../Routing/DispatcherFactoryTest.php | 4 +- .../TestCase/Routing/DispatcherFilterTest.php | 22 ++--- tests/TestCase/Routing/DispatcherTest.php | 26 +++--- .../Routing/Filter/AssetFilterTest.php | 14 +-- .../Filter/ControllerFactoryFilterTest.php | 4 +- .../Filter/LocaleSelectorFilterTest.php | 12 +-- .../Routing/Filter/RoutingFilterTest.php | 12 +-- .../Routing/RequestActionTraitTest.php | 4 +- tests/TestCase/Routing/RouterTest.php | 86 +++++++++---------- .../TestSuite/IntegrationTestCaseTest.php | 3 - tests/TestCase/View/CellTest.php | 6 +- tests/TestCase/View/Form/ArrayContextTest.php | 4 +- .../TestCase/View/Form/EntityContextTest.php | 4 +- tests/TestCase/View/Form/FormContextTest.php | 4 +- .../TestCase/View/Helper/FlashHelperTest.php | 4 +- tests/TestCase/View/Helper/FormHelperTest.php | 6 +- tests/TestCase/View/Helper/HtmlHelperTest.php | 4 +- .../View/Helper/PaginatorHelperTest.php | 8 +- tests/TestCase/View/Helper/UrlHelperTest.php | 4 +- tests/TestCase/View/JsonViewTest.php | 10 +-- tests/TestCase/View/ViewBuilderTest.php | 2 +- tests/TestCase/View/ViewTest.php | 18 ++-- tests/TestCase/View/XmlViewTest.php | 18 ++-- .../TestApp/Auth/TestAuthenticate.php | 4 +- .../Error/TestAppsExceptionRenderer.php | 4 +- 47 files changed, 316 insertions(+), 320 deletions(-) diff --git a/tests/TestCase/Auth/BasicAuthenticateTest.php b/tests/TestCase/Auth/BasicAuthenticateTest.php index fff27b5e5ce..8a077cbcc3f 100644 --- a/tests/TestCase/Auth/BasicAuthenticateTest.php +++ b/tests/TestCase/Auth/BasicAuthenticateTest.php @@ -17,9 +17,9 @@ use Cake\Auth\BasicAuthenticate; use Cake\Controller\ComponentRegistry; use Cake\Http\Response; +use Cake\Http\ServerRequest; use Cake\I18n\Time; use Cake\Network\Exception\UnauthorizedException; -use Cake\Network\Request; use Cake\ORM\TableRegistry; use Cake\TestSuite\TestCase; @@ -79,7 +79,7 @@ public function testConstructor() */ public function testAuthenticateNoData() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $this->response->expects($this->never()) ->method('header'); @@ -94,7 +94,7 @@ public function testAuthenticateNoData() */ public function testAuthenticateNoUsername() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => ['PHP_AUTH_PW' => 'foobar'] ]); @@ -109,7 +109,7 @@ public function testAuthenticateNoUsername() */ public function testAuthenticateNoPassword() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => ['PHP_AUTH_USER' => 'mariano'] ]); @@ -124,7 +124,7 @@ public function testAuthenticateNoPassword() */ public function testAuthenticateInjection() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => [ 'PHP_AUTH_USER' => '> 1', @@ -147,7 +147,7 @@ public function testAuthenticateUsernameZero() $User = TableRegistry::get('Users'); $User->updateAll(['username' => '0'], ['username' => 'mariano']); - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = ['User' => [ 'user' => '0', 'password' => 'password' @@ -171,7 +171,7 @@ public function testAuthenticateUsernameZero() */ public function testAuthenticateChallenge() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->addParams(['pass' => []]); try { @@ -192,7 +192,7 @@ public function testAuthenticateChallenge() */ public function testAuthenticateSuccess() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => [ 'PHP_AUTH_USER' => 'mariano', @@ -221,7 +221,7 @@ public function testAuthenticateSuccess() public function testAuthenticateFailReChallenge() { $this->auth->config('scope.username', 'nate'); - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => [ 'PHP_AUTH_USER' => 'mariano', diff --git a/tests/TestCase/Auth/ControllerAuthorizeTest.php b/tests/TestCase/Auth/ControllerAuthorizeTest.php index fc4e5cec63b..bcc406c23ad 100644 --- a/tests/TestCase/Auth/ControllerAuthorizeTest.php +++ b/tests/TestCase/Auth/ControllerAuthorizeTest.php @@ -19,7 +19,7 @@ use Cake\Auth\ControllerAuthorize; use Cake\Controller\ComponentRegistry; use Cake\Controller\Controller; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\TestSuite\TestCase; /** @@ -65,7 +65,7 @@ public function testControllerErrorOnMissingMethod() public function testAuthorizeFailure() { $user = []; - $request = new Request('/posts/index'); + $request = new ServerRequest('/posts/index'); $this->assertFalse($this->auth->authorize($user, $request)); } @@ -77,7 +77,7 @@ public function testAuthorizeFailure() public function testAuthorizeSuccess() { $user = ['User' => ['username' => 'mark']]; - $request = new Request('/posts/index'); + $request = new ServerRequest('/posts/index'); $this->controller->expects($this->once()) ->method('isAuthorized') diff --git a/tests/TestCase/Auth/DigestAuthenticateTest.php b/tests/TestCase/Auth/DigestAuthenticateTest.php index 8bcb9645c7d..985f2e6bfe9 100644 --- a/tests/TestCase/Auth/DigestAuthenticateTest.php +++ b/tests/TestCase/Auth/DigestAuthenticateTest.php @@ -20,9 +20,9 @@ use Cake\Controller\ComponentRegistry; use Cake\Core\Configure; use Cake\Http\Response; +use Cake\Http\ServerRequest; use Cake\I18n\Time; use Cake\Network\Exception\UnauthorizedException; -use Cake\Network\Request; use Cake\ORM\TableRegistry; use Cake\TestSuite\TestCase; @@ -87,7 +87,7 @@ public function testConstructor() */ public function testAuthenticateNoData() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $this->response->expects($this->never()) ->method('header'); @@ -104,7 +104,7 @@ public function testAuthenticateNoData() */ public function testAuthenticateWrongUsername() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->addParams(['pass' => []]); $data = [ @@ -129,7 +129,7 @@ public function testAuthenticateWrongUsername() */ public function testAuthenticateChallenge() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => ['REQUEST_METHOD' => 'GET'] ]); @@ -156,7 +156,7 @@ public function testAuthenticateChallenge() */ public function testAuthenticateChallengeIncludesStaleAttributeOnStaleNonce() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => ['REQUEST_METHOD' => 'GET'] ]); @@ -188,7 +188,7 @@ public function testAuthenticateChallengeIncludesStaleAttributeOnStaleNonce() */ public function testAuthenticateFailsOnStaleNonce() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => ['REQUEST_METHOD' => 'GET'] ]); @@ -214,7 +214,7 @@ public function testAuthenticateFailsOnStaleNonce() */ public function testAuthenticateValidUsernamePasswordNoNonce() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => ['REQUEST_METHOD' => 'GET'] ]); @@ -242,7 +242,7 @@ public function testAuthenticateValidUsernamePasswordNoNonce() */ public function testAuthenticateSuccess() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => ['REQUEST_METHOD' => 'GET'] ]); @@ -275,7 +275,7 @@ public function testAuthenticateSuccess() */ public function testAuthenticateSuccessSimulatedRequestMethod() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'post' => ['_method' => 'PUT'], 'environment' => ['REQUEST_METHOD' => 'GET'] @@ -313,7 +313,7 @@ public function testAuthenticateSuccessSimulatedRequestMethod() public function testAuthenticateFailReChallenge() { $this->auth->config('scope.username', 'nate'); - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'environment' => ['REQUEST_METHOD' => 'GET'] ]); @@ -339,7 +339,7 @@ public function testAuthenticateFailReChallenge() */ public function testLoginHeaders() { - $request = new Request([ + $request = new ServerRequest([ 'environment' => ['SERVER_NAME' => 'localhost'] ]); $this->auth = new DigestAuthenticate($this->Collection, [ diff --git a/tests/TestCase/Auth/FormAuthenticateTest.php b/tests/TestCase/Auth/FormAuthenticateTest.php index 4419902406b..b7e0f288e34 100644 --- a/tests/TestCase/Auth/FormAuthenticateTest.php +++ b/tests/TestCase/Auth/FormAuthenticateTest.php @@ -18,8 +18,8 @@ use Cake\Controller\ComponentRegistry; use Cake\Core\Plugin; use Cake\Http\Response; +use Cake\Http\ServerRequest; use Cake\I18n\Time; -use Cake\Network\Request; use Cake\ORM\Entity; use Cake\ORM\TableRegistry; use Cake\TestSuite\TestCase; @@ -86,7 +86,7 @@ public function testConstructor() */ public function testAuthenticateNoData() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = []; $this->assertFalse($this->auth->authenticate($request, $this->response)); } @@ -98,7 +98,7 @@ public function testAuthenticateNoData() */ public function testAuthenticateNoUsername() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = ['password' => 'foobar']; $this->assertFalse($this->auth->authenticate($request, $this->response)); } @@ -110,7 +110,7 @@ public function testAuthenticateNoUsername() */ public function testAuthenticateNoPassword() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = ['username' => 'mariano']; $this->assertFalse($this->auth->authenticate($request, $this->response)); } @@ -122,7 +122,7 @@ public function testAuthenticateNoPassword() */ public function testAuthenticatePasswordIsFalse() { - $request = new Request('posts/index', false); + $request = new ServerRequest('posts/index', false); $request->data = [ 'username' => 'mariano', 'password' => null @@ -138,7 +138,7 @@ public function testAuthenticatePasswordIsFalse() */ public function testAuthenticatePasswordIsEmptyString() { - $request = new Request('posts/index', false); + $request = new ServerRequest('posts/index', false); $request->data = [ 'username' => 'mariano', 'password' => '' @@ -167,7 +167,7 @@ public function testAuthenticatePasswordIsEmptyString() */ public function testAuthenticateFieldsAreNotString() { - $request = new Request('posts/index', false); + $request = new ServerRequest('posts/index', false); $request->data = [ 'username' => ['mariano', 'phpnut'], 'password' => 'my password' @@ -188,7 +188,7 @@ public function testAuthenticateFieldsAreNotString() */ public function testAuthenticateInjection() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = [ 'username' => '> 1', 'password' => "' OR 1 = 1" @@ -203,7 +203,7 @@ public function testAuthenticateInjection() */ public function testAuthenticateSuccess() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = [ 'username' => 'mariano', 'password' => 'password' @@ -228,7 +228,7 @@ public function testAuthenticateIncludesVirtualFields() $users = TableRegistry::get('Users'); $users->entityClass('TestApp\Model\Entity\VirtualUser'); - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = [ 'username' => 'mariano', 'password' => 'password' @@ -261,7 +261,7 @@ public function testPluginModel() $this->auth->config('userModel', 'TestPlugin.AuthUsers'); - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = [ 'username' => 'gwoo', 'password' => 'cake' @@ -285,7 +285,7 @@ public function testPluginModel() */ public function testFinder() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = [ 'username' => 'mariano', 'password' => 'password' @@ -323,7 +323,7 @@ public function testFinder() */ public function testFinderOptions() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = [ 'username' => 'mariano', 'password' => 'password' @@ -376,7 +376,7 @@ public function testPasswordHasherSettings() ['username' => 'mariano'] ); - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = [ 'username' => 'mariano', 'password' => 'mypass' @@ -414,7 +414,7 @@ public function testPasswordHasherSettings() */ public function testAuthenticateNoRehash() { - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = [ 'username' => 'mariano', 'password' => 'password' @@ -439,7 +439,7 @@ public function testAuthenticateRehash() $password = $this->auth->passwordHasher()->hash('password'); TableRegistry::get('Users')->updateAll(['password' => $password], []); - $request = new Request('posts/index'); + $request = new ServerRequest('posts/index'); $request->data = [ 'username' => 'mariano', 'password' => 'password' diff --git a/tests/TestCase/Auth/Storage/SessionStorageTest.php b/tests/TestCase/Auth/Storage/SessionStorageTest.php index 46548c6c86c..3ac1b6d8493 100644 --- a/tests/TestCase/Auth/Storage/SessionStorageTest.php +++ b/tests/TestCase/Auth/Storage/SessionStorageTest.php @@ -16,7 +16,7 @@ use Cake\Auth\Storage\SessionStorage; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Network\Session; use Cake\TestSuite\TestCase; @@ -36,7 +36,7 @@ public function setUp() parent::setUp(); $this->session = $this->getMockBuilder(Session::class)->getMock(); - $this->request = new Request(['session' => $this->session]); + $this->request = new ServerRequest(['session' => $this->session]); $this->response = new Response(); $this->storage = new SessionStorage($this->request, $this->response, ['key' => 'Auth.AuthUser']); $this->user = ['id' => 1]; diff --git a/tests/TestCase/Controller/Component/AuthComponentTest.php b/tests/TestCase/Controller/Component/AuthComponentTest.php index 3bd712217a2..e98453f1a78 100644 --- a/tests/TestCase/Controller/Component/AuthComponentTest.php +++ b/tests/TestCase/Controller/Component/AuthComponentTest.php @@ -21,7 +21,7 @@ use Cake\Event\Event; use Cake\Event\EventManager; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\ORM\TableRegistry; use Cake\Routing\Router; use Cake\Routing\Route\InflectedRoute; @@ -66,7 +66,7 @@ public function setUp() $routes->fallbacks(InflectedRoute::class); }); - $request = new Request(); + $request = new ServerRequest(); $request->env('REQUEST_METHOD', 'GET'); $response = $this->getMockBuilder('Cake\Http\Response') @@ -751,7 +751,7 @@ public function testLoginRedirectDifferentBaseUrl() $this->Auth->session->delete('Auth'); $url = '/posts/add'; - $this->Auth->request = $this->Controller->request = new Request($url); + $this->Auth->request = $this->Controller->request = new ServerRequest($url); $this->Auth->request->env('REQUEST_METHOD', 'GET'); $this->Auth->request->addParams(Router::parse($url)); $this->Auth->request->url = Router::normalize($url); @@ -806,7 +806,7 @@ public function testNoLoginRedirectForAuthenticatedUser() public function testDefaultToLoginRedirect() { $url = '/party/on'; - $this->Auth->request = $request = new Request($url); + $this->Auth->request = $request = new ServerRequest($url); $request->env('HTTP_REFERER', false); $request->addParams(Router::parse($url)); $request->addPaths([ @@ -850,7 +850,7 @@ public function testRedirectToUnauthorizedRedirect() ->setMethods(['set']) ->setConstructorArgs([$this->Controller->components()]) ->getMock(); - $this->Auth->request = $request = new Request([ + $this->Auth->request = $request = new ServerRequest([ 'url' => $url, 'session' => $this->Auth->session ]); @@ -891,7 +891,7 @@ public function testRedirectToUnauthorizedRedirectLoginAction() ->setMethods(['set']) ->setConstructorArgs([$this->Controller->components()]) ->getMock(); - $this->Auth->request = $request = new Request([ + $this->Auth->request = $request = new ServerRequest([ 'url' => $url, 'session' => $this->Auth->session ]); @@ -929,7 +929,7 @@ public function testRedirectToUnauthorizedRedirectSuppressedAuthError() $this->Auth->session = $this->getMockBuilder('Cake\Network\Session') ->setMethods(['flash']) ->getMock(); - $this->Auth->request = $Request = new Request($url); + $this->Auth->request = $Request = new ServerRequest($url); $this->Auth->request->addParams(Router::parse($url)); $this->Auth->config('authorize', ['Controller']); $this->Auth->setUser(['username' => 'admad', 'password' => 'cake']); @@ -964,7 +964,7 @@ public function testRedirectToUnauthorizedRedirectSuppressedAuthError() public function testForbiddenException() { $url = '/party/on'; - $this->Auth->request = $request = new Request($url); + $this->Auth->request = $request = new ServerRequest($url); $this->Auth->request->addParams(Router::parse($url)); $this->Auth->config([ 'authorize' => ['Controller'], @@ -997,7 +997,7 @@ public function testNoRedirectOnLoginAction() $controller->methods = ['login']; $url = '/AuthTest/login'; - $this->Auth->request = $controller->request = new Request($url); + $this->Auth->request = $controller->request = new ServerRequest($url); $this->Auth->request->addParams(Router::parse($url)); $this->Auth->config([ 'loginAction', ['controller' => 'AuthTest', 'action' => 'login'], @@ -1075,7 +1075,7 @@ public function testAdminRoute() */ public function testAjaxLogin() { - $this->Controller->request = new Request([ + $this->Controller->request = new ServerRequest([ 'url' => '/ajax_auth/add', 'environment' => ['HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest'], ]); @@ -1103,7 +1103,7 @@ public function testAjaxLogin() */ public function testAjaxUnauthenticated() { - $this->Controller->request = new Request([ + $this->Controller->request = new ServerRequest([ 'url' => '/ajax_auth/add', 'environment' => ['HTTP_X_REQUESTED_WITH' => 'XMLHttpRequest'], ]); @@ -1482,7 +1482,7 @@ public function testRedirectUrlWithBaseSet() ]); $url = '/users/login'; - $this->Auth->request = $this->Controller->request = new Request($url); + $this->Auth->request = $this->Controller->request = new ServerRequest($url); $this->Auth->request->addParams(Router::parse($url)); $this->Auth->request->url = Router::normalize($url); diff --git a/tests/TestCase/Controller/Component/CookieComponentTest.php b/tests/TestCase/Controller/Component/CookieComponentTest.php index dcf953fe5e7..0412cc782ef 100644 --- a/tests/TestCase/Controller/Component/CookieComponentTest.php +++ b/tests/TestCase/Controller/Component/CookieComponentTest.php @@ -17,8 +17,8 @@ use Cake\Controller\ComponentRegistry; use Cake\Controller\Component\CookieComponent; use Cake\Http\Response; +use Cake\Http\ServerRequest; use Cake\I18n\Time; -use Cake\Network\Request; use Cake\TestSuite\TestCase; use Cake\Utility\Security; @@ -43,7 +43,7 @@ public function setUp() parent::setUp(); $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) - ->setConstructorArgs([new Request(), new Response()]) + ->setConstructorArgs([new ServerRequest(), new Response()]) ->getMock(); $controller->loadComponent('Cookie'); $this->Controller = $controller; diff --git a/tests/TestCase/Controller/Component/CsrfComponentTest.php b/tests/TestCase/Controller/Component/CsrfComponentTest.php index b7982d8d309..bf1566e4ce5 100644 --- a/tests/TestCase/Controller/Component/CsrfComponentTest.php +++ b/tests/TestCase/Controller/Component/CsrfComponentTest.php @@ -18,8 +18,8 @@ use Cake\Controller\Component\CsrfComponent; use Cake\Event\Event; use Cake\Http\Response; +use Cake\Http\ServerRequest; use Cake\I18n\Time; -use Cake\Network\Request; use Cake\TestSuite\TestCase; /** @@ -66,7 +66,7 @@ public function testSettingCookie() $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => ['REQUEST_METHOD' => 'GET'], 'webroot' => '/dir/', ]); @@ -110,7 +110,7 @@ public function testSafeMethodNoCsrfRequired($method) $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => [ 'REQUEST_METHOD' => $method, 'HTTP_X_CSRF_TOKEN' => 'nope', @@ -148,7 +148,7 @@ public function testValidTokenInHeader($method) $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => [ 'REQUEST_METHOD' => $method, 'HTTP_X_CSRF_TOKEN' => 'testing123', @@ -176,7 +176,7 @@ public function testInvalidTokenInHeader($method) $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => [ 'REQUEST_METHOD' => $method, 'HTTP_X_CSRF_TOKEN' => 'nope', @@ -202,7 +202,7 @@ public function testValidTokenRequestData($method) $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => [ 'REQUEST_METHOD' => $method, ], @@ -229,7 +229,7 @@ public function testInvalidTokenRequestData($method) $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => [ 'REQUEST_METHOD' => $method, ], @@ -253,7 +253,7 @@ public function testInvalidTokenRequestDataMissing() $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => [ 'REQUEST_METHOD' => 'POST', ], @@ -278,7 +278,7 @@ public function testInvalidTokenMissingCookie($method) $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => [ 'REQUEST_METHOD' => $method ], @@ -302,7 +302,7 @@ public function testCsrfValidationSkipsRequestAction() $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => ['REQUEST_METHOD' => 'POST'], 'params' => ['requested' => 1], 'post' => ['_csrfToken' => 'nope'], @@ -327,7 +327,7 @@ public function testConfigurationCookieCreate() $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => ['REQUEST_METHOD' => 'GET'], 'webroot' => '/dir/' ]); @@ -364,7 +364,7 @@ public function testConfigurationValidate() $controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['redirect']) ->getMock(); - $controller->request = new Request([ + $controller->request = new ServerRequest([ 'environment' => ['REQUEST_METHOD' => 'POST'], 'cookies' => ['csrfToken' => 'nope', 'token' => 'yes'], 'post' => ['_csrfToken' => 'no match', 'token' => 'yes'], diff --git a/tests/TestCase/Controller/Component/FlashComponentTest.php b/tests/TestCase/Controller/Component/FlashComponentTest.php index 2d3a83d3986..70fcf3082bf 100644 --- a/tests/TestCase/Controller/Component/FlashComponentTest.php +++ b/tests/TestCase/Controller/Component/FlashComponentTest.php @@ -18,7 +18,7 @@ use Cake\Controller\Component\FlashComponent; use Cake\Controller\Controller; use Cake\Core\Configure; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Network\Session; use Cake\TestSuite\TestCase; use Exception; @@ -38,7 +38,7 @@ public function setUp() { parent::setUp(); Configure::write('App.namespace', 'TestApp'); - $this->Controller = new Controller(new Request(['session' => new Session()])); + $this->Controller = new Controller(new ServerRequest(['session' => new Session()])); $this->ComponentRegistry = new ComponentRegistry($this->Controller); $this->Flash = new FlashComponent($this->ComponentRegistry); $this->Session = new Session(); diff --git a/tests/TestCase/Controller/Component/PaginatorComponentTest.php b/tests/TestCase/Controller/Component/PaginatorComponentTest.php index 66aa8be067e..7342d233a07 100644 --- a/tests/TestCase/Controller/Component/PaginatorComponentTest.php +++ b/tests/TestCase/Controller/Component/PaginatorComponentTest.php @@ -19,8 +19,8 @@ use Cake\Controller\Controller; use Cake\Core\Configure; use Cake\Datasource\ConnectionManager; +use Cake\Http\ServerRequest; use Cake\Network\Exception\NotFoundException; -use Cake\Network\Request; use Cake\ORM\Entity; use Cake\ORM\TableRegistry; use Cake\TestSuite\TestCase; @@ -67,7 +67,7 @@ public function setUp() Configure::write('App.namespace', 'TestApp'); - $this->request = new Request('controller_posts/index'); + $this->request = new ServerRequest('controller_posts/index'); $this->request->params['pass'] = []; $controller = new Controller($this->request); $registry = new ComponentRegistry($controller); diff --git a/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php b/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php index e8350c7d338..a82481873bf 100644 --- a/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php +++ b/tests/TestCase/Controller/Component/RequestHandlerComponentTest.php @@ -18,7 +18,7 @@ use Cake\Controller\Component\RequestHandlerComponent; use Cake\Core\Configure; use Cake\Event\Event; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\DispatcherFactory; use Cake\Routing\Router; use Cake\TestSuite\TestCase; @@ -73,7 +73,7 @@ public function setUp() */ protected function _init() { - $request = new Request('controller_posts/index'); + $request = new ServerRequest('controller_posts/index'); $response = $this->getMockBuilder('Cake\Http\Response') ->setMethods(['_sendHeader', 'stop']) ->getMock(); @@ -306,7 +306,7 @@ public function testInitializeContentTypeAndExtensionMismatch() $extensions = Router::extensions(); Router::extensions('xml', false); - $this->Controller->request = $this->getMockBuilder('Cake\Network\Request') + $this->Controller->request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['accepts']) ->getMock(); $this->Controller->request->expects($this->any()) @@ -487,7 +487,7 @@ public function testStartupCallback() $event = new Event('Controller.beforeRender', $this->Controller); $_SERVER['REQUEST_METHOD'] = 'PUT'; $_SERVER['CONTENT_TYPE'] = 'application/xml'; - $this->Controller->request = new Request(); + $this->Controller->request = new ServerRequest(); $this->RequestHandler->beforeRender($event); $this->assertTrue(is_array($this->Controller->request->data)); $this->assertFalse(is_object($this->Controller->request->data)); @@ -504,7 +504,7 @@ public function testStartupCallbackCharset() $event = new Event('Controller.startup', $this->Controller); $_SERVER['REQUEST_METHOD'] = 'PUT'; $_SERVER['CONTENT_TYPE'] = 'application/xml; charset=UTF-8'; - $this->Controller->request = new Request(); + $this->Controller->request = new ServerRequest(); $this->RequestHandler->startup($event); $this->assertTrue(is_array($this->Controller->request->data)); $this->assertFalse(is_object($this->Controller->request->data)); @@ -518,7 +518,7 @@ public function testStartupCallbackCharset() */ public function testStartupProcessData() { - $this->Controller->request = new Request(); + $this->Controller->request = new ServerRequest(); $this->Controller->request->env('REQUEST_METHOD', 'POST'); $this->Controller->request->env('CONTENT_TYPE', 'application/json'); @@ -543,7 +543,7 @@ public function testStartupProcessData() */ public function testStartupIgnoreFileAsXml() { - $this->Controller->request = new Request(['input' => '/dev/random']); + $this->Controller->request = new ServerRequest(['input' => '/dev/random']); $this->Controller->request->env('REQUEST_METHOD', 'POST'); $this->Controller->request->env('CONTENT_TYPE', 'application/xml'); @@ -561,7 +561,7 @@ public function testStartupIgnoreFileAsXml() public function testStartupCustomTypeProcess() { $restore = error_reporting(E_ALL & ~E_USER_DEPRECATED); - $this->Controller->request = new Request([ + $this->Controller->request = new ServerRequest([ 'input' => '"A","csv","string"' ]); $this->RequestHandler->addInputType('csv', ['str_getcsv']); @@ -650,7 +650,7 @@ public function testRenderAs() */ public function testRenderAsWithAttachment() { - $this->RequestHandler->request = $this->getMockBuilder('Cake\Network\Request') + $this->RequestHandler->request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['parseAccept']) ->getMock(); $this->RequestHandler->request->expects($this->any()) @@ -710,7 +710,7 @@ public function testRespondAsWithAttachment() $this->Controller->response = $this->getMockBuilder('Cake\Http\Response') ->setMethods(['type', 'download']) ->getMock(); - $this->Controller->request = $this->getMockBuilder('Cake\Network\Request') + $this->Controller->request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['parseAccept']) ->getMock(); @@ -821,7 +821,7 @@ public function testResponseContentType() */ public function testMobileDeviceDetection() { - $request = $this->getMockBuilder('Cake\Network\Request') + $request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['is']) ->getMock(); $request->expects($this->once())->method('is') @@ -914,7 +914,7 @@ public function testAjaxRedirectAsRequestAction() $event = new Event('Controller.beforeRedirect', $this->Controller); $this->RequestHandler = new RequestHandlerComponent($this->Controller->components()); - $this->Controller->request = $this->getMockBuilder('Cake\Network\Request') + $this->Controller->request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['is']) ->getMock(); $this->Controller->response = $this->getMockBuilder('Cake\Http\Response') @@ -944,7 +944,7 @@ public function testAjaxRedirectAsRequestActionWithQueryString() Router::connect('/:controller/:action'); $this->RequestHandler = new RequestHandlerComponent($this->Controller->components()); - $this->Controller->request = $this->getMockBuilder('Cake\Network\Request') + $this->Controller->request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['is']) ->getMock(); $this->Controller->response = $this->getMockBuilder('Cake\Http\Response') @@ -986,7 +986,7 @@ public function testAjaxRedirectAsRequestActionWithCookieData() $event = new Event('Controller.beforeRedirect', $this->Controller); $this->RequestHandler = new RequestHandlerComponent($this->Controller->components()); - $this->Controller->request = $this->getMockBuilder('Cake\Network\Request') + $this->Controller->request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['is']) ->getMock(); $this->Controller->response = $this->getMockBuilder('Cake\Http\Response') @@ -1021,7 +1021,7 @@ public function testAjaxRedirectAsRequestActionStatusCode() $event = new Event('Controller.beforeRedirect', $this->Controller); $this->RequestHandler = new RequestHandlerComponent($this->Controller->components()); - $this->Controller->request = $this->getMockBuilder('Cake\Network\Request') + $this->Controller->request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['is']) ->getMock(); $this->Controller->response = $this->getMockBuilder('Cake\Http\Response') @@ -1053,7 +1053,7 @@ public function testAjaxRedirectAsRequestActionStillRenderingLayout() $event = new Event('Controller.beforeRedirect', $this->Controller); $this->RequestHandler = new RequestHandlerComponent($this->Controller->components()); - $this->Controller->request = $this->getMockBuilder('Cake\Network\Request') + $this->Controller->request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['is']) ->getMock(); $this->Controller->response = $this->getMockBuilder('Cake\Http\Response') @@ -1091,7 +1091,7 @@ public function testBeforeRedirectCallbackWithArrayUrl() ]); $RequestHandler = new RequestHandlerComponent($this->Controller->components()); - $this->Controller->request = new Request('posts/index'); + $this->Controller->request = new ServerRequest('posts/index'); ob_start(); $RequestHandler->beforeRedirect( diff --git a/tests/TestCase/Controller/Component/SecurityComponentTest.php b/tests/TestCase/Controller/Component/SecurityComponentTest.php index 5952fba5134..1faf4d22f0f 100644 --- a/tests/TestCase/Controller/Component/SecurityComponentTest.php +++ b/tests/TestCase/Controller/Component/SecurityComponentTest.php @@ -19,7 +19,7 @@ use Cake\Controller\Exception\SecurityException; use Cake\Core\Configure; use Cake\Event\Event; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Network\Session; use Cake\TestSuite\TestCase; use Cake\Utility\Security; @@ -159,7 +159,7 @@ public function setUp() $this->server = $_SERVER; $session = new Session(); - $request = $this->getMockBuilder('Cake\Network\Request') + $request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['here']) ->setConstructorArgs(['posts/index']) ->getMock(); @@ -218,7 +218,7 @@ public function validatePost($expectedException = null, $expectedExceptionMessag */ public function testBlackholeWithBrokenCallback() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts/index', 'session' => $this->Security->session ]); @@ -1363,7 +1363,7 @@ public function testValidatePostUrlAsHashInput() ]; $this->assertTrue($this->validatePost()); - $request = $this->getMockBuilder('Cake\Network\Request') + $request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['here']) ->getMock(); $request->expects($this->at(0)) diff --git a/tests/TestCase/Controller/ComponentRegistryTest.php b/tests/TestCase/Controller/ComponentRegistryTest.php index 5062b5c98da..7bad141d071 100644 --- a/tests/TestCase/Controller/ComponentRegistryTest.php +++ b/tests/TestCase/Controller/ComponentRegistryTest.php @@ -20,7 +20,7 @@ use Cake\Controller\Controller; use Cake\Core\Plugin; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\TestSuite\TestCase; /** @@ -41,7 +41,7 @@ class ComponentRegistryTest extends TestCase public function setUp() { parent::setUp(); - $controller = new Controller(new Request(), new Response()); + $controller = new Controller(new ServerRequest(), new Response()); $this->Components = new ComponentRegistry($controller); } diff --git a/tests/TestCase/Controller/ControllerTest.php b/tests/TestCase/Controller/ControllerTest.php index be7e348c77a..0249d0e893f 100644 --- a/tests/TestCase/Controller/ControllerTest.php +++ b/tests/TestCase/Controller/ControllerTest.php @@ -20,7 +20,7 @@ use Cake\Core\Plugin; use Cake\Event\Event; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\ORM\TableRegistry; use Cake\Routing\Router; use Cake\TestSuite\TestCase; @@ -267,7 +267,7 @@ public function tearDown() */ public function testTableAutoload() { - $request = new Request('controller_posts/index'); + $request = new ServerRequest('controller_posts/index'); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $Controller = new Controller($request, $response); $Controller->modelClass = 'SiteArticles'; @@ -295,7 +295,7 @@ public function testTableAutoload() */ public function testLoadModel() { - $request = new Request('controller_posts/index'); + $request = new ServerRequest('controller_posts/index'); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $Controller = new Controller($request, $response); @@ -346,7 +346,7 @@ public function testConstructSetModelClass() { Plugin::load('TestPlugin'); - $request = new Request(); + $request = new ServerRequest(); $response = new Response(); $controller = new \TestApp\Controller\PostsController($request, $response); $this->assertEquals('Posts', $controller->modelClass); @@ -371,7 +371,7 @@ public function testConstructClassesWithComponents() { Plugin::load('TestPlugin'); - $Controller = new TestPluginController(new Request(), new Response()); + $Controller = new TestPluginController(new ServerRequest(), new Response()); $Controller->loadComponent('TestPlugin.Other'); $this->assertInstanceOf('TestPlugin\Controller\Component\OtherComponent', $Controller->Other); @@ -386,7 +386,7 @@ public function testRender() { Plugin::load('TestPlugin'); - $request = new Request('controller_posts/index'); + $request = new ServerRequest('controller_posts/index'); $request->params['action'] = 'index'; $Controller = new Controller($request, new Response()); @@ -410,7 +410,7 @@ public function testRender() */ public function testBeforeRenderCallbackChangingViewClass() { - $Controller = new Controller(new Request, new Response()); + $Controller = new Controller(new ServerRequest, new Response()); $Controller->eventManager()->on('Controller.beforeRender', function (Event $event) { $controller = $event->subject(); @@ -435,7 +435,7 @@ public function testBeforeRenderCallbackChangingViewClass() */ public function testBeforeRenderEventCancelsRender() { - $Controller = new Controller(new Request, new Response()); + $Controller = new Controller(new ServerRequest, new Response()); $Controller->eventManager()->on('Controller.beforeRender', function (Event $event) { return false; @@ -545,7 +545,7 @@ public function testRedirectBeforeRedirectListenerReturnResponse() */ public function testMergeVars() { - $request = new Request(); + $request = new ServerRequest(); $TestController = new TestController($request); $expected = [ @@ -574,7 +574,7 @@ public function testMergeVars() */ public function testReferer() { - $request = $this->getMockBuilder('Cake\Network\Request') + $request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['referer']) ->getMock(); $request->expects($this->any())->method('referer') @@ -585,7 +585,7 @@ public function testReferer() $result = $Controller->referer(null, true); $this->assertEquals('/posts/index', $result); - $request = $this->getMockBuilder('Cake\Network\Request') + $request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['referer']) ->getMock(); $request->expects($this->any())->method('referer') @@ -595,7 +595,7 @@ public function testReferer() $result = $Controller->referer(['controller' => 'posts', 'action' => 'index'], true); $this->assertEquals('/posts/index', $result); - $request = $this->getMockBuilder('Cake\Network\Request') + $request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['referer']) ->getMock(); @@ -621,7 +621,7 @@ public function testReferer() */ public function testRefererSlash() { - $request = $this->getMockBuilder('Cake\Network\Request') + $request = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['referer']) ->getMock(); $request->base = '/base'; @@ -646,7 +646,7 @@ public function testRefererSlash() */ public function testSetAction() { - $request = new Request('controller_posts/index'); + $request = new ServerRequest('controller_posts/index'); $TestController = new TestController($request); $TestController->setAction('view', 1, 2); @@ -718,7 +718,7 @@ public function testShutdownProcess() */ public function testPaginate() { - $request = new Request('controller_posts/index'); + $request = new ServerRequest('controller_posts/index'); $request->params['pass'] = []; $response = $this->getMockBuilder('Cake\Http\Response') ->setMethods(['httpCodes']) @@ -770,7 +770,7 @@ public function testPaginate() */ public function testPaginateUsesModelClass() { - $request = new Request('controller_posts/index'); + $request = new ServerRequest('controller_posts/index'); $request->params['pass'] = []; $response = $this->getMockBuilder('Cake\Http\Response') ->setMethods(['httpCodes']) @@ -793,7 +793,7 @@ public function testPaginateUsesModelClass() */ public function testInvokeActionMissingAction() { - $url = new Request('test/missing'); + $url = new ServerRequest('test/missing'); $url->addParams(['controller' => 'Test', 'action' => 'missing']); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); @@ -810,7 +810,7 @@ public function testInvokeActionMissingAction() */ public function testInvokeActionPrivate() { - $url = new Request('test/private_m/'); + $url = new ServerRequest('test/private_m/'); $url->addParams(['controller' => 'Test', 'action' => 'private_m']); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); @@ -827,7 +827,7 @@ public function testInvokeActionPrivate() */ public function testInvokeActionProtected() { - $url = new Request('test/protected_m/'); + $url = new ServerRequest('test/protected_m/'); $url->addParams(['controller' => 'Test', 'action' => 'protected_m']); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); @@ -844,7 +844,7 @@ public function testInvokeActionProtected() */ public function testInvokeActionBaseMethods() { - $url = new Request('test/redirect/'); + $url = new ServerRequest('test/redirect/'); $url->addParams(['controller' => 'Test', 'action' => 'redirect']); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); @@ -859,7 +859,7 @@ public function testInvokeActionBaseMethods() */ public function testInvokeActionReturnValue() { - $url = new Request('test/returner/'); + $url = new ServerRequest('test/returner/'); $url->addParams([ 'controller' => 'Test', 'action' => 'returner', @@ -879,7 +879,7 @@ public function testInvokeActionReturnValue() */ public function testInvokeActionWithPassedParams() { - $url = new Request('test/index/1/2'); + $url = new ServerRequest('test/index/1/2'); $url->addParams([ 'controller' => 'Test', 'action' => 'index', @@ -902,7 +902,7 @@ public function testInvokeActionWithPassedParams() */ public function testViewPathConventions() { - $request = new Request('admin/posts'); + $request = new ServerRequest('admin/posts'); $request->addParams([ 'prefix' => 'admin' ]); @@ -925,7 +925,7 @@ public function testViewPathConventions() $Controller->render(); $this->assertEquals('Admin' . DS . 'Super' . DS . 'Posts', $Controller->viewBuilder()->templatePath()); - $request = new Request('pages/home'); + $request = new ServerRequest('pages/home'); $request->addParams([ 'prefix' => false ]); @@ -944,7 +944,7 @@ public function testViewPathConventions() */ public function testComponents() { - $request = new Request('/'); + $request = new ServerRequest('/'); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $controller = new TestController($request, $response); @@ -961,7 +961,7 @@ public function testComponents() */ public function testComponentsWithCustomRegistry() { - $request = new Request('/'); + $request = new ServerRequest('/'); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $componentRegistry = $this->getMockBuilder('Cake\Controller\ComponentRegistry') ->setMethods(['offsetGet']) @@ -981,7 +981,7 @@ public function testComponentsWithCustomRegistry() */ public function testLoadComponent() { - $request = new Request('/'); + $request = new ServerRequest('/'); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $controller = new TestController($request, $response); @@ -1000,7 +1000,7 @@ public function testLoadComponent() */ public function testLoadComponentDuplicate() { - $request = new Request('/'); + $request = new ServerRequest('/'); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $controller = new TestController($request, $response); @@ -1021,7 +1021,7 @@ public function testLoadComponentDuplicate() */ public function testIsAction() { - $request = new Request('/'); + $request = new ServerRequest('/'); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $controller = new TestController($request, $response); @@ -1037,7 +1037,7 @@ public function testIsAction() */ public function testDeclaredDeprecatedProperty() { - $controller = new TestController(new Request(), new Response()); + $controller = new TestController(new ServerRequest(), new Response()); $theme = $controller->theme; // @codingStandardsIgnoreStart diff --git a/tests/TestCase/Error/ErrorHandlerTest.php b/tests/TestCase/Error/ErrorHandlerTest.php index 2a6a939c91b..f81bceacbbc 100644 --- a/tests/TestCase/Error/ErrorHandlerTest.php +++ b/tests/TestCase/Error/ErrorHandlerTest.php @@ -19,10 +19,10 @@ use Cake\Error; use Cake\Error\ErrorHandler; use Cake\Error\PHP7ErrorException; +use Cake\Http\ServerRequest; use Cake\Log\Log; use Cake\Network\Exception\ForbiddenException; use Cake\Network\Exception\NotFoundException; -use Cake\Network\Request; use Cake\Routing\Exception\MissingControllerException; use Cake\Routing\Router; use Cake\TestSuite\TestCase; @@ -80,7 +80,7 @@ public function setUp() parent::setUp(); Router::reload(); - $request = new Request(); + $request = new ServerRequest(); $request->base = ''; $request->env('HTTP_REFERER', '/referer'); diff --git a/tests/TestCase/Error/ExceptionRendererTest.php b/tests/TestCase/Error/ExceptionRendererTest.php index 3ec382f55dc..37e9dcb2bd8 100644 --- a/tests/TestCase/Error/ExceptionRendererTest.php +++ b/tests/TestCase/Error/ExceptionRendererTest.php @@ -27,12 +27,12 @@ use Cake\Error\ExceptionRenderer; use Cake\Event\Event; use Cake\Event\EventManager; +use Cake\Http\ServerRequest; use Cake\Mailer\Exception\MissingActionException as MissingMailerActionException; use Cake\Network\Exception\InternalErrorException; use Cake\Network\Exception\MethodNotAllowedException; use Cake\Network\Exception\NotFoundException; use Cake\Network\Exception\SocketException; -use Cake\Network\Request; use Cake\ORM\Exception\MissingBehaviorException; use Cake\Routing\DispatcherFactory; use Cake\Routing\Exception\MissingControllerException; @@ -165,7 +165,7 @@ public function setUp() Configure::write('Config.language', 'eng'); Router::reload(); - $request = new Request(); + $request = new ServerRequest(); $request->base = ''; Router::setRequestInfo($request); Configure::write('debug', true); @@ -399,7 +399,7 @@ public function testError400() { Router::reload(); - $request = new Request('posts/view/1000'); + $request = new ServerRequest('posts/view/1000'); Router::setRequestInfo($request); $exception = new NotFoundException('Custom message'); @@ -424,7 +424,7 @@ public function testError400AsJson() { Router::reload(); - $request = new Request('posts/view/1000?sort=title&direction=desc'); + $request = new ServerRequest('posts/view/1000?sort=title&direction=desc'); $request = $request->withHeader('Accept', 'application/json'); $request = $request->withHeader('Content-Type', 'application/json'); Router::setRequestInfo($request); @@ -480,7 +480,7 @@ public function testError400NoInjection() { Router::reload(); - $request = new Request('pages/pink'); + $request = new ServerRequest('pages/pink'); Router::setRequestInfo($request); $exception = new NotFoundException('Custom message'); @@ -714,7 +714,7 @@ public function testMissingRenderSafe() ->setMethods(['render']) ->getMock(); $ExceptionRenderer->controller->helpers = ['Fail', 'Boom']; - $ExceptionRenderer->controller->request = new Request; + $ExceptionRenderer->controller->request = new ServerRequest; $ExceptionRenderer->controller->expects($this->at(0)) ->method('render') ->with('missingHelper') @@ -744,7 +744,7 @@ public function testRenderExceptionInBeforeRender() $ExceptionRenderer->controller = $this->getMockBuilder('Cake\Controller\Controller') ->setMethods(['beforeRender']) ->getMock(); - $ExceptionRenderer->controller->request = new Request; + $ExceptionRenderer->controller->request = new ServerRequest; $ExceptionRenderer->controller->expects($this->any()) ->method('beforeRender') ->will($this->throwException($exception)); @@ -778,7 +778,7 @@ function (Event $event) { $event->subject()->viewBuilder()->setLayoutPath('boom'); } ); - $ExceptionRenderer->controller->request = new Request; + $ExceptionRenderer->controller->request = new ServerRequest; $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $response->expects($this->once()) @@ -810,7 +810,7 @@ public function testMissingPluginRenderSafe() ->setMethods(['render']) ->getMock(); $ExceptionRenderer->controller->plugin = 'TestPlugin'; - $ExceptionRenderer->controller->request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $ExceptionRenderer->controller->request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $exception = new MissingPluginException(['plugin' => 'TestPlugin']); $ExceptionRenderer->controller->expects($this->once()) @@ -845,7 +845,7 @@ public function testMissingPluginRenderSafeWithPlugin() ->setMethods(['render']) ->getMock(); $ExceptionRenderer->controller->plugin = 'TestPlugin'; - $ExceptionRenderer->controller->request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $ExceptionRenderer->controller->request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $exception = new MissingPluginException(['plugin' => 'TestPluginTwo']); $ExceptionRenderer->controller->expects($this->once()) diff --git a/tests/TestCase/Http/ActionDispatcherTest.php b/tests/TestCase/Http/ActionDispatcherTest.php index db40aaa0ba3..e91c846eb40 100644 --- a/tests/TestCase/Http/ActionDispatcherTest.php +++ b/tests/TestCase/Http/ActionDispatcherTest.php @@ -18,7 +18,7 @@ use Cake\Event\Event; use Cake\Http\ActionDispatcher; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Network\Session; use Cake\Routing\DispatcherFactory; use Cake\Routing\Filter\ControllerFactoryFilter; @@ -123,7 +123,7 @@ public function testBeforeDispatchEventAbort() ->method('beforeDispatch') ->will($this->returnValue($response)); - $req = new Request(); + $req = new ServerRequest(); $res = new Response(); $dispatcher->addFilter($filter); $result = $dispatcher->dispatch($req, $res); @@ -146,7 +146,7 @@ public function testDispatchAfterDispatchEventModifyResponse() $event->data('response')->body('Filter body'); })); - $req = new Request([ + $req = new ServerRequest([ 'url' => '/cakes', 'params' => [ 'plugin' => null, @@ -176,7 +176,7 @@ public function testDispatchActionReturnResponseNoAfterDispatch() $filter->expects($this->never()) ->method('afterDispatch'); - $req = new Request([ + $req = new ServerRequest([ 'url' => '/cakes', 'params' => [ 'plugin' => null, @@ -200,7 +200,7 @@ public function testDispatchActionReturnResponseNoAfterDispatch() public function testDispatchSetsRequestContext() { $this->assertNull(Router::getRequest()); - $req = new Request([ + $req = new ServerRequest([ 'url' => '/cakes', 'params' => [ 'plugin' => null, @@ -224,7 +224,7 @@ public function testDispatchSetsRequestContext() */ public function testDispatchInvalidResponse() { - $req = new Request([ + $req = new ServerRequest([ 'url' => '/cakes', 'params' => [ 'plugin' => null, @@ -244,7 +244,7 @@ public function testDispatchInvalidResponse() */ public function testDispatchAutoRender() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts', 'params' => [ 'controller' => 'Posts', @@ -265,7 +265,7 @@ public function testDispatchAutoRender() */ public function testDispatchAutoRenderFalse() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'posts', 'params' => [ 'controller' => 'Cakes', @@ -288,7 +288,7 @@ public function testDispatchAutoRenderFalse() */ public function testMissingController() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'some_controller/home', 'params' => [ 'controller' => 'SomeController', @@ -308,7 +308,7 @@ public function testMissingController() */ public function testMissingControllerInterface() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'interface/index', 'params' => [ 'controller' => 'Interface', @@ -328,7 +328,7 @@ public function testMissingControllerInterface() */ public function testMissingControllerAbstract() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'abstract/index', 'params' => [ 'controller' => 'Abstract', @@ -351,7 +351,7 @@ public function testMissingControllerAbstract() */ public function testMissingControllerLowercase() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'pages/home', 'params' => [ 'plugin' => null, @@ -371,7 +371,7 @@ public function testMissingControllerLowercase() */ public function testStartupProcessAbort() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'cakes/index', 'params' => [ 'plugin' => null, @@ -393,7 +393,7 @@ public function testStartupProcessAbort() */ public function testShutdownProcessResponse() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'cakes/index', 'params' => [ 'plugin' => null, diff --git a/tests/TestCase/Http/ControllerFactoryTest.php b/tests/TestCase/Http/ControllerFactoryTest.php index c87f6a60252..f8bfb5316c2 100644 --- a/tests/TestCase/Http/ControllerFactoryTest.php +++ b/tests/TestCase/Http/ControllerFactoryTest.php @@ -17,7 +17,7 @@ use Cake\Core\Configure; use Cake\Http\ControllerFactory; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\TestSuite\TestCase; /** @@ -45,7 +45,7 @@ public function setUp() */ public function testApplicationController() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'cakes/index', 'params' => [ 'controller' => 'Cakes', @@ -65,7 +65,7 @@ public function testApplicationController() */ public function testPrefixedAppController() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'admin/posts/index', 'params' => [ 'prefix' => 'admin', @@ -89,7 +89,7 @@ public function testPrefixedAppController() */ public function testNestedPrefixedAppController() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'admin/sub/posts/index', 'params' => [ 'prefix' => 'admin/sub', @@ -113,7 +113,7 @@ public function testNestedPrefixedAppController() */ public function testPluginController() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'test_plugin/test_plugin/index', 'params' => [ 'plugin' => 'TestPlugin', @@ -137,7 +137,7 @@ public function testPluginController() */ public function testVendorPluginController() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'test_plugin_three/ovens/index', 'params' => [ 'plugin' => 'Company/TestPluginThree', @@ -161,7 +161,7 @@ public function testVendorPluginController() */ public function testPrefixedPluginController() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'test_plugin/admin/comments', 'params' => [ 'prefix' => 'admin', @@ -186,7 +186,7 @@ public function testPrefixedPluginController() */ public function testAbstractClassFailure() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'abstract/index', 'params' => [ 'controller' => 'Abstract', @@ -203,7 +203,7 @@ public function testAbstractClassFailure() */ public function testInterfaceFailure() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'interface/index', 'params' => [ 'controller' => 'Interface', @@ -220,7 +220,7 @@ public function testInterfaceFailure() */ public function testMissingClassFailure() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'interface/index', 'params' => [ 'controller' => 'Invisible', @@ -237,7 +237,7 @@ public function testMissingClassFailure() */ public function testSlashedControllerFailure() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'admin/posts/index', 'params' => [ 'controller' => 'Admin/Posts', @@ -254,7 +254,7 @@ public function testSlashedControllerFailure() */ public function testAbsoluteReferenceFailure() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'interface/index', 'params' => [ 'controller' => 'TestApp\Controller\CakesController', diff --git a/tests/TestCase/Http/RequestTransformerTest.php b/tests/TestCase/Http/RequestTransformerTest.php index 2e1a4313e1b..4054076ae1e 100644 --- a/tests/TestCase/Http/RequestTransformerTest.php +++ b/tests/TestCase/Http/RequestTransformerTest.php @@ -17,7 +17,6 @@ use Cake\Core\Configure; use Cake\Http\RequestTransformer; use Cake\Http\ServerRequestFactory; -use Cake\Network\Request; use Cake\Network\Session; use Cake\TestSuite\TestCase; use Zend\Diactoros\Stream; diff --git a/tests/TestCase/Http/ResponseTest.php b/tests/TestCase/Http/ResponseTest.php index 66dd7139b95..e9bc0ed1643 100644 --- a/tests/TestCase/Http/ResponseTest.php +++ b/tests/TestCase/Http/ResponseTest.php @@ -17,8 +17,8 @@ include_once CORE_TEST_CASES . DS . 'Http' . DS . 'server_mocks.php'; use Cake\Http\Response; +use Cake\Http\ServerRequest; use Cake\Network\Exception\NotFoundException; -use Cake\Network\Request; use Cake\TestSuite\TestCase; use Zend\Diactoros\Stream; @@ -1208,7 +1208,7 @@ public function testCheckNotModifiedByEtagStar() ->getMock(); $response->etag('something'); $response->expects($this->once())->method('notModified'); - $response->checkNotModified(new Request); + $response->checkNotModified(new ServerRequest); } /** @@ -1224,7 +1224,7 @@ public function testCheckNotModifiedByEtagExact() ->getMock(); $response->etag('something', true); $response->expects($this->once())->method('notModified'); - $this->assertTrue($response->checkNotModified(new Request)); + $this->assertTrue($response->checkNotModified(new ServerRequest)); } /** @@ -1242,7 +1242,7 @@ public function testCheckNotModifiedByEtagAndTime() $response->etag('something', true); $response->modified('2012-01-01 00:00:00'); $response->expects($this->once())->method('notModified'); - $this->assertTrue($response->checkNotModified(new Request)); + $this->assertTrue($response->checkNotModified(new ServerRequest)); } /** @@ -1260,7 +1260,7 @@ public function testCheckNotModifiedByEtagAndTimeMismatch() $response->etag('something', true); $response->modified('2012-01-01 00:00:01'); $response->expects($this->never())->method('notModified'); - $this->assertFalse($response->checkNotModified(new Request)); + $this->assertFalse($response->checkNotModified(new ServerRequest)); } /** @@ -1278,7 +1278,7 @@ public function testCheckNotModifiedByEtagMismatch() $response->etag('something', true); $response->modified('2012-01-01 00:00:00'); $response->expects($this->never())->method('notModified'); - $this->assertFalse($response->checkNotModified(new Request)); + $this->assertFalse($response->checkNotModified(new ServerRequest)); } /** @@ -1294,7 +1294,7 @@ public function testCheckNotModifiedByTime() ->getMock(); $response->modified('2012-01-01 00:00:00'); $response->expects($this->once())->method('notModified'); - $this->assertTrue($response->checkNotModified(new Request)); + $this->assertTrue($response->checkNotModified(new ServerRequest)); } /** @@ -1310,7 +1310,7 @@ public function testCheckNotModifiedNoHints() ->setMethods(['notModified']) ->getMock(); $response->expects($this->never())->method('notModified'); - $this->assertFalse($response->checkNotModified(new Request)); + $this->assertFalse($response->checkNotModified(new ServerRequest)); } /** @@ -1555,10 +1555,10 @@ public function testCors($request, $origin, $domains, $methods, $headers, $expec */ public function corsData() { - $fooRequest = new Request(); + $fooRequest = new ServerRequest(); $secureRequest = function () { - $secureRequest = $this->getMockBuilder('Cake\Network\Request') + $secureRequest = $this->getMockBuilder('Cake\Http\ServerRequest') ->setMethods(['is']) ->getMock(); $secureRequest->expects($this->any()) diff --git a/tests/TestCase/Http/ServerRequestTest.php b/tests/TestCase/Http/ServerRequestTest.php index 7bc311d5155..4a771db6ffc 100644 --- a/tests/TestCase/Http/ServerRequestTest.php +++ b/tests/TestCase/Http/ServerRequestTest.php @@ -2701,7 +2701,7 @@ public function testParamWriting() 'action' => 'index', ]); - $this->assertInstanceOf('Cake\Network\Request', $request->param('some', 'thing'), 'Method has not returned $this'); + $this->assertInstanceOf('Cake\Http\ServerRequest', $request->param('some', 'thing'), 'Method has not returned $this'); $request->param('Post.null', null); $this->assertNull($request->params['Post']['null']); diff --git a/tests/TestCase/Network/MoveToHttpTest.php b/tests/TestCase/Network/MoveToHttpTest.php index dbd04166ec0..afcf8d3b2f0 100644 --- a/tests/TestCase/Network/MoveToHttpTest.php +++ b/tests/TestCase/Network/MoveToHttpTest.php @@ -40,12 +40,12 @@ public function testResponse() $this->assertInstanceOf('Cake\Http\Response', $response); $this->assertInstanceOf('Cake\Network\Response', $response); } + /** * Tests the Cake\Http\ServerRequest loaded from Cake\Network\Request correctly * * @return void */ - public function testRequest() { $request = new NetworkRequest(); diff --git a/tests/TestCase/Routing/DispatcherFactoryTest.php b/tests/TestCase/Routing/DispatcherFactoryTest.php index 41d6603d6ef..58929803ccc 100644 --- a/tests/TestCase/Routing/DispatcherFactoryTest.php +++ b/tests/TestCase/Routing/DispatcherFactoryTest.php @@ -15,7 +15,7 @@ namespace Cake\Test\TestCase\Routing; use Cake\Core\Configure; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\DispatcherFactory; use Cake\TestSuite\TestCase; @@ -110,7 +110,7 @@ public function testCreate() */ public function testCreateDispatchWithFilters() { - $url = new Request([ + $url = new ServerRequest([ 'url' => 'posts', 'params' => [ 'controller' => 'Posts', diff --git a/tests/TestCase/Routing/DispatcherFilterTest.php b/tests/TestCase/Routing/DispatcherFilterTest.php index aed3fd21e47..43f71b3d7a7 100644 --- a/tests/TestCase/Routing/DispatcherFilterTest.php +++ b/tests/TestCase/Routing/DispatcherFilterTest.php @@ -16,7 +16,7 @@ use Cake\Event\Event; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\DispatcherFilter; use Cake\TestSuite\TestCase; @@ -87,21 +87,21 @@ public function testConstructorInvalidWhen() */ public function testMatchesWithFor() { - $request = new Request(['url' => '/articles/view']); + $request = new ServerRequest(['url' => '/articles/view']); $event = new Event('Dispatcher.beforeDispatch', $this, compact('request')); $filter = new DispatcherFilter(['for' => '/articles']); $this->assertTrue($filter->matches($event)); - $request = new Request(['url' => '/blog/articles']); + $request = new ServerRequest(['url' => '/blog/articles']); $event = new Event('Dispatcher.beforeDispatch', $this, compact('request')); $this->assertFalse($filter->matches($event), 'Does not start with /articles'); - $request = new Request(['url' => '/articles/edit/1']); + $request = new ServerRequest(['url' => '/articles/edit/1']); $event = new Event('Dispatcher.beforeDispatch', $this, compact('request')); $filter = new DispatcherFilter(['for' => 'preg:#^/articles/edit/\d+$#']); $this->assertTrue($filter->matches($event)); - $request = new Request(['url' => '/blog/articles/edit/1']); + $request = new ServerRequest(['url' => '/blog/articles/edit/1']); $event = new Event('Dispatcher.beforeDispatch', $this, compact('request')); $this->assertFalse($filter->matches($event), 'Does not start with /articles'); } @@ -115,13 +115,13 @@ public function testMatchesWithFor() public function testMatchesWithWhen() { $matcher = function ($request, $response) { - $this->assertInstanceOf('Cake\Network\Request', $request); + $this->assertInstanceOf('Cake\Http\ServerRequest', $request); $this->assertInstanceOf('Cake\Http\Response', $response); return true; }; - $request = new Request(['url' => '/articles/view']); + $request = new ServerRequest(['url' => '/articles/view']); $response = new Response(); $event = new Event('Dispatcher.beforeDispatch', $this, compact('response', 'request')); $filter = new DispatcherFilter(['when' => $matcher]); @@ -142,7 +142,7 @@ public function testMatchesWithWhen() */ public function testMatchesWithForAndWhen() { - $request = new Request(['url' => '/articles/view']); + $request = new ServerRequest(['url' => '/articles/view']); $response = new Response(); $matcher = function () { @@ -174,7 +174,7 @@ public function testMatchesWithForAndWhen() */ public function testImplementedEventsMethodName() { - $request = new Request(['url' => '/articles/view']); + $request = new ServerRequest(['url' => '/articles/view']); $response = new Response(); $beforeEvent = new Event('Dispatcher.beforeDispatch', $this, compact('response', 'request')); @@ -202,7 +202,7 @@ public function testImplementedEventsMethodName() */ public function testHandleAppliesFor() { - $request = new Request(['url' => '/articles/view']); + $request = new ServerRequest(['url' => '/articles/view']); $response = new Response(); $event = new Event('Dispatcher.beforeDispatch', $this, compact('response', 'request')); @@ -225,7 +225,7 @@ public function testHandleAppliesFor() */ public function testHandleAppliesWhen() { - $request = new Request(['url' => '/articles/view']); + $request = new ServerRequest(['url' => '/articles/view']); $response = new Response(); $event = new Event('Dispatcher.beforeDispatch', $this, compact('response', 'request')); diff --git a/tests/TestCase/Routing/DispatcherTest.php b/tests/TestCase/Routing/DispatcherTest.php index 793c36243fb..b4b36fe7118 100644 --- a/tests/TestCase/Routing/DispatcherTest.php +++ b/tests/TestCase/Routing/DispatcherTest.php @@ -17,7 +17,7 @@ use Cake\Core\Configure; use Cake\Core\Plugin; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Network\Session; use Cake\Routing\Dispatcher; use Cake\Routing\Filter\ControllerFactoryFilter; @@ -69,7 +69,7 @@ public function tearDown() */ public function testMissingController() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'some_controller/home', 'params' => [ 'controller' => 'SomeController', @@ -89,14 +89,14 @@ public function testMissingController() */ public function testMissingControllerInterface() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'interface/index', 'params' => [ 'controller' => 'Interface', 'action' => 'index', ] ]); - $url = new Request('dispatcher_test_interface/index'); + $url = new ServerRequest('dispatcher_test_interface/index'); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $this->dispatcher->dispatch($request, $response, ['return' => 1]); } @@ -110,7 +110,7 @@ public function testMissingControllerInterface() */ public function testMissingControllerAbstract() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'abstract/index', 'params' => [ 'controller' => 'Abstract', @@ -133,7 +133,7 @@ public function testMissingControllerAbstract() */ public function testMissingControllerLowercase() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'pages/home', 'params' => [ 'controller' => 'somepages', @@ -152,7 +152,7 @@ public function testMissingControllerLowercase() */ public function testDispatchBasic() { - $url = new Request([ + $url = new ServerRequest([ 'url' => 'pages/home', 'params' => [ 'controller' => 'Pages', @@ -175,7 +175,7 @@ public function testDispatchBasic() */ public function testDispatchActionReturnsResponse() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'some_pages/responseGenerator', 'params' => [ 'controller' => 'SomePages', @@ -205,7 +205,7 @@ public function testDispatchBadPluginName() { Plugin::load('TestPlugin'); - $request = new Request([ + $request = new ServerRequest([ 'url' => 'TestPlugin.Tests/index', 'params' => [ 'plugin' => '', @@ -228,7 +228,7 @@ public function testDispatchBadPluginName() */ public function testDispatchBadName() { - $request = new Request([ + $request = new ServerRequest([ 'url' => 'TestApp%5CController%5CPostsController/index', 'params' => [ 'plugin' => '', @@ -259,7 +259,7 @@ public function testDispatcherFilter() ->method('afterDispatch'); $this->dispatcher->addFilter($filter); - $request = new Request([ + $request = new ServerRequest([ 'url' => '/', 'params' => [ 'controller' => 'Pages', @@ -297,7 +297,7 @@ public function testBeforeDispatchAbortDispatch() $filter->expects($this->never()) ->method('afterDispatch'); - $request = new Request([ + $request = new ServerRequest([ 'url' => '/', 'params' => [ 'controller' => 'Pages', @@ -332,7 +332,7 @@ public function testAfterDispatchReplaceResponse() ->method('afterDispatch') ->will($this->returnValue($response)); - $request = new Request([ + $request = new ServerRequest([ 'url' => '/posts', 'params' => [ 'plugin' => null, diff --git a/tests/TestCase/Routing/Filter/AssetFilterTest.php b/tests/TestCase/Routing/Filter/AssetFilterTest.php index b41e3aa443b..38d111a4711 100644 --- a/tests/TestCase/Routing/Filter/AssetFilterTest.php +++ b/tests/TestCase/Routing/Filter/AssetFilterTest.php @@ -15,7 +15,7 @@ use Cake\Core\Plugin; use Cake\Event\Event; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\Filter\AssetFilter; use Cake\TestSuite\TestCase; @@ -64,7 +64,7 @@ public function testNotModified() $response = $this->getMockBuilder('Cake\Http\Response') ->setMethods(['send', 'checkNotModified']) ->getMock(); - $request = new Request('test_theme/img/cake.power.gif'); + $request = new ServerRequest('test_theme/img/cake.power.gif'); $response->expects($this->once())->method('checkNotModified') ->with($request) @@ -80,7 +80,7 @@ public function testNotModified() $response = $this->getMockBuilder('Cake\Http\Response') ->setMethods(['_sendHeader', 'checkNotModified', 'send']) ->getMock(); - $request = new Request('test_theme/img/cake.power.gif'); + $request = new ServerRequest('test_theme/img/cake.power.gif'); $response->expects($this->once())->method('checkNotModified') ->with($request) @@ -105,7 +105,7 @@ public function test404OnDoubleSlash() $response = $this->getMockBuilder('Cake\Http\Response') ->setMethods(['_sendHeader']) ->getMock(); - $request = new Request('//index.php'); + $request = new ServerRequest('//index.php'); $event = new Event('Dispatcher.beforeRequest', $this, compact('request', 'response')); $this->assertNull($filter->beforeDispatch($event)); @@ -126,13 +126,13 @@ public function test404OnDoubleDot() $response = $this->getMockBuilder('Cake\Http\Response') ->setMethods(['_sendHeader']) ->getMock(); - $request = new Request('test_theme/../webroot/css/test_asset.css'); + $request = new ServerRequest('test_theme/../webroot/css/test_asset.css'); $event = new Event('Dispatcher.beforeRequest', $this, compact('request', 'response')); $this->assertNull($filter->beforeDispatch($event)); $this->assertFalse($event->isStopped()); - $request = new Request('test_theme/%3e./webroot/css/test_asset.css'); + $request = new ServerRequest('test_theme/%3e./webroot/css/test_asset.css'); $event = new Event('Dispatcher.beforeRequest', $this, compact('request', 'response')); $this->assertNull($filter->beforeDispatch($event)); @@ -242,7 +242,7 @@ public function testAsset($url, $file) $response = $this->getMockBuilder('Cake\Http\Response') ->setMethods(['_sendHeader']) ->getMock(); - $request = new Request($url); + $request = new ServerRequest($url); $event = new Event('Dispatcher.beforeDispatch', $this, compact('request', 'response')); $response = $filter->beforeDispatch($event); diff --git a/tests/TestCase/Routing/Filter/ControllerFactoryFilterTest.php b/tests/TestCase/Routing/Filter/ControllerFactoryFilterTest.php index 7ba0bbacab3..c7b9643a3e8 100644 --- a/tests/TestCase/Routing/Filter/ControllerFactoryFilterTest.php +++ b/tests/TestCase/Routing/Filter/ControllerFactoryFilterTest.php @@ -17,7 +17,7 @@ use Cake\Core\Configure; use Cake\Event\Event; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\Filter\ControllerFactoryFilter; use Cake\TestSuite\TestCase; @@ -38,7 +38,7 @@ public function testBeforeDispatch() $filter = new ControllerFactoryFilter(); - $request = new Request(); + $request = new ServerRequest(); $response = new Response(); $request->addParams(['prefix' => 'admin', 'controller' => 'Posts', 'action' => 'index']); $event = new Event(__CLASS__, $this, compact('request', 'response')); diff --git a/tests/TestCase/Routing/Filter/LocaleSelectorFilterTest.php b/tests/TestCase/Routing/Filter/LocaleSelectorFilterTest.php index 8c3c22c62e5..133a8bb0a1e 100644 --- a/tests/TestCase/Routing/Filter/LocaleSelectorFilterTest.php +++ b/tests/TestCase/Routing/Filter/LocaleSelectorFilterTest.php @@ -15,8 +15,8 @@ namespace Cake\Test\TestCase\Routing\Filter; use Cake\Event\Event; +use Cake\Http\ServerRequest; use Cake\I18n\I18n; -use Cake\Network\Request; use Cake\Routing\Filter\LocaleSelectorFilter; use Cake\TestSuite\TestCase; use Locale; @@ -60,19 +60,19 @@ public function tearDown() public function testSimpleSelection() { $filter = new LocaleSelectorFilter(); - $request = new Request([ + $request = new ServerRequest([ 'environment' => ['HTTP_ACCEPT_LANGUAGE' => 'en-GB,en;q=0.8,es;q=0.6,da;q=0.4'] ]); $filter->beforeDispatch(new Event('name', null, ['request' => $request])); $this->assertEquals('en_GB', I18n::locale()); - $request = new Request([ + $request = new ServerRequest([ 'environment' => ['HTTP_ACCEPT_LANGUAGE' => 'es_VE,en;q=0.8,es;q=0.6,da;q=0.4'] ]); $filter->beforeDispatch(new Event('name', null, ['request' => $request])); $this->assertEquals('es_VE', I18n::locale()); - $request = new Request([ + $request = new ServerRequest([ 'environment' => ['HTTP_ACCEPT_LANGUAGE' => 'en;q=0.4,es;q=0.6,da;q=0.8'] ]); $filter->beforeDispatch(new Event('name', null, ['request' => $request])); @@ -92,7 +92,7 @@ public function testWithWhitelist() $filter = new LocaleSelectorFilter([ 'locales' => ['en_CA', 'en_IN', 'es_VE'] ]); - $request = new Request([ + $request = new ServerRequest([ 'environment' => [ 'HTTP_ACCEPT_LANGUAGE' => 'en-GB;q=0.8,es-VE;q=0.9,da-DK;q=0.4' ] @@ -101,7 +101,7 @@ public function testWithWhitelist() $this->assertEquals('es_VE', I18n::locale()); Locale::setDefault('en_US'); - $request = new Request([ + $request = new ServerRequest([ 'environment' => [ 'HTTP_ACCEPT_LANGUAGE' => 'en-GB;q=0.8,es-ES;q=0.9,da-DK;q=0.4' ] diff --git a/tests/TestCase/Routing/Filter/RoutingFilterTest.php b/tests/TestCase/Routing/Filter/RoutingFilterTest.php index 5c9586952cc..04d0d66ff9c 100644 --- a/tests/TestCase/Routing/Filter/RoutingFilterTest.php +++ b/tests/TestCase/Routing/Filter/RoutingFilterTest.php @@ -16,7 +16,7 @@ use Cake\Event\Event; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\Filter\RoutingFilter; use Cake\Routing\Router; use Cake\TestSuite\TestCase; @@ -37,7 +37,7 @@ public function testBeforeDispatchSkipWhenControllerSet() { $filter = new RoutingFilter(); - $request = new Request("/testcontroller/testaction/params1/params2/params3"); + $request = new ServerRequest("/testcontroller/testaction/params1/params2/params3"); $request->addParams(['controller' => 'articles']); $event = new Event(__CLASS__, $this, compact('request')); $filter->beforeDispatch($event); @@ -57,7 +57,7 @@ public function testBeforeDispatchSetsParameters() Router::connect('/:controller/:action/*'); $filter = new RoutingFilter(); - $request = new Request("/testcontroller/testaction/params1/params2/params3"); + $request = new ServerRequest("/testcontroller/testaction/params1/params2/params3"); $event = new Event(__CLASS__, $this, compact('request')); $filter->beforeDispatch($event); @@ -83,7 +83,7 @@ public function testBeforeDispatchRedirectRoute() }); $filter = new RoutingFilter(); - $request = new Request("/home"); + $request = new ServerRequest("/home"); $response = new Response(); $event = new Event(__CLASS__, $this, compact('request', 'response')); $response = $filter->beforeDispatch($event); @@ -109,7 +109,7 @@ public function testQueryStringOnRoot() $_GET = ['coffee' => 'life', 'sleep' => 'sissies']; $filter = new RoutingFilter(); - $request = new Request('posts/home/?coffee=life&sleep=sissies'); + $request = new ServerRequest('posts/home/?coffee=life&sleep=sissies'); $event = new Event(__CLASS__, $this, compact('request')); $filter->beforeDispatch($event); @@ -119,7 +119,7 @@ public function testQueryStringOnRoot() $this->assertTrue(isset($request['url']['sleep'])); $this->assertTrue(isset($request['url']['coffee'])); - $request = new Request('/?coffee=life&sleep=sissy'); + $request = new ServerRequest('/?coffee=life&sleep=sissy'); $event = new Event(__CLASS__, $this, compact('request')); $filter->beforeDispatch($event); diff --git a/tests/TestCase/Routing/RequestActionTraitTest.php b/tests/TestCase/Routing/RequestActionTraitTest.php index efc331fdd2a..96331b7efa8 100644 --- a/tests/TestCase/Routing/RequestActionTraitTest.php +++ b/tests/TestCase/Routing/RequestActionTraitTest.php @@ -15,7 +15,7 @@ use Cake\Core\Configure; use Cake\Core\Plugin; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\DispatcherFactory; use Cake\Routing\Router; use Cake\TestSuite\TestCase; @@ -250,7 +250,7 @@ public function testRequestActionParamParseAndPass() */ public function testRequestActionBaseAndWebroot() { - $request = new Request([ + $request = new ServerRequest([ 'base' => '/subdir', 'webroot' => '/subdir/' ]); diff --git a/tests/TestCase/Routing/RouterTest.php b/tests/TestCase/Routing/RouterTest.php index fe57415f618..f9548acbaef 100644 --- a/tests/TestCase/Routing/RouterTest.php +++ b/tests/TestCase/Routing/RouterTest.php @@ -16,8 +16,8 @@ use Cake\Core\Configure; use Cake\Core\Plugin; +use Cake\Http\ServerRequest; use Cake\Http\ServerRequestFactory; -use Cake\Network\Request; use Cake\Routing\Router; use Cake\Routing\Route\Route; use Cake\TestSuite\TestCase; @@ -102,7 +102,7 @@ public function testBaseUrlWithBasePath() public function testCurrentUrlWithBasePath() { Router::fullBaseUrl('http://example.com'); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'action' => 'view', 'plugin' => null, @@ -487,7 +487,7 @@ public function testUrlNormalization() $result = Router::normalize('/recipe/recipes/add'); $this->assertEquals('/recipe/recipes/add', $result); - $request = new Request(); + $request = new ServerRequest(); $request->base = '/us'; Router::setRequestInfo($request); $result = Router::normalize('/us/users/logout/'); @@ -495,7 +495,7 @@ public function testUrlNormalization() Router::reload(); - $request = new Request(); + $request = new ServerRequest(); $request->base = '/cake_12'; Router::setRequestInfo($request); $result = Router::normalize('/cake_12/users/logout/'); @@ -505,7 +505,7 @@ public function testUrlNormalization() $_back = Configure::read('App.fullBaseUrl'); Configure::write('App.fullBaseUrl', '/'); - $request = new Request(); + $request = new ServerRequest(); $request->base = '/'; Router::setRequestInfo($request); $result = Router::normalize('users/login'); @@ -513,7 +513,7 @@ public function testUrlNormalization() Configure::write('App.fullBaseUrl', $_back); Router::reload(); - $request = new Request(); + $request = new ServerRequest(); $request->base = 'beer'; Router::setRequestInfo($request); $result = Router::normalize('beer/admin/beers_tags/add'); @@ -531,7 +531,7 @@ public function testUrlNormalization() public function testUrlGenerationWithBasePath() { Router::connect('/:controller/:action/*'); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'action' => 'index', 'plugin' => null, @@ -672,7 +672,7 @@ public function testUrlGenerationBasic() Router::reload(); Router::connect('/:controller/:action'); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'action' => 'index', 'plugin' => null, @@ -701,7 +701,7 @@ public function testUrlGenerationBasic() Router::reload(); Router::connect('/:controller', ['action' => 'index']); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'action' => 'index', 'plugin' => 'myplugin', @@ -873,7 +873,7 @@ public function testUrlGenerationWithPrefix() Router::connect('/admin/:controller/:action/*', ['prefix' => 'admin']); Router::extensions('rss', false); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'controller' => 'registrations', 'action' => 'admin_index', @@ -894,7 +894,7 @@ public function testUrlGenerationWithPrefix() Router::connect('/admin/subscriptions/:action/*', ['controller' => 'subscribe', 'prefix' => 'admin']); Router::connect('/admin/:controller/:action/*', ['prefix' => 'admin']); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'action' => 'index', 'plugin' => null, @@ -915,7 +915,7 @@ public function testUrlGenerationWithPrefix() $this->assertEquals($expected, $result); Router::reload(); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'prefix' => 'admin', 'action' => 'index', @@ -936,7 +936,7 @@ public function testUrlGenerationWithPrefix() Router::reload(); Router::connect('/admin/:controller/:action/*', ['prefix' => 'admin']); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'plugin' => null, 'controller' => 'pages', @@ -954,7 +954,7 @@ public function testUrlGenerationWithPrefix() Router::reload(); Router::connect('/admin/:controller/:action/*', ['prefix' => 'admin']); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'plugin' => null, 'controller' => 'pages', @@ -972,7 +972,7 @@ public function testUrlGenerationWithPrefix() Router::reload(); Router::connect('/admin/:controller/:action/:id', ['prefix' => 'admin'], ['id' => '[0-9]+']); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, @@ -994,7 +994,7 @@ public function testUrlGenerationWithPrefix() Router::reload(); Router::connect('/admin/:controller/:action/*', ['prefix' => 'admin']); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, 'controller' => 'pages', 'action' => 'add', 'prefix' => 'admin', @@ -1010,7 +1010,7 @@ public function testUrlGenerationWithPrefix() Router::reload(); Router::connect('/admin/:controller/:action/*', ['prefix' => 'admin']); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, 'controller' => 'pages', 'action' => 'edit', 'prefix' => 'admin', @@ -1139,7 +1139,7 @@ public function testUrlGenerationWithExtensionInCurrentRequest() Router::scope('/', function ($r) { $r->fallbacks('InflectedRoute'); }); - $request = new Request(); + $request = new ServerRequest(); $request->addParams(['controller' => 'Tasks', 'action' => 'index', '_ext' => 'rss']); Router::pushRequest($request); @@ -1253,7 +1253,7 @@ public function testDuplicateNamedRouteException() public function testUrlGenerationWithUrlFilter() { Router::connect('/:lang/:controller/:action/*'); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'lang' => 'en', 'controller' => 'posts', @@ -1290,7 +1290,7 @@ public function testUrlGenerationWithUrlFilter() public function testUrlParamPersistence() { Router::connect('/:lang/:controller/:action/*', [], ['persist' => ['lang']]); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'lang' => 'en', 'controller' => 'posts', @@ -1334,7 +1334,7 @@ public function testCanLeavePlugin() { Router::connect('/admin/:controller', ['action' => 'index', 'prefix' => 'admin']); Router::connect('/admin/:controller/:action/*', ['prefix' => 'admin']); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'pass' => [], @@ -1631,7 +1631,7 @@ public function testUrlParsing() public function testParseRequest() { Router::connect('/articles/:action/*', ['controller' => 'Articles']); - $request = new Request(['url' => '/articles/view/1']); + $request = new ServerRequest(['url' => '/articles/view/1']); $result = Router::parseRequest($request); $expected = [ 'pass' => ['1'], @@ -1975,7 +1975,7 @@ public function testUrlGenerationWithAutoPrefixes() Router::connect('/admin/:controller/:action/*', ['prefix' => 'admin']); Router::connect('/:controller/:action/*'); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, 'controller' => 'images', 'action' => 'index', @@ -2033,7 +2033,7 @@ public function testGenerationWithSslOption() { Router::connect('/:controller/:action/*'); - $request = new Request(); + $request = new ServerRequest(); $request->env('HTTP_HOST', 'localhost'); Router::pushRequest( $request->addParams([ @@ -2065,7 +2065,7 @@ public function testGenerateWithSslInSsl() { Router::connect('/:controller/:action/*'); - $request = new Request(); + $request = new ServerRequest(); $request->env('HTTP_HOST', 'localhost'); $request->env('HTTPS', 'on'); Router::pushRequest( @@ -2102,7 +2102,7 @@ public function testPrefixRoutePersistence() Router::connect('/protected/:controller/:action', ['prefix' => 'protected']); Router::connect('/:controller/:action'); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, @@ -2139,7 +2139,7 @@ public function testPrefixOverride() Router::connect('/admin/:controller/:action', ['prefix' => 'admin']); Router::connect('/protected/:controller/:action', ['prefix' => 'protected']); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, 'controller' => 'images', 'action' => 'index', 'prefix' => 'protected', @@ -2154,7 +2154,7 @@ public function testPrefixOverride() $expected = '/admin/images/add'; $this->assertEquals($expected, $result); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, @@ -2209,7 +2209,7 @@ public function testRemoveBase() { Router::connect('/:controller/:action'); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, 'controller' => 'controller', 'action' => 'index', @@ -2381,7 +2381,7 @@ public function testParsingWithLiteralPrefixes() Router::connect('/admin/:controller', $adminParams); Router::connect('/admin/:controller/:action/*', $adminParams); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, 'controller' => 'controller', 'action' => 'index' @@ -2417,7 +2417,7 @@ public function testParsingWithLiteralPrefixes() Router::connect('/members/:controller/:action', $prefixParams); Router::connect('/members/:controller/:action/*', $prefixParams); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, 'controller' => 'controller', 'action' => 'index', @@ -2458,7 +2458,7 @@ public function testUrlWritingWithPrefixes() $expected = '/company/users/login'; $this->assertEquals($expected, $result); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, @@ -2488,7 +2488,7 @@ public function testUrlWritingWithPrefixesAndCustomRoutes() '/admin/login', ['controller' => 'users', 'action' => 'login', 'prefix' => 'admin'] ); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, 'controller' => 'posts', 'action' => 'index', @@ -2573,7 +2573,7 @@ public function testRegexRouteMatchUrl() { Router::connect('/:locale/:controller/:action/*', [], ['locale' => 'dan|eng']); - $request = new Request(); + $request = new ServerRequest(); Router::setRequestInfo( $request->addParams([ 'plugin' => null, @@ -2707,7 +2707,7 @@ public function testReverse() $result = Router::reverse($params); $this->assertEquals('/eng/posts/view/1?foo=bar&baz=quu', $result); - $request = new Request('/eng/posts/view/1'); + $request = new ServerRequest('/eng/posts/view/1'); $request->addParams([ 'lang' => 'eng', 'controller' => 'posts', @@ -2740,7 +2740,7 @@ public function testReverseWithExtension() Router::connect('/:controller/:action/*'); Router::extensions('json', false); - $request = new Request('/posts/view/1.json'); + $request = new ServerRequest('/posts/view/1.json'); $request->addParams([ 'controller' => 'posts', 'action' => 'view', @@ -2786,8 +2786,8 @@ public function testSetRequestInfoLegacy() */ public function testGetRequest() { - $requestA = new Request('/'); - $requestB = new Request('/posts'); + $requestA = new ServerRequest('/'); + $requestB = new ServerRequest('/posts'); Router::pushRequest($requestA); Router::pushRequest($requestB); @@ -2804,14 +2804,14 @@ public function testUrlWithRequestAction() Router::connect('/:controller', ['action' => 'index']); Router::connect('/:controller/:action'); - $firstRequest = new Request('/posts/index'); + $firstRequest = new ServerRequest('/posts/index'); $firstRequest->addParams([ 'plugin' => null, 'controller' => 'posts', 'action' => 'index' ])->addPaths(['base' => '']); - $secondRequest = new Request('/posts/index'); + $secondRequest = new ServerRequest('/posts/index'); $secondRequest->addParams([ 'requested' => 1, 'plugin' => null, @@ -2970,7 +2970,7 @@ public function testRedirectWithAnotherRouteClass() */ public function testParseNamedParameters() { - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'controller' => 'posts', 'action' => 'index', @@ -2978,7 +2978,7 @@ public function testParseNamedParameters() $result = Router::parseNamedParams($request); $this->assertSame([], $result->params['named']); - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'controller' => 'posts', 'action' => 'index', @@ -3232,7 +3232,7 @@ public function testUrlWithCollidingQueryString() public function testSetRequestContextCakePHP() { Router::connect('/:controller/:action/*'); - $request = new Request([ + $request = new ServerRequest([ 'base' => '/subdir', 'url' => 'articles/view/1' ]); diff --git a/tests/TestCase/TestSuite/IntegrationTestCaseTest.php b/tests/TestCase/TestSuite/IntegrationTestCaseTest.php index afa01b8bee3..16e0fa52013 100644 --- a/tests/TestCase/TestSuite/IntegrationTestCaseTest.php +++ b/tests/TestCase/TestSuite/IntegrationTestCaseTest.php @@ -45,9 +45,6 @@ public function setUp() DispatcherFactory::add('Routing'); DispatcherFactory::add('ControllerFactory'); $this->useHttpServer(false); - - // Load aliases, or tests fail in isolation. - class_exists('Cake\Network\Request'); } /** diff --git a/tests/TestCase/View/CellTest.php b/tests/TestCase/View/CellTest.php index d60feaf1885..08e271399c5 100644 --- a/tests/TestCase/View/CellTest.php +++ b/tests/TestCase/View/CellTest.php @@ -45,7 +45,7 @@ public function setUp() parent::setUp(); Configure::write('App.namespace', 'TestApp'); Plugin::load(['TestPlugin', 'TestTheme']); - $request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $this->View = new View($request, $response); } @@ -351,7 +351,7 @@ public function testCellInheritsHelperConfig() */ public function testCellInheritsCustomViewClass() { - $request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $view = new CustomJsonView($request, $response); $view->theme = 'Pretty'; @@ -368,7 +368,7 @@ public function testCellInheritsCustomViewClass() */ public function testCellInheritsController() { - $request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $controller = new CellTraitTestController($request, $response); $controller->viewBuilder()->setTheme('Pretty'); diff --git a/tests/TestCase/View/Form/ArrayContextTest.php b/tests/TestCase/View/Form/ArrayContextTest.php index 43af7b98cdd..bb900b851ae 100644 --- a/tests/TestCase/View/Form/ArrayContextTest.php +++ b/tests/TestCase/View/Form/ArrayContextTest.php @@ -14,7 +14,7 @@ */ namespace Cake\Test\TestCase\View\Form; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\TestSuite\TestCase; use Cake\View\Form\ArrayContext; @@ -32,7 +32,7 @@ class ArrayContextTest extends TestCase public function setUp() { parent::setUp(); - $this->request = new Request(); + $this->request = new ServerRequest(); } /** diff --git a/tests/TestCase/View/Form/EntityContextTest.php b/tests/TestCase/View/Form/EntityContextTest.php index 231504a7e70..d3a66510ab6 100644 --- a/tests/TestCase/View/Form/EntityContextTest.php +++ b/tests/TestCase/View/Form/EntityContextTest.php @@ -17,7 +17,7 @@ use ArrayIterator; use ArrayObject; use Cake\Collection\Collection; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\ORM\Entity; use Cake\ORM\TableRegistry; use Cake\TestSuite\TestCase; @@ -62,7 +62,7 @@ class EntityContextTest extends TestCase public function setUp() { parent::setUp(); - $this->request = new Request(); + $this->request = new ServerRequest(); } /** diff --git a/tests/TestCase/View/Form/FormContextTest.php b/tests/TestCase/View/Form/FormContextTest.php index 3dd59363756..4a1a2b69835 100644 --- a/tests/TestCase/View/Form/FormContextTest.php +++ b/tests/TestCase/View/Form/FormContextTest.php @@ -15,7 +15,7 @@ namespace Cake\Test\TestCase\View\Form; use Cake\Form\Form; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\TestSuite\TestCase; use Cake\Validation\Validator; use Cake\View\Form\FormContext; @@ -34,7 +34,7 @@ class FormContextTest extends TestCase public function setUp() { parent::setUp(); - $this->request = new Request(); + $this->request = new ServerRequest(); } /** diff --git a/tests/TestCase/View/Helper/FlashHelperTest.php b/tests/TestCase/View/Helper/FlashHelperTest.php index e141bb96ce7..c9e50834971 100644 --- a/tests/TestCase/View/Helper/FlashHelperTest.php +++ b/tests/TestCase/View/Helper/FlashHelperTest.php @@ -15,7 +15,7 @@ namespace Cake\Test\TestCase\View\Helper; use Cake\Core\Plugin; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Network\Session; use Cake\TestSuite\TestCase; use Cake\View\Helper\FlashHelper; @@ -39,7 +39,7 @@ public function setUp() parent::setUp(); $this->View = new View(); $session = new Session(); - $this->View->request = new Request(['session' => $session]); + $this->View->request = new ServerRequest(['session' => $session]); $this->Flash = new FlashHelper($this->View); $session->write([ diff --git a/tests/TestCase/View/Helper/FormHelperTest.php b/tests/TestCase/View/Helper/FormHelperTest.php index f468fe6bb6c..3722ae52f81 100644 --- a/tests/TestCase/View/Helper/FormHelperTest.php +++ b/tests/TestCase/View/Helper/FormHelperTest.php @@ -17,7 +17,7 @@ use Cake\Collection\Collection; use Cake\Core\Configure; use Cake\Form\Form; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\ORM\Entity; use Cake\ORM\Table; use Cake\ORM\TableRegistry; @@ -142,7 +142,7 @@ public function setUp() $this->View = new View(); $this->Form = new FormHelper($this->View); - $request = new Request([ + $request = new ServerRequest([ 'webroot' => '', 'base' => '', 'url' => '/articles/add', @@ -330,7 +330,7 @@ public function testAddContextProvider() $context = 'My data'; $stub = $this->getMockBuilder('Cake\View\Form\ContextInterface')->getMock(); $this->Form->addContextProvider('test', function ($request, $data) use ($context, $stub) { - $this->assertInstanceOf('Cake\Network\Request', $request); + $this->assertInstanceOf('Cake\Http\ServerRequest', $request); $this->assertEquals($context, $data['entity']); return $stub; diff --git a/tests/TestCase/View/Helper/HtmlHelperTest.php b/tests/TestCase/View/Helper/HtmlHelperTest.php index 17781f89e90..317d20a4f26 100644 --- a/tests/TestCase/View/Helper/HtmlHelperTest.php +++ b/tests/TestCase/View/Helper/HtmlHelperTest.php @@ -17,7 +17,7 @@ use Cake\Core\Configure; use Cake\Core\Plugin; use Cake\Filesystem\File; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\Router; use Cake\TestSuite\TestCase; use Cake\View\Helper\HtmlHelper; @@ -68,7 +68,7 @@ public function setUp() ->setMethods(['append']) ->getMock(); $this->Html = new HtmlHelper($this->View); - $this->Html->request = new Request([ + $this->Html->request = new ServerRequest([ 'webroot' => '', ]); $this->Html->Url->request = $this->Html->request; diff --git a/tests/TestCase/View/Helper/PaginatorHelperTest.php b/tests/TestCase/View/Helper/PaginatorHelperTest.php index 651a87b672d..8157af8dda3 100644 --- a/tests/TestCase/View/Helper/PaginatorHelperTest.php +++ b/tests/TestCase/View/Helper/PaginatorHelperTest.php @@ -15,8 +15,8 @@ namespace Cake\Test\TestCase\View\Helper; use Cake\Core\Configure; +use Cake\Http\ServerRequest; use Cake\I18n\I18n; -use Cake\Network\Request; use Cake\Routing\Router; use Cake\TestSuite\TestCase; use Cake\View\Helper\PaginatorHelper; @@ -54,7 +54,7 @@ public function setUp() Configure::write('Config.language', 'eng'); $this->View = new View(); $this->Paginator = new PaginatorHelper($this->View); - $this->Paginator->request = new Request(); + $this->Paginator->request = new ServerRequest(); $this->Paginator->request->addParams([ 'paging' => [ 'Article' => [ @@ -2148,7 +2148,7 @@ public function testNumbersRouting() ] ]; - $request = new Request(); + $request = new ServerRequest(); $request->addParams([ 'controller' => 'clients', 'action' => 'index', 'plugin' => null ]); @@ -2696,7 +2696,7 @@ public function testTotal() */ public function testNoDefaultModel() { - $this->Paginator->request = new Request(); + $this->Paginator->request = new ServerRequest(); $this->assertNull($this->Paginator->defaultModel()); $this->Paginator->defaultModel('Article'); diff --git a/tests/TestCase/View/Helper/UrlHelperTest.php b/tests/TestCase/View/Helper/UrlHelperTest.php index 2357af06f20..55076548520 100644 --- a/tests/TestCase/View/Helper/UrlHelperTest.php +++ b/tests/TestCase/View/Helper/UrlHelperTest.php @@ -16,7 +16,7 @@ use Cake\Core\Configure; use Cake\Core\Plugin; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\Router; use Cake\TestSuite\TestCase; use Cake\View\Helper\UrlHelper; @@ -45,7 +45,7 @@ public function setUp() Router::reload(); $this->View = new View(); $this->Helper = new UrlHelper($this->View); - $this->Helper->request = new Request(); + $this->Helper->request = new ServerRequest(); Configure::write('App.namespace', 'TestApp'); Plugin::load(['TestTheme']); diff --git a/tests/TestCase/View/JsonViewTest.php b/tests/TestCase/View/JsonViewTest.php index d08bcd5de9f..d96bbea79eb 100644 --- a/tests/TestCase/View/JsonViewTest.php +++ b/tests/TestCase/View/JsonViewTest.php @@ -19,7 +19,7 @@ use Cake\Controller\Controller; use Cake\Core\Configure; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\TestSuite\TestCase; /** @@ -234,7 +234,7 @@ public static function renderWithoutViewProvider() */ public function testRenderWithoutView($data, $serialize, $jsonOptions, $expected) { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); @@ -255,7 +255,7 @@ public function testRenderWithoutView($data, $serialize, $jsonOptions, $expected */ public function testRenderSerializeNoHelpers() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); @@ -278,7 +278,7 @@ public function testRenderSerializeNoHelpers() */ public function testJsonpResponse() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); @@ -315,7 +315,7 @@ public function testJsonpResponse() */ public function testRenderWithView() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); $Controller->name = 'Posts'; diff --git a/tests/TestCase/View/ViewBuilderTest.php b/tests/TestCase/View/ViewBuilderTest.php index cf90e9d84f6..90e2a37c6a6 100644 --- a/tests/TestCase/View/ViewBuilderTest.php +++ b/tests/TestCase/View/ViewBuilderTest.php @@ -109,7 +109,7 @@ public function testArrayPropertyMerge($property, $value) */ public function testBuildComplete() { - $request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $events = $this->getMockBuilder('Cake\Event\EventManager')->getMock(); diff --git a/tests/TestCase/View/ViewTest.php b/tests/TestCase/View/ViewTest.php index d19f5abab90..4a2d23eb2d3 100644 --- a/tests/TestCase/View/ViewTest.php +++ b/tests/TestCase/View/ViewTest.php @@ -21,7 +21,7 @@ use Cake\Core\Plugin; use Cake\Event\Event; use Cake\Event\EventListenerInterface; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\Router; use Cake\TestSuite\TestCase; use Cake\View\Helper; @@ -298,14 +298,14 @@ public function setUp() { parent::setUp(); - $request = new Request(); + $request = new ServerRequest(); $this->Controller = new Controller($request); $this->PostsController = new ViewPostsController($request); $this->PostsController->index(); $this->View = $this->PostsController->createView(); $this->View->viewPath = 'Posts'; - $themeRequest = new Request('posts/index'); + $themeRequest = new ServerRequest('posts/index'); $this->ThemeController = new Controller($themeRequest); $this->ThemePostsController = new ThemePostsController($themeRequest); $this->ThemePostsController->index(); @@ -340,7 +340,7 @@ public function tearDown() */ public function testGetTemplate() { - $request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $viewOptions = [ @@ -416,7 +416,7 @@ public function testPluginGetTemplate() */ public function testPluginGetTemplateAbsoluteFail() { - $request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $viewOptions = [ @@ -596,7 +596,7 @@ public function testGetViewFileNames() 'name' => 'Pages', 'viewPath' => 'Pages' ]; - $request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $View = new TestView(null, null, null, $viewOptions); @@ -642,7 +642,7 @@ public function testGetViewFileNameDirectoryTraversal() 'name' => 'Pages', 'viewPath' => 'Pages', ]; - $request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $view = new TestView(null, null, null, $viewOptions); @@ -762,7 +762,7 @@ public function testGetLayoutFileNameDirectoryTraversal() 'name' => 'Pages', 'viewPath' => 'Pages', ]; - $request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $view = new TestView(null, null, null, $viewOptions); @@ -782,7 +782,7 @@ public function testMissingTemplate() 'name' => 'Pages', 'viewPath' => 'Pages' ]; - $request = $this->getMockBuilder('Cake\Network\Request')->getMock(); + $request = $this->getMockBuilder('Cake\Http\ServerRequest')->getMock(); $response = $this->getMockBuilder('Cake\Http\Response')->getMock(); $View = new TestView($request, $response, null, $viewOptions); diff --git a/tests/TestCase/View/XmlViewTest.php b/tests/TestCase/View/XmlViewTest.php index ef37a84b70c..f04ad056134 100644 --- a/tests/TestCase/View/XmlViewTest.php +++ b/tests/TestCase/View/XmlViewTest.php @@ -19,7 +19,7 @@ use Cake\Controller\Controller; use Cake\Core\Configure; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\TestSuite\TestCase; use Cake\Utility\Xml; @@ -42,7 +42,7 @@ public function setUp() */ public function testRenderWithoutView() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); $data = ['users' => ['user' => ['user1', 'user2']]]; @@ -90,7 +90,7 @@ public function testRenderWithoutView() */ public function testRenderSerializeNoHelpers() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); $Controller->helpers = ['Html']; @@ -111,7 +111,7 @@ public function testRenderSerializeNoHelpers() */ public function testRenderSerializeWithOptions() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); $data = [ @@ -146,7 +146,7 @@ public function testRenderSerializeWithOptions() */ public function testRenderSerializeWithString() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); $data = [ @@ -183,7 +183,7 @@ public function testRenderSerializeWithString() */ public function testRenderWithoutViewMultiple() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); $data = ['no' => 'nope', 'user' => 'fake', 'list' => ['item1', 'item2']]; @@ -215,7 +215,7 @@ public function testRenderWithoutViewMultiple() */ public function testRenderWithoutViewMultipleAndAlias() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); $data = ['original_name' => 'my epic name', 'user' => 'fake', 'list' => ['item1', 'item2']]; @@ -247,7 +247,7 @@ public function testRenderWithoutViewMultipleAndAlias() */ public function testRenderWithSerializeTrue() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); $data = ['users' => ['user' => ['user1', 'user2']]]; @@ -278,7 +278,7 @@ public function testRenderWithSerializeTrue() */ public function testRenderWithView() { - $Request = new Request(); + $Request = new ServerRequest(); $Response = new Response(); $Controller = new Controller($Request, $Response); $Controller->name = 'Posts'; diff --git a/tests/test_app/TestApp/Auth/TestAuthenticate.php b/tests/test_app/TestApp/Auth/TestAuthenticate.php index 70cff6fbf82..94b46d36b8b 100644 --- a/tests/test_app/TestApp/Auth/TestAuthenticate.php +++ b/tests/test_app/TestApp/Auth/TestAuthenticate.php @@ -16,7 +16,7 @@ use Cake\Auth\BaseAuthenticate; use Cake\Event\Event; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; /** * TestAuthenticate class @@ -41,7 +41,7 @@ public function implementedEvents() * @param \Cake\Http\Response $response * @return array */ - public function authenticate(Request $request, Response $response) + public function authenticate(ServerRequest $request, Response $response) { return ['id' => 1, 'username' => 'admad']; } diff --git a/tests/test_app/TestApp/Error/TestAppsExceptionRenderer.php b/tests/test_app/TestApp/Error/TestAppsExceptionRenderer.php index 074b1964c5e..c0e2fa22f46 100644 --- a/tests/test_app/TestApp/Error/TestAppsExceptionRenderer.php +++ b/tests/test_app/TestApp/Error/TestAppsExceptionRenderer.php @@ -6,7 +6,7 @@ use Cake\Core\Configure; use Cake\Error\ExceptionRenderer; use Cake\Http\Response; -use Cake\Network\Request; +use Cake\Http\ServerRequest; use Cake\Routing\Router; use TestApp\Controller\TestAppsErrorController; @@ -19,7 +19,7 @@ class TestAppsExceptionRenderer extends ExceptionRenderer protected function _getController() { if (!$request = Router::getRequest(true)) { - $request = new Request(); + $request = new ServerRequest(); } $response = new Response(); try {