Browse Source

replace Exception on PHPUnit_Framework_Error

master
Vyacheslav Agafonov 13 years ago
parent
commit
bdae057a8e
  1. 4
      app/router/Route.php
  2. 3
      tests/app/router/RouteTest.php

4
app/router/Route.php

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

3
tests/app/router/RouteTest.php

@ -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()
{

Loading…
Cancel
Save