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

Changing Router::$__validExtensions so Router::extensions() always returns an array like the doc block says.

Browse source 
Updating test cases for PHPUnit.
This commit is contained in:
mark_story 2010-05-20 22:55:25 -04:00
parent df6989e3d6
commit 94ac914426
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/router.php
View file

@ -64,7 +64,7 @@ class Router {
* @var array * @var array
* @access private * @access private
*/ */
private $__validExtensions = null; private $__validExtensions = array();
/** /**
* 'Constant' regular expression definitions for named route elements * 'Constant' regular expression definitions for named route elements

8
cake/tests/cases/libs/router.test.php
View file

@ -1067,7 +1067,7 @@ class RouterTest extends CakeTestCase {
* @return void * @return void
*/ */
function testExtensionParsingSetting() { function testExtensionParsingSetting() {
$this->assertFalse(Router::extensions()); $this->assertEquals(array(), Router::extensions());
Router::parseExtensions('rss'); Router::parseExtensions('rss');
$this->assertEqual(Router::extensions(), array('rss')); $this->assertEqual(Router::extensions(), array('rss'));
@ -1927,7 +1927,7 @@ class RouterTest extends CakeTestCase {
* @return void * @return void
*/ */
function testUsingCustomRouteClass() { function testUsingCustomRouteClass() {
Mock::generate('CakeRoute', 'MockConnectedRoute'); $mock = $this->getMock('CakeRoute', array(), array(), 'MockConnectedRoute', false);
$routes = Router::connect( $routes = Router::connect(
'/:slug', '/:slug',
array('controller' => 'posts', 'action' => 'view'), array('controller' => 'posts', 'action' => 'view'),
@ -1935,7 +1935,9 @@ class RouterTest extends CakeTestCase {
); );
$this->assertTrue(is_a($routes[0], 'MockConnectedRoute'), 'Incorrect class used. %s'); $this->assertTrue(is_a($routes[0], 'MockConnectedRoute'), 'Incorrect class used. %s');
$expected = array('controller' => 'posts', 'action' => 'view', 'slug' => 'test'); $expected = array('controller' => 'posts', 'action' => 'view', 'slug' => 'test');
$routes[0]->setReturnValue('parse', $expected); $routes[0]->expects($this->any())
->method('parse')
->will($this->returnValue($expected));
$result = Router::parse('/test'); $result = Router::parse('/test');
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
} }