Fix issue in Routing where a url with 2 params which were given equal…

… values would not be recognized.

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Parable PHP Framework Changelog
 
+### 0.9.6
+
+__Bugfixes__
+- `\Parable\Routing\Route` now injects parameters correctly. This fixes a rare bug where a url with `/a/{id}/b/{name}` would fail if both `$id` and `$name` had the same value.
+
 ### 0.9.5
 
 __Changes__

src/Framework/App.php

@@ -35,7 +35,7 @@ class App
     protected $database;
 
     /** @var string */
-    protected $version = '0.9.5';
+    protected $version = '0.9.6';
 
     public function __construct(
         \Parable\Filesystem\Path $path,

src/Routing/Route.php

@@ -151,10 +151,11 @@ protected function checkParameterValueType($name, $value)
     protected function injectParameters($url)
     {
         $urlParts = explode('/', $url);
-        $parameters = array_flip($this->values);
-        foreach ($urlParts as &$part) {
-            if (isset($parameters[$part])) {
-                $part = '{' . ltrim($parameters[$part], '{}') . '}';
+
+        foreach ($this->values as $key => $value) {
+            $foundKey = array_search($value, $urlParts);
+            if ($foundKey !== false) {
+                $urlParts[$foundKey] = '{' . ltrim($key, '{}') . '}';
             }
         }
         return implode('/', $urlParts);
@@ -201,6 +202,7 @@ public function matchWithParameters($url)
             return false;
         }
         $correctedUrl = $this->injectParameters($url);
+
         if ($this->matchDirectly($correctedUrl)) {
             return true;
         }