Merge pull request #209 from skipperbent/v2-development

Fixed getExtension method in InputFile retuning empty value.

src/Pecee/Http/Input/InputFile.php

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

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 = '';
-
-        $parameters = (array)$parameters;
+        $url = $this->getUrl();
 
         if ($this->getGroup() !== null && count($this->getGroup()->getDomains()) > 0) {
-            $url .= '//' . $this->getGroup()->getDomains()[0];
+            $url = '//' . $this->getGroup()->getDomains()[0] . $url;
         }
 
-        $url .= $this->getUrl();
-
-        $params = array_merge($this->getParameters(), $parameters);
-
-        /* Url that contains parameters that aren't recognized */
+        /* Contains parameters that aren't recognized and will be appended at the end of the url */
         $unknownParams = [];
 
-        /* Create the param string - {} */
+        /* Create the param string - {parameter} */
         $param1 = $this->paramModifiers[0] . '%s' . $this->paramModifiers[1];
 
-        /* Create the param string with the optional symbol - {?} */
+        /* Create the param string with the optional symbol - {parameter?} */
         $param2 = $this->paramModifiers[0] . '%s' . $this->paramOptionalSymbol . $this->paramModifiers[1];
 
-        /* Let's parse the values of any {} parameter in the url */
+        /* Replace any {parameter} in the url with the correct value */
 
+        $params = $this->getParameters();
         $max = count($params) - 1;
         $keys = array_keys($params);
 
         for ($i = $max; $i >= 0; $i--) {
             $param = $keys[$i];
-            $value = $params[$param];
+            $value = $value = ($parameters !== null && array_key_exists($param, $parameters)) ? $parameters[$param] : $params[$param];
 
-            $value = isset($parameters[$param]) ? $parameters[$param] : $value;
+            /* If parameter is specifically set to null - use the original-defined value */
+            if ($value === null && isset($this->originalParameters[$param])) {
+                $value = $this->originalParameters[$param];
+            }
 
             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

@@ -402,7 +402,7 @@ abstract class Route implements IRoute
      */
     public function where(array $options)
     {
-        return $this->where($options);
+        return $this->setWhere($options);
     }
 
     /**

test/RouterUrlTest.php

@@ -99,4 +99,16 @@ 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();
+
+    }
+
 }