Fix issue #32: Canonicalize URL before matching

ChangeLog.md

@@ -5,6 +5,7 @@ Web change log
 
 ## 0.11.0 / 2018-01-21
 
+* Fixed issue #32: Canonicalize URL before matching - @thekid
 * Changed handler return type from `void` to `var` and ensured anything
   returned from a handler will be returned from routing and filters.
   Implements functionality suggested in #31

composer.json

@@ -8,7 +8,7 @@
   "require" : {
     "xp-framework/core": "^9.0 | ^8.0 | ^7.0",
     "xp-framework/networking": "^9.0 | ^8.0 | ^7.0",
-    "xp-forge/uri": "^1.0",
+    "xp-forge/uri": "^1.2",
     "php": ">=5.6.0"
   },
   "require-dev" : {

src/main/php/web/Request.class.php

@@ -32,7 +32,7 @@ public function __construct(Input $input) {
     }
 
     $this->method= $input->method();
-    $this->uri= new URI($input->scheme().'://'.$this->header('Host', 'localhost').$input->uri());
+    $this->uri= (new URI($input->scheme().'://'.$this->header('Host', 'localhost').$input->uri()))->canonicalize();
     $this->input= $input;
   }
 

src/test/php/web/unittest/RoutingTest.class.php

@@ -148,4 +148,16 @@ public function with($verb, $expected) {
       ->route(new Request(new TestInput($verb, '/')))
     );
   }
+
+  #[@test, @values([
+  #  '/api',
+  #  '//api', '///api',
+  #  '/test/../api', '/./api',
+  #  '/../api', '/./../api',
+  #])]
+  public function request_canonicalized_before_matching($requested) {
+    $this->assertEquals($this->handlers['specific'], Routing::cast(['/api' => $this->handlers['specific']])
+      ->route(new Request(new TestInput('GET', $requested)))
+    );
+  }
 }