Merge pull request #15 from skipperbent/development

[BUGFIX] Bugfixes and optimisations
2026-06-23 11:39:15 +00:00 · 2015-10-25 02:35:49 +02:00 · 2015-10-25 02:34:25 +02:00 · 2015-10-24 23:24:52 +02:00 · 2015-10-24 23:24:06 +02:00
4 changed files with 5 additions and 7 deletions
@@ -20,7 +20,7 @@
    },
    "autoload": {
        "psr-4": {
-            "Pecee\\": "src/"
+            "Pecee\\": "src/Pecee/"
        }
    }
 }
@@ -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();
    }

    /**
@@ -233,7 +233,7 @@ class RouterBase {
            } else {
                // If no parameters are specified in the route, assume that the provided parameters should be used.
                if(count($parameters)) {
-                    $url .= join('/', $parameters);
+                    $url = rtrim($url, '/') . '/' . join('/', $parameters);
                }
            }
        }
@@ -90,8 +90,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 +160,4 @@ class RouterRoute extends RouterEntry {
        return parent::setSettings($settings);
    }

-
 }
Author	SHA1	Message	Date
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