Merge pull request #230 from skipperbent/v3-development

V3 development
Development
2026-06-17 16:57:53 +00:00 · 2017-03-06 02:56:37 +01:00 · 2017-03-06 02:53:44 +01:00 · 2017-03-06 02:21:13 +01:00
5 changed files with 72 additions and 2 deletions
@@ -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;
        }

@@ -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;
        }

@@ -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';
+    }
+
 }
@@ -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);
+
+    }
+
+}
@@ -8,6 +8,19 @@ require_once 'Helpers/TestRouter.php';
 class RouterUrlTest extends PHPUnit_Framework_TestCase
 {

+    public function testSimularUrls()
+    {
+        // Match normal route on alias
+        TestRouter::resource('/url11', 'DummyController@method1');
+        TestRouter::resource('/url1', 'DummyController@method1', ['as' => 'match']);
+
+        TestRouter::debugNoReset('/url1', 'get');
+
+        $this->assertEquals(TestRouter::getUrl('match'), TestRouter::getUrl());
+
+        TestRouter::router()->reset();
+    }
+
    public function testUrls()
    {
        // Match normal route on alias
Author	SHA1	Message	Date
Simon Sessingø	27ff761d18	Merge pull request #230 from skipperbent/v3-development V3 development	2017-03-06 02:56:37 +01:00
Simon Sessingø	0a58d36606	Development - Fixed: `RouteController` not matching certain urls. - Made `RouteResource` more strict in url-matching. - Added PHPUnit `RouterControllerTest` class. - Fixed merged `testSimularUrls` method in `RouterUrlTest`.	2017-03-06 02:53:44 +01:00
Simon Sessingø	db024b9588	Added simular routes PHPUnit test	2017-03-06 02:21:13 +01:00