adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'router-stars' from Hikkijp

Browse source 
Refs #3582, #3581
This commit is contained in:
mark_story 2014-06-02 22:38:27 -04:00
commit 55672b6df3
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Routing/Route/CakeRoute.php
View file

@ -536,7 +536,10 @@ class CakeRoute {
$out = str_replace($search, $replace, $out); $out = str_replace($search, $replace, $out);
} }
if (strpos($this->template, '*')) { if (strpos($this->template, '**') !== false) {
$out = str_replace('**', $params['pass'], $out);
$out = str_replace('%2F', '/', $out);
} elseif (strpos($this->template, '*') !== false) {
$out = str_replace('*', $params['pass'], $out); $out = str_replace('*', $params['pass'], $out);
} }
$out = str_replace('//', '/', $out); $out = str_replace('//', '/', $out);

17
lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
View file

@ -873,6 +873,23 @@ class CakeRouteTest extends CakeTestCase {
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
} }
/**
* Test match() with trailing ** style routes.
*
* @return void
*/
public function testMatchTrailing() {
$route = new CakeRoute('/pages/**', array('controller' => 'pages', 'action' => 'display'));
$id = 'test/ spaces/漢字/la†în';
$result = $route->match(array(
'controller' => 'pages',
'action' => 'display',
$id
));
$expected = '/pages/test/%20spaces/%E6%BC%A2%E5%AD%97/la%E2%80%A0%C3%AEn';
$this->assertEquals($expected, $result);
}
/** /**
* test restructuring args with pass key * test restructuring args with pass key
* *