From 4b2804bb420a744c2094758834e4469b883c4c5c Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Sun, 22 Apr 2012 17:39:45 -0430 Subject: [PATCH] Fixing broken test and coding standard --- lib/Cake/Routing/DispatcherFilter.php | 5 +++-- lib/Cake/Test/Case/Routing/DispatcherTest.php | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Cake/Routing/DispatcherFilter.php b/lib/Cake/Routing/DispatcherFilter.php index ae8509799..cf6f4fa51 100644 --- a/lib/Cake/Routing/DispatcherFilter.php +++ b/lib/Cake/Routing/DispatcherFilter.php @@ -81,5 +81,6 @@ abstract class DispatcherFilter implements CakeEventListener { * keys in the data property. * @return mixed boolean to stop the event dispatching or null to continue **/ - public function afterDispatch($event) {} -} \ No newline at end of file + public function afterDispatch($event) { + } +} diff --git a/lib/Cake/Test/Case/Routing/DispatcherTest.php b/lib/Cake/Test/Case/Routing/DispatcherTest.php index f3c3d685c..fd862e2b5 100644 --- a/lib/Cake/Test/Case/Routing/DispatcherTest.php +++ b/lib/Cake/Test/Case/Routing/DispatcherTest.php @@ -1291,7 +1291,8 @@ class DispatcherTest extends CakeTestCase { $response = $this->getMock('CakeResponse', array('send')); $dispatcher->dispatch($request, $response); $this->assertEmpty($dispatcher->controller); - $this->assertEquals(array('controller' => null, 'action' => null, 'plugin' => null), $request->params); + $expected = array('controller' => null, 'action' => null, 'plugin' => null, 'named' => array(), 'pass' => array()); + $this->assertEquals($expected, $request->params); $dispatcher = new TestDispatcher(); Configure::write('Dispatcher.filters', array(