Merge pull request #200 from skipperbent/v2-development

Optimised route-match behavior

src/Pecee/Http/Input/Input.php

@@ -267,21 +267,29 @@ class Input
      */
     public function all(array $filter = null)
     {
-        $output = $_GET;
+        $output = $_POST;
 
         if ($this->request->getMethod() === 'post') {
 
             $contents = file_get_contents('php://input');
 
             if (strpos(trim($contents), '{') === 0) {
-                $post = json_decode($contents, true);
-                if ($post !== false) {
-                    $output = array_merge($output, $post);
+                $output = json_decode($contents, true);
+                if ($output === false) {
+                    $output = [];
                 }
             }
         }
 
-        return ($filter !== null) ? array_intersect_key($output, array_flip($filter)) : $output;
+        $output = array_merge($_GET, $output);
+
+        if ($filter !== null) {
+            $output = array_filter($output, function ($key) use ($filter) {
+                return (in_array($key, $filter) === true);
+            }, ARRAY_FILTER_USE_KEY);
+        }
+
+        return $output;
     }
 
 }

src/Pecee/Http/Input/InputFile.php

@@ -127,7 +127,7 @@ class InputFile implements IInputItem
      */
     public function getExtension()
     {
-        return pathinfo($this->getFilename(), PATHINFO_EXTENSION);
+        return pathinfo($this->getName(), PATHINFO_EXTENSION);
     }
 
     /**

src/Pecee/Http/Request.php

@@ -18,7 +18,7 @@ class Request
         $this->host = $this->getHeader('http-host');
         $this->uri = $this->getHeader('request-uri');
         $this->input = new Input($this);
-        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method')));
+        $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
     }
 
     protected function parseHeaders()

src/Pecee/Http/Response.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Pecee\Http;
 
 class Response
@@ -83,20 +82,14 @@ class Response
     }
 
     /**
-     * Json encode
-     * @param array|\JsonSerializable $value
-     * @param int $options JSON options Bitmask consisting of JSON_HEX_QUOT, JSON_HEX_TAG, JSON_HEX_AMP, JSON_HEX_APOS, JSON_NUMERIC_CHECK, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, JSON_FORCE_OBJECT, JSON_PRESERVE_ZERO_FRACTION, JSON_UNESCAPED_UNICODE, JSON_PARTIAL_OUTPUT_ON_ERROR.
-     * @param int $dept JSON debt.
-     * @throws \InvalidArgumentException
+     * Json encode array
+     * @param array $value
      */
-    public function json($value, $options = null, $dept = 512)
+    public function json(array $value)
     {
-        if (($value instanceof \JsonSerializable) === false && is_array($value) === false) {
-            throw new \InvalidArgumentException('Invalid type for parameter "value". Must be of type array or object implementing the \JsonSerializable interface.');
-        }
-        $this->header('Content-Type: application/json; charset=utf-8');
-        echo json_encode($value, $options, $dept);
-        exit(0);
+        $this->header('Content-Type: application/json');
+        echo json_encode($value);
+        die();
     }
 
     /**

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -107,48 +107,48 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
      */
     public function findUrl($method = null, $parameters = null, $name = null)
     {
-        $url = $this->getUrl();
+        $url = '';
+
+        $parameters = (array)$parameters;
 
         if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-            $url = '//' . $this->getGroup()->getDomains()[0] . $url;
+            $url .= '//' . $this->getGroup()->getDomains()[0];
         }
 
-        /* Contains parameters that aren't recognized and will be appended at the end of the url */
+        $url .= $this->getUrl();
+
+        $params = array_merge($this->getParameters(), $parameters);
+
+        /* Url that contains parameters that aren't recognized */
         $unknownParams = [];
 
-        /* Create the param string - {parameter} */
+        /* Create the param string - {} */
         $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];
 
-        /* Create the param string with the optional symbol - {parameter?} */
+        /* Create the param string with the optional symbol - {?} */
         $param2 = $this->paramModifiers[0] . '%s' . $this->paramOptionalSymbol . $this->paramModifiers[1];
 
-        /* Replace any {parameter} in the url with the correct value */
+        /* Let's parse the values of any {} parameter in the url */
 
-        $params = $this->getParameters();
         $max = count($params) - 1;
         $keys = array_keys($params);
 
         for ($i = $max; $i >= 0; $i--) {
             $param = $keys[$i];
-            $value = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$param] : $params[$param];
+            $value = $params[$param];
 
-            /* If parameter is specifically set to null - use the original-defined value */
-            if ($value === null && isset($this->originalParameters[$param])) {
-                $value = $this->originalParameters[$param];
-            }
+            $value = isset($parameters[$param]) ? $parameters[$param] : $value;
 
             if (stripos($url, $param1) !== false || stripos($url, $param) !== false) {
-                /* Add parameter to the correct position */
                 $url = str_ireplace([sprintf($param1, $param), sprintf($param2, $param)], $value, $url);
             } else {
                 $unknownParams[$param] = $value;
             }
         }
 
+        /** @noinspection AliasFunctionsUsageInspection */
         $url .= join('/', $unknownParams);
 
-
-
         return rtrim($url, '/') . '/';
     }
 

src/Pecee/SimpleRouter/Route/Route.php

@@ -124,7 +124,7 @@ abstract class Route implements IRoute
 
             /* Only take matched parameters with name */
             foreach ($parameters[1] as $name) {
-                $values[$name] = (isset($matches[$name]) && $matches[$name] !== '') ? $matches[$name] : null;
+                $values[$name] = isset($matches[$name]) ? $matches[$name] : null;
             }
 
             return $values;
@@ -402,7 +402,7 @@ abstract class Route implements IRoute
      */
     public function where(array $options)
     {
-        return $this->setWhere($options);
+        return $this->where($options);
     }
 
     /**

test/RouterUrlTest.php

@@ -99,16 +99,4 @@ class RouterUrlTest extends PHPUnit_Framework_TestCase
 
     }
 
-    public function testRegEx()
-    {
-        SimpleRouter::router()->reset();
-        SimpleRouter::request()->setMethod('get');
-        SimpleRouter::request()->setUri('/my/custom-path');
-
-        SimpleRouter::get('/my/{path}', 'DummyController@start')->where(['path' => '[a-zA-Z\-]+']);
-
-        SimpleRouter::start();
-
-    }
-
 }