wpstudio/majestic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace Exception on PHPUnit_Framework_Error

Browse Source
This commit is contained in:
Vyacheslav Agafonov
2011-11-24 19:12:53 +04:00
parent 25ba2abf54
commit bdae057a8e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/router/Route.php
View File

@ -32,11 +32,10 @@ class Route
{ {
$parts = explode('/', $this->route); $parts = explode('/', $this->route);
$cnt = count($parts); $cnt = count($parts);
if(count($request) != $cnt) { if(count($request) != $cnt) {
return false; return false;
} }
for ($i = 0; $i < $cnt; $i++) { for ($i = 0; $i < $cnt; $i++) {
if (substr($parts[$i], 0, 1) == ':') { if (substr($parts[$i], 0, 1) == ':') {
$this->params[substr($parts[$i], 1)] = urldecode($request[$i]); $this->params[substr($parts[$i], 1)] = urldecode($request[$i]);
@ -52,6 +51,7 @@ class Route
return false; return false;
} }
} }
return true; return true;
} }

3
tests/app/router/RouteTest.php
View File

@ -69,7 +69,8 @@ class RouteTest extends PHPUnit_Framework_TestCase
} }
/** /**
* @expectedException Exception * @expectedException PHPUnit_Framework_Error
* @TODO Need check empty parameters from constructor Route
*/ */
public function testMatchEmptyRequest() public function testMatchEmptyRequest()
{ {