Development

- Fixed: `RouteController` not matching certain urls.
- Made `RouteResource` more strict in url-matching.
- Added PHPUnit `RouterControllerTest` class.
- Fixed merged `testSimularUrls` method in `RouterUrlTest`.

src/Pecee/SimpleRouter/Route/RouteController.php

@@ -91,7 +91,7 @@ class RouteController extends LoadableRoute implements IControllerRoute
         /* Match global regular-expression for route */
         $regexMatch = $this->matchRegex($request, $url);
 
-        if ($regexMatch === false || stripos($url, $this->url) !== 0 || strtolower($url) !== strtolower($this->url)) {
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtolower($url) !== strtolower($this->url))) {
             return false;
         }
 

src/Pecee/SimpleRouter/Route/RouteResource.php

@@ -84,7 +84,7 @@ class RouteResource extends LoadableRoute implements IControllerRoute
         /* Match global regular-expression for route */
         $regexMatch = $this->matchRegex($request, $url);
 
-        if ($regexMatch === false) {
+        if ($regexMatch === false || (stripos($url, $this->url) !== 0 && strtolower($url) !== strtolower($this->url))) {
             return false;
         }
 

test/Dummy/DummyController.php

@@ -17,4 +17,19 @@ class DummyController
 		echo join(', ', func_get_args());
 	}
 
+	public function getTest()
+    {
+        echo 'getTest';
+    }
+
+    public function postTest()
+    {
+        echo 'postTest';
+    }
+
+    public function putTest()
+    {
+        echo 'putTest';
+    }
+
 }

test/RouterControllerTest.php

@@ -0,0 +1,42 @@
+<?php
+
+require_once 'Dummy/DummyController.php';
+require_once 'Helpers/TestRouter.php';
+
+class RouterControllerTest extends PHPUnit_Framework_TestCase
+{
+
+    public function testGet()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'get');
+
+        $this->assertEquals('getTest', $response);
+
+    }
+
+    public function testPost()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'post');
+
+        $this->assertEquals('postTest', $response);
+
+    }
+
+    public function testPut()
+    {
+        // Match normal route on alias
+        TestRouter::controller('/url', 'DummyController');
+
+        $response = TestRouter::debugOutput('/url/test', 'put');
+
+        $this->assertEquals('putTest', $response);
+
+    }
+
+}

test/RouterUrlTest.php

@@ -10,17 +10,15 @@ class RouterUrlTest extends PHPUnit_Framework_TestCase
 
     public function testSimularUrls()
     {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/url1');
-
         // Match normal route on alias
-        SimpleRouter::resource('/url11', 'DummyController@silent');
-        SimpleRouter::resource('/url1', 'DummyController@silent', ['as' => 'match']);
+        TestRouter::resource('/url11', 'DummyController@method1');
+        TestRouter::resource('/url1', 'DummyController@method1', ['as' => 'match']);
 
-        SimpleRouter::start();
+        TestRouter::debugNoReset('/url1', 'get');
 
-        $this->assertEquals($this->getUrl('match'), $this->getUrl());
+        $this->assertEquals(TestRouter::getUrl('match'), TestRouter::getUrl());
+
+        TestRouter::router()->reset();
     }
 
     public function testUrls()