adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing incorrect keying for ext routing parameter. It was

Browse source 
nested under params[url][ext].  This makes it unlike
all other routing parameters.  Having the nested value
also makes reversing requests harder, and generating urls more
difficult.
Adding a test for Router::reverse() and extensions.
Fixes #1923, fixes #1928
This commit is contained in:
mark_story 2011-08-22 21:19:35 -04:00 • committed by mark_story
parent 68b2d67b0a
commit 6acf024a2b
3 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/Cake/Controller/Component/RequestHandlerComponent.php
View file

@ -109,8 +109,8 @@ class RequestHandlerComponent extends Component {
public function initialize($controller, $settings = array()) { public function initialize($controller, $settings = array()) {
$this->request = $controller->request; $this->request = $controller->request;
$this->response = $controller->response; $this->response = $controller->response;
if (isset($this->request->params['url']['ext'])) { if (isset($this->request->params['ext'])) {
$this->ext = $this->request->params['url']['ext']; $this->ext = $this->request->params['ext'];
} }
if (empty($this->ext) || $this->ext == 'html') { if (empty($this->ext) || $this->ext == 'html') {
$accepts = $this->request->accepts(); $accepts = $this->request->accepts();

4
lib/Cake/Routing/Router.php
View file

@ -476,8 +476,8 @@ class Router {
$out['action'] = $out['prefix'] . '_' . $out['action']; $out['action'] = $out['prefix'] . '_' . $out['action'];
} }
if (!empty($ext) && !isset($out['url']['ext'])) { if (!empty($ext) && !isset($out['ext'])) {
$out['url']['ext'] = $ext; $out['ext'] = $ext;
} }
return $out; return $out;
} }

39
lib/Cake/Test/Case/Routing/RouterTest.php
View file

@ -577,7 +577,7 @@ class RouterTest extends CakeTestCase {
$request->addParams(array( $request->addParams(array(
'controller' => 'registrations', 'action' => 'admin_index', 'controller' => 'registrations', 'action' => 'admin_index',
'plugin' => null, 'prefix' => 'admin', 'admin' => true, 'plugin' => null, 'prefix' => 'admin', 'admin' => true,
'url' => array('ext' => 'html', 'url' => 'admin/registrations/index') 'ext' => 'html'
)); ));
$request->base = ''; $request->base = '';
$request->here = '/admin/registrations/index'; $request->here = '/admin/registrations/index';
@ -1210,18 +1210,18 @@ class RouterTest extends CakeTestCase {
require CAKE . 'Config' . DS . 'routes.php'; require CAKE . 'Config' . DS . 'routes.php';
$result = Router::parse('/posts.rss'); $result = Router::parse('/posts.rss');
$expected = array('plugin' => null, 'controller' => 'posts', 'action' => 'index', 'url' => array('ext' => 'rss'), 'pass'=> array(), 'named' => array()); $expected = array('plugin' => null, 'controller' => 'posts', 'action' => 'index', 'ext' => 'rss', 'pass'=> array(), 'named' => array());
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = Router::parse('/posts/view/1.rss'); $result = Router::parse('/posts/view/1.rss');
$expected = array('plugin' => null, 'controller' => 'posts', 'action' => 'view', 'pass' => array('1'), 'named' => array(), 'url' => array('ext' => 'rss'), 'named' => array()); $expected = array('plugin' => null, 'controller' => 'posts', 'action' => 'view', 'pass' => array('1'), 'named' => array(), 'ext' => 'rss', 'named' => array());
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = Router::parse('/posts/view/1.rss?query=test'); $result = Router::parse('/posts/view/1.rss?query=test');
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = Router::parse('/posts/view/1.atom'); $result = Router::parse('/posts/view/1.atom');
$expected['url'] = array('ext' => 'atom'); $expected['ext'] = 'atom';
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
Router::reload(); Router::reload();
@ -1230,7 +1230,7 @@ class RouterTest extends CakeTestCase {
Router::parseExtensions('rss', 'xml'); Router::parseExtensions('rss', 'xml');
$result = Router::parse('/posts.xml'); $result = Router::parse('/posts.xml');
$expected = array('plugin' => null, 'controller' => 'posts', 'action' => 'index', 'url' => array('ext' => 'xml'), 'pass'=> array(), 'named' => array()); $expected = array('plugin' => null, 'controller' => 'posts', 'action' => 'index', 'ext' => 'xml', 'pass'=> array(), 'named' => array());
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$result = Router::parse('/posts.atom?hello=goodbye'); $result = Router::parse('/posts.atom?hello=goodbye');
@ -1238,16 +1238,16 @@ class RouterTest extends CakeTestCase {
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
Router::reload(); Router::reload();
Router::connect('/controller/action', array('controller' => 'controller', 'action' => 'action', 'url' => array('ext' => 'rss'))); Router::connect('/controller/action', array('controller' => 'controller', 'action' => 'action', 'ext' => 'rss'));
$result = Router::parse('/controller/action'); $result = Router::parse('/controller/action');
$expected = array('controller' => 'controller', 'action' => 'action', 'plugin' => null, 'url' => array('ext' => 'rss'), 'named' => array(), 'pass' => array()); $expected = array('controller' => 'controller', 'action' => 'action', 'plugin' => null, 'ext' => 'rss', 'named' => array(), 'pass' => array());
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
Router::reload(); Router::reload();
Router::parseExtensions('rss'); Router::parseExtensions('rss');
Router::connect('/controller/action', array('controller' => 'controller', 'action' => 'action', 'url' => array('ext' => 'rss'))); Router::connect('/controller/action', array('controller' => 'controller', 'action' => 'action', 'ext' => 'rss'));
$result = Router::parse('/controller/action'); $result = Router::parse('/controller/action');
$expected = array('controller' => 'controller', 'action' => 'action', 'plugin' => null, 'url' => array('ext' => 'rss'), 'named' => array(), 'pass' => array()); $expected = array('controller' => 'controller', 'action' => 'action', 'plugin' => null, 'ext' => 'rss', 'named' => array(), 'pass' => array());
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
} }
@ -2273,6 +2273,27 @@ class RouterTest extends CakeTestCase {
$this->assertPattern('/^http(s)?:\/\//', $result); $this->assertPattern('/^http(s)?:\/\//', $result);
} }
/**
* Test that extensions work with Router::reverse()
*
* @return void
*/
public function testReverseWithExtension() {
Router::parseExtensions('json');
$request = new CakeRequest('/posts/view/1.json');
$request->addParams(array(
'controller' => 'posts',
'action' => 'view',
'pass' => array(1),
'named' => array(),
'ext' => 'json',
));
$result = Router::reverse($request);
$expected = '/posts/view/1.json';
$this->assertEquals($expected, $result);
}
/** /**
* test that setRequestInfo can accept arrays and turn that into a CakeRequest object. * test that setRequestInfo can accept arrays and turn that into a CakeRequest object.
* *