Skip to content

Commit

Permalink
Fix deprecated usage of Routing in other tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@markstory
markstory committed Nov 1, 2017
1 parent 7dc1a6a commit 3753ae8
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 30 deletions.
4 changes: 3 additions & 1 deletion src/Shell/RoutesShell.php
View file
Expand Up @@ -15,6 +15,7 @@
namespace Cake\Shell;

use Cake\Console\Shell;
use Cake\Http\ServerRequest;
use Cake\Routing\Exception\MissingRouteException;
use Cake\Routing\Router;

Expand Down Expand Up @@ -52,7 +53,8 @@ public function main()
public function check($url)
{
try {
$route = Router::parse($url);
$request = new ServerRequest(['url' => $url]);
$route = Router::parseRequest($request);
$name = null;
foreach (Router::routes() as $r) {
if ($r->match($route)) {
Expand Down
54 changes: 27 additions & 27 deletions tests/TestCase/Controller/Component/AuthComponentTest.php
View file
Expand Up @@ -217,7 +217,7 @@ public function testAuthorizeFalse()
$this->Controller->Auth->storage()->write($user);
$this->Controller->Auth->config('userModel', 'Users');
$this->Controller->Auth->config('authorize', false);
$this->Controller->request->addParams(Router::parse('auth_test/add'));
$this->Controller->request->addParams(['controller' => 'AuthTest', 'action' => 'add']);
$result = $this->Controller->Auth->startup($event);
$this->assertNull($result);

Expand All @@ -227,7 +227,7 @@ public function testAuthorizeFalse()
$this->assertInstanceOf('Cake\Http\Response', $result);
$this->assertTrue($this->Auth->session->check('Flash.flash'));

$this->Controller->request->addParams(Router::parse('auth_test/camelCase'));
$this->Controller->request->addParams(['controller' => 'AuthTest', 'action' => 'camelCase']);
$result = $this->Controller->Auth->startup($event);
$this->assertInstanceOf('Cake\Http\Response', $result);
}
Expand Down Expand Up @@ -508,13 +508,13 @@ public function testDenyWithCamelCaseMethods()
$this->Controller->Auth->deny(['add', 'camelCase']);

$url = '/auth_test/camelCase';
$this->Controller->request->addParams(Router::parse($url));
$this->Controller->request->addParams(['controller' => 'AuthTest', 'action' => 'camelCase']);
$this->Controller->request->query['url'] = Router::normalize($url);

$this->assertInstanceOf('Cake\Http\Response', $this->Controller->Auth->startup($event));

$url = '/auth_test/CamelCase';
$this->Controller->request->addParams(Router::parse($url));
$this->Controller->request->addParams(['controller' => 'AuthTest', 'action' => 'camelCase']);
$this->Controller->request->query['url'] = Router::normalize($url);
$this->assertInstanceOf('Cake\Http\Response', $this->Controller->Auth->startup($event));
}
Expand All @@ -529,7 +529,7 @@ public function testAllowedActionsWithCamelCaseMethods()
{
$event = new Event('Controller.startup', $this->Controller);
$url = '/auth_test/camelCase';
$this->Controller->request->addParams(Router::parse($url));
$this->Controller->request->addParams(['controller' => 'AuthTest', 'action' => 'camelCase']);
$this->Controller->request->query['url'] = Router::normalize($url);
$this->Controller->Auth->loginAction = ['controller' => 'AuthTest', 'action' => 'login'];
$this->Controller->Auth->userModel = 'AuthUsers';
Expand All @@ -538,7 +538,7 @@ public function testAllowedActionsWithCamelCaseMethods()
$this->assertNull($result, 'startup() should return null, as action is allowed. %s');

$url = '/auth_test/camelCase';
$this->Controller->request->addParams(Router::parse($url));
$this->Controller->request->addParams(['controller' => 'AuthTest', 'action' => 'camelCase']);
$this->Controller->request->query['url'] = Router::normalize($url);
$this->Controller->Auth->loginAction = ['controller' => 'AuthTest', 'action' => 'login'];
$this->Controller->Auth->userModel = 'AuthUsers';
Expand All @@ -550,7 +550,7 @@ public function testAllowedActionsWithCamelCaseMethods()
$this->assertInstanceOf('Cake\Http\Response', $this->Controller->Auth->startup($event));

$url = '/auth_test/delete';
$this->Controller->request->addParams(Router::parse($url));
$this->Controller->request->addParams(['controller' => 'AuthTest', 'action' => 'delete']);
$this->Controller->request->query['url'] = Router::normalize($url);
$this->Controller->Auth->loginAction = ['controller' => 'AuthTest', 'action' => 'login'];
$this->Controller->Auth->userModel = 'AuthUsers';
Expand All @@ -568,7 +568,7 @@ public function testAllowedActionsWithCamelCaseMethods()
public function testAllowedActionsSetWithAllowMethod()
{
$url = '/auth_test/action_name';
$this->Controller->request->addParams(Router::parse($url));
$this->Controller->request->addParams(['controller' => 'AuthTest', 'action' => 'action_name']);
$this->Controller->request->query['url'] = Router::normalize($url);
$this->Controller->Auth->allow(['action_name', 'anotherAction']);
$this->assertEquals(['action_name', 'anotherAction'], $this->Controller->Auth->allowedActions);
Expand All @@ -586,7 +586,7 @@ public function testLoginRedirect()
'AuthUsers' => ['id' => '1', 'username' => 'nate']
]);

$this->Auth->request->addParams(Router::parse('users/login'));
$this->Auth->request->addParams(['controller' => 'Users', 'action' => 'login']);
$this->Auth->request->url = 'users/login';
$this->Auth->request->env('HTTP_REFERER', false);

Expand All @@ -608,7 +608,7 @@ public function testLoginRedirect()
'Auth',
['AuthUsers' => ['id' => '1', 'username' => 'nate']]
);
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Posts', 'action' => 'view', 'pass' => [1]]);
$this->Auth->request->here = $url;

$this->Auth->config('authorize', 'controller');
Expand All @@ -627,7 +627,7 @@ public function testLoginRedirect()
// Auth.redirect gets set when accessing a protected action without being authenticated
$this->Auth->session->delete('Auth');
$url = '/posts/view/1';
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Posts', 'action' => 'view', 'pass' => [1]]);
$this->Auth->request->url = $this->Auth->request->here = Router::normalize($url);
$this->Auth->config('loginAction', ['controller' => 'AuthTest', 'action' => 'login']);
$event = new Event('Controller.startup', $this->Controller);
Expand All @@ -649,7 +649,7 @@ public function testLoginRedirectPost()
$this->Auth->session->delete('Auth');

$url = '/posts/view/1';
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Posts', 'action' => 'view', 'pass' => [1]]);
$this->Auth->request->env('HTTP_REFERER', Router::url('/foo/bar', true));
$this->Auth->request->env('REQUEST_METHOD', 'POST');
$this->Auth->request->url = $this->Auth->request->here = Router::normalize($url);
Expand All @@ -673,7 +673,7 @@ public function testLoginRedirectPostNoReferer()
$this->Auth->session->delete('Auth');

$url = '/posts/view/1';
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Posts', 'action' => 'view', 'pass' => [1]]);
$this->Auth->request->env('REQUEST_METHOD', 'POST');
$this->Auth->request->url = $this->Auth->request->here = Router::normalize($url);
$this->Auth->config('loginAction', ['controller' => 'AuthTest', 'action' => 'login']);
Expand All @@ -694,7 +694,7 @@ public function testLoginRedirectQueryString()
// QueryString parameters are preserved when redirecting with redirect key
$this->Auth->session->delete('Auth');
$url = '/posts/view/29';
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Posts', 'action' => 'view', 'pass' => [29]]);
$this->Auth->request->url = $this->Auth->request->here = Router::normalize($url);
$this->Auth->request->query = [
'print' => 'true',
Expand All @@ -717,7 +717,7 @@ public function testLoginRedirectQueryStringWithComplexLoginActionUrl()
{
$this->Auth->session->delete('Auth');
$url = '/posts/view/29';
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Posts', 'action' => 'view', 'pass' => [29]]);
$this->Auth->request->url = $this->Auth->request->here = Router::normalize($url);
$this->Auth->request->query = [
'print' => 'true',
Expand Down Expand Up @@ -753,7 +753,7 @@ public function testLoginRedirectDifferentBaseUrl()
$url = '/posts/add';
$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->addParams(['controller' => 'Posts', 'action' => 'add']);
$this->Auth->request->url = Router::normalize($url);

$this->Auth->config('loginAction', ['controller' => 'Users', 'action' => 'login']);
Expand Down Expand Up @@ -808,7 +808,7 @@ public function testDefaultToLoginRedirect()
$url = '/party/on';
$this->Auth->request = $request = new ServerRequest($url);
$request->env('HTTP_REFERER', false);
$request->addParams(Router::parse($url));
$request->addParams(['controller' => 'Part', 'action' => 'on']);
$request->addPaths([
'base' => 'dirname',
'webroot' => '/dirname/',
Expand Down Expand Up @@ -854,7 +854,7 @@ public function testRedirectToUnauthorizedRedirect()
'url' => $url,
'session' => $this->Auth->session
]);
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Party', 'action' => 'on']);
$this->Auth->config('authorize', ['Controller']);
$this->Auth->setUser(['username' => 'admad', 'password' => 'cake']);

Expand Down Expand Up @@ -895,7 +895,7 @@ public function testRedirectToUnauthorizedRedirectLoginAction()
'url' => $url,
'session' => $this->Auth->session
]);
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Party', 'action' => 'on']);
$this->Auth->config('authorize', ['Controller']);
$this->Auth->setUser(['username' => 'admad', 'password' => 'cake']);

Expand Down Expand Up @@ -930,7 +930,7 @@ public function testRedirectToUnauthorizedRedirectSuppressedAuthError()
->setMethods(['flash'])
->getMock();
$this->Auth->request = $Request = new ServerRequest($url);
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Party', 'action' => 'on']);
$this->Auth->config('authorize', ['Controller']);
$this->Auth->setUser(['username' => 'admad', 'password' => 'cake']);
$expected = ['controller' => 'no_can_do', 'action' => 'jack'];
Expand Down Expand Up @@ -965,7 +965,7 @@ public function testForbiddenException()
{
$url = '/party/on';
$this->Auth->request = $request = new ServerRequest($url);
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Party', 'action' => 'on']);
$this->Auth->config([
'authorize' => ['Controller'],
'unauthorizedRedirect' => false
Expand Down Expand Up @@ -998,7 +998,7 @@ public function testNoRedirectOnLoginAction()

$url = '/AuthTest/login';
$this->Auth->request = $controller->request = new ServerRequest($url);
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'AuthTest', 'action' => 'login']);
$this->Auth->config([
'loginAction', ['controller' => 'AuthTest', 'action' => 'login'],
'authorize', ['Controller']
Expand All @@ -1021,7 +1021,7 @@ public function testNoRedirectOn404()
{
$event = new Event('Controller.startup', $this->Controller);
$this->Auth->session->delete('Auth');
$this->Auth->request->addParams(Router::parse('auth_test/something_totally_wrong'));
$this->Auth->request->addParams(['controller' => 'AuthTest', 'action' => 'something_totally_wrong']);
$result = $this->Auth->startup($event);
$this->assertNull($result, 'Auth redirected a missing action %s');
}
Expand All @@ -1044,7 +1044,7 @@ public function testAdminRoute()
});

$url = '/admin/auth_test/add';
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'AuthTest', 'action' => 'add', 'prefix' => 'admin']);
$this->Auth->request->base = '';
$this->Auth->request->here = $url;

Expand Down Expand Up @@ -1171,7 +1171,7 @@ public function testStatelessAuthWorksWithUser()
{
$event = new Event('Controller.startup', $this->Controller);
$url = '/auth_test/add';
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'AuthTest', 'action' => 'add']);
$this->Auth->request->env('PHP_AUTH_USER', 'mariano');
$this->Auth->request->env('PHP_AUTH_PW', 'cake');

