Merge pull request #279 from skipperbent/v3-development

V3 development

src/Pecee/Http/Request.php

@@ -30,7 +30,10 @@ class Request
     {
         $this->parseHeaders();
         $this->setHost($this->getHeader('http-host'));
-        $this->setUri(new Uri($this->getHeader('request-uri')));
+
+        // Check if special IIS header exist, otherwise use default.
+        $this->setUri(new Uri($this->getHeader('unencoded-url', $this->getHeader('request-uri'))));
+
         $this->input = new Input($this);
         $this->method = strtolower($this->input->get('_method', $this->getHeader('request-method'), 'post'));
     }
@@ -164,7 +167,7 @@ class Request
      */
     public function getHeader($name, $defaultValue = null)
     {
-        if (isset($this->headers[strtolower($name)])) {
+        if (array_key_exists(strtolower($name), $this->headers) === true) {
             return $this->headers[strtolower($name)];
         }
 

src/Pecee/SimpleRouter/Route/LoadableRoute.php

@@ -74,7 +74,7 @@ abstract class LoadableRoute extends Route implements ILoadableRoute
 
             $regex = sprintf(static::PARAMETERS_REGEX_FORMAT, $this->paramModifiers[0], $this->paramOptionalSymbol, $this->paramModifiers[1]);
 
-            if (preg_match_all('/' . $regex . '/', $this->url, $matches)) {
+            if (preg_match_all('/' . $regex . '/u', $this->url, $matches)) {
                 $this->parameters = array_fill_keys($matches[1], null);
             }
         }

src/Pecee/SimpleRouter/Route/Route.php

@@ -116,7 +116,7 @@ abstract class Route implements IRoute
         // Ensures that hostnames/domains will work with parameters
         $url = '/' . ltrim($url, '/');
 
-        if (preg_match_all('/' . $regex . '/', $route, $parameters)) {
+        if (preg_match_all('/' . $regex . '/u', $route, $parameters)) {
 
             $urlParts = preg_split('/((\-?\/?)\{[^}]+\})/', rtrim($route, '/'));
 
@@ -154,7 +154,7 @@ abstract class Route implements IRoute
             $urlRegex = preg_quote($route, '/');
         }
 
-        if (preg_match('/^' . $urlRegex . '\/?$/', $url, $matches) > 0) {
+        if (preg_match('/^' . $urlRegex . '\/?$/u', $url, $matches) > 0) {
 
             $values = [];
 

test/RouterUrlTest.php

@@ -31,7 +31,7 @@ class RouterUrlTest extends PHPUnit_Framework_TestCase
     public function testUnicodeCharacters()
     {
         // Test spanish characters
-        TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-\í]+']);
+        TestRouter::get('/cursos/listado/{listado?}/{category?}', 'DummyController@method1', ['defaultParameterRegex' => '[\w\p{L}\s-]+']);
         TestRouter::debugNoReset('/cursos/listado/especialidad/cirugía local', 'get');
         $this->assertEquals('/cursos/listado/{listado?}/{category?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());