mirror of
https://github.com/skipperbent/simple-php-router.git
synced 2026-07-11 11:02:13 +00:00
Fixed to unit tests
This commit is contained in:
@@ -204,13 +204,16 @@ class RouterBase {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if($newRequest === null && $this->csrfVerifier !== null) {
|
if($newRequest === null) {
|
||||||
|
|
||||||
// Loop through each route-request
|
// Loop through each route-request
|
||||||
$this->processRoutes($this->routes);
|
$this->processRoutes($this->routes);
|
||||||
|
|
||||||
// Verify csrf token for request
|
if($this->csrfVerifier !== null) {
|
||||||
$this->csrfVerifier->handle($this->request);
|
|
||||||
|
// Verify csrf token for request
|
||||||
|
$this->csrfVerifier->handle($this->request);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$request = ($newRequest !== null) ? $newRequest : $request;
|
$request = ($newRequest !== null) ? $newRequest : $request;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ use Pecee\Http\Request;
|
|||||||
|
|
||||||
class DummyMiddleware implements IMiddleware {
|
class DummyMiddleware implements IMiddleware {
|
||||||
|
|
||||||
public function handle(Request $request) {
|
public function handle(Request $request, \Pecee\SimpleRouter\RouterEntry &$route = null) {
|
||||||
throw new MiddlewareLoadedException('Middleware loaded!');
|
throw new MiddlewareLoadedException('Middleware loaded!');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
class ExceptionHandler implements \Pecee\Handler\IExceptionHandler {
|
class ExceptionHandler implements \Pecee\Handler\IExceptionHandler {
|
||||||
|
|
||||||
public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\RouterEntry $router = null, \Exception $error){
|
public function handleError(\Pecee\Http\Request $request, \Pecee\SimpleRouter\RouterEntry &$route = null, \Exception $error){
|
||||||
throw $error;
|
throw $error;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -7,7 +7,7 @@ class GroupTest extends PHPUnit_Framework_TestCase {
|
|||||||
|
|
||||||
protected $result;
|
protected $result;
|
||||||
|
|
||||||
public function testGroup() {
|
public function testGroupLoad() {
|
||||||
|
|
||||||
$this->result = false;
|
$this->result = false;
|
||||||
|
|
||||||
@@ -18,7 +18,7 @@ class GroupTest extends PHPUnit_Framework_TestCase {
|
|||||||
try {
|
try {
|
||||||
\Pecee\SimpleRouter\SimpleRouter::start();
|
\Pecee\SimpleRouter\SimpleRouter::start();
|
||||||
} catch(Exception $e) {
|
} catch(Exception $e) {
|
||||||
|
echo $e->getMessage();
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->assertTrue($this->result);
|
$this->assertTrue($this->result);
|
||||||
|
|||||||
Reference in New Issue
Block a user