Expand Down Expand Up @@ -1276,7 +1276,7 @@ public function testAfterIdentifyForStatelessAuthentication()
{
$event = new Event('Controller.startup', $this->Controller);
$url = '/auth_test/add';
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'AuthTest', 'action' => 'add']);
$this->Auth->request->env('PHP_AUTH_USER', 'mariano');
$this->Auth->request->env('PHP_AUTH_PW', 'cake');

Expand Down Expand Up @@ -1483,7 +1483,7 @@ public function testRedirectUrlWithBaseSet()

$url = '/users/login';
$this->Auth->request = $this->Controller->request = new ServerRequest($url);
$this->Auth->request->addParams(Router::parse($url));
$this->Auth->request->addParams(['controller' => 'Users', 'action' => 'login']);
$this->Auth->request->url = Router::normalize($url);

Router::setRequestInfo($this->Auth->request);
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase/Controller/Component/RequestHandlerComponentTest.php
View file
Expand Up @@ -81,7 +81,7 @@ protected function _init()
$this->request = $request;

Router::scope('/', function ($routes) {
$routes->extensions('json');
$routes->setExtensions('json');
$routes->fallbacks('InflectedRoute');
});
}
Expand Down
2 changes: 1 addition & 1 deletion tests/test_app/TestApp/Controller/AuthTestController.php
View file
Expand Up @@ -45,7 +45,7 @@ class AuthTestController extends Controller
*/
public function __construct($request = null, $response = null)
{
$request->addParams(Router::parse('/auth_test'));
$request->addParams(['controller' => 'AuthTest', 'action' => 'index']);
$request->here = '/auth_test';
$request->webroot = '/';
Router::setRequestInfo($request);
Expand Down

0 comments on commit 3753ae8

Please sign in to comment.