Merge pull request #15 from skipperbent/development

[BUGFIX] Bugfixes and optimisations

Author: skipperbent

composer.json

@@ -20,7 +20,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Pecee\\": "src/"
+            "Pecee\\": "src/Pecee/"
         }
     }
 }

src/Pecee/Http/Response.php

@@ -54,12 +54,11 @@ public function cache($duration = 2592000) {
     /**
      * 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();
     }
 
     /**

src/Pecee/SimpleRouter/RouterRoute.php

@@ -90,8 +90,8 @@ public function matchRoute(Request $request) {
                             }
                         }
 
-                        // 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 @@ public function setSettings($settings) {
         return parent::setSettings($settings);
     }
 
-
 }