Merge pull request #18 from skipperbent/development

[OPTIMISATION] Optimised router handling - router will now use the or…
[OPTIMISATION] Optimised router handling - router will now use the order provided when loading routes.
2026-06-18 09:17:52 +00:00 · 2015-10-27 14:02:57 +01:00 · 2015-10-27 14:01:19 +01:00 · 2015-10-27 11:06:36 +01:00 · 2015-10-27 10:35:57 +01:00 · 2015-10-27 10:29:40 +01:00
5 changed files with 13 additions and 14 deletions
@@ -20,7 +20,7 @@
    },
    "autoload": {
        "psr-4": {
-            "Pecee\\": "src/"
+            "Pecee\\": "src/Pecee/"
        }
    }
 }
@@ -10,7 +10,7 @@ class Request {

    public function __construct() {
        $this->host = $_SERVER['HTTP_HOST'];
-        $this->uri = rtrim($_SERVER['REQUEST_URI'], '/') . '/';
+        $this->uri = $_SERVER['REQUEST_URI'];
        $this->method = (isset($_POST['_method'])) ? strtolower($_POST['_method']) : strtolower($_SERVER['REQUEST_METHOD']);
        $this->headers = getallheaders();
    }
@@ -54,12 +54,11 @@ class Response {
    /**
     * Json encode array
     * @param array $value
-     * @return self $this
     */
    public function json(array $value) {
        $this->header('Content-type: application/json');
        echo json_encode($value);
-        return $this;
+        die();
    }

    /**
@@ -100,11 +100,6 @@ class RouterBase {
        // Loop through each route-request
        $this->processRoutes($this->routes);

-        // Make sure the urls is in the right order when comparing
-        usort($this->controllerUrlMap, function($a, $b) {
-            return strcmp($b->getUrl(), $a->getUrl());
-        });
-
        $routeNotAllowed = false;

        /* @var $route RouterEntry */
@@ -230,6 +225,11 @@ class RouterBase {
                    $url = str_ireplace('{' . $param. '}', $value, $url);
                    $i++;
                }
+            } else {
+                // If no parameters are specified in the route, assume that the provided parameters should be used.
+                if(count($parameters)) {
+                    $url = rtrim($url, '/') . '/' . join('/', $parameters);
+                }
            }
        }

@@ -19,6 +19,7 @@ class RouterRoute extends RouterEntry {
    }

    protected function parseParameters($url, $multiple = false, $regex = self::PARAMETERS_REGEX_MATCH) {
+        $url = rtrim($url, '/');
        $parameters = array();

        if($multiple) {
@@ -48,7 +49,7 @@ class RouterRoute extends RouterEntry {
        // Check if url parameter count matches
        if(stripos($url, $routeMatch) === 0) {

-            $matches = true;
+            $matches = (count(explode('/', rtrim($url, '/'))) == count(explode('/', rtrim($route, '/'))));

            if($this->regexMatch) {
                $parameters = $this->parseParameters($url, true, $this->regexMatch);
@@ -61,7 +62,7 @@ class RouterRoute extends RouterEntry {
            } else {

                $url = explode('/', $url);
-                $route = explode('/', $route);
+                $route = explode('/', rtrim($route, '/'));

                $parameters = array();

@@ -90,8 +91,8 @@ class RouterRoute extends RouterEntry {
                            }
                        }

-                        // Add parameter value
-                        $parameters[$parameter] = $parameterValue;
+                        // Add parameter value, if it doesn't exist - replace it with null value
+                        $parameters[$parameter] = ($parameterValue === '') ? null : $parameterValue;
                    }
                }
            }
@@ -160,5 +161,4 @@ class RouterRoute extends RouterEntry {
        return parent::setSettings($settings);
    }

-
 }
Author	SHA1	Message	Date
Simon Sessingø	969b64650e	Merge pull request #18 from skipperbent/development [OPTIMISATION] Optimised router handling - router will now use the or…	2015-10-27 14:02:57 +01:00
Simon Sessingø	c2cf2334e7	[OPTIMISATION] Optimised router handling - router will now use the order provided when loading routes.	2015-10-27 14:01:19 +01:00
Simon Sessingø	af730e6e15	Merge pull request #17 from skipperbent/development Development	2015-10-27 11:06:36 +01:00
Simon Sessingø	f5a32cf520	[BUGFIX] Fixed router paths.	2015-10-27 10:35:57 +01:00
Simon Sessingø	1843ea0594	[BUGFIX] Fixed routes always matching /show/{id} when other routes are added.	2015-10-27 10:29:40 +01:00
Simon Sessingø	fd28f4549f	Merge pull request #16 from skipperbent/development [BUGFIX] Bugfixes	2015-10-25 15:31:15 +01:00
Simon Sessingø	5e5a424ee8	[BUGFIX] Bugfixes - getUri() method in Request class no longer appends "/". - Optimised parseParameters method in RouterRoute class for regex matches.	2015-10-25 15:29:14 +01:00
Simon Sessingø	099f04fc10	Merge pull request #15 from skipperbent/development [BUGFIX] Bugfixes and optimisations	2015-10-25 02:35:49 +02:00
Simon Sessingø	ac2993f804	[BUGFIX] Bugfixes and optimisations - When no parameter is recieved, router now returns null instead of empty string. - json method in Response class now stops response after execution. - Updated composer.json with correct autoload.	2015-10-25 02:34:25 +02:00
Simon Sessingø	99da70874e	Merge pull request #14 from skipperbent/development [BUGFIX] Fixed missing "/" in getRoute on some rare occasions.	2015-10-24 23:24:52 +02:00
Simon Sessingø	2a66350883	[BUGFIX] Fixed missing "/" in getRoute on some rare occasions.	2015-10-24 23:24:06 +02:00
Simon Sessingø	c95a5291d3	Merge pull request #13 from skipperbent/development [OPTIMISATION] getRoute optimisation	2015-10-24 23:21:23 +02:00
Simon Sessingø	20fc067765	[FEATURE] If no parameters are specified in the route, getRoute will now add the parameters provided to the method instead.	2015-10-24 23:18:16 +02:00