Merge pull request #25 from laminas/3.4.x-merge-up-into-3.5.x_5fda85f…

…63ffa09.47929395 Merge release 3.4.4 into 3.5.x
laminas · Dec 16, 2020 · de6610f · de6610f
2 parents 26e3a6a + bc7fb42
commit de6610f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,24 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 3.4.4 - 2020-12-16
+
+### Release Notes for [3.4.4](https://github.com/laminas/laminas-router/milestone/8)
+
+3.4.x bugfix release (patch)
+
+### 3.4.4
+
+- Total issues resolved: **1**
+- Total pull requests resolved: **1**
+- Total contributors: **1**
+
+#### Bug
+
+- [24: cast to string when calling rawurlencode() within Wildcard router](https://github.com/laminas/laminas-router/pull/24) thanks to @gkralik
+
+## 3.4.3 - 2020-12-07
+
 ### Fixed
 
 - Nothing.

diff --git a/src/Http/Wildcard.php b/src/Http/Wildcard.php
@@ -175,7 +175,7 @@ public function assemble(array $params = [], array $options = [])
                     continue;
                 }
 
-                $elements[] = rawurlencode($key) . $this->keyValueDelimiter . rawurlencode($value);
+                $elements[] = rawurlencode($key) . $this->keyValueDelimiter . rawurlencode((string) $value);
                 $this->assembledParams[] = $key;
             }
 

diff --git a/test/Http/WildcardTest.php b/test/Http/WildcardTest.php
@@ -83,6 +83,12 @@ public static function routeProvider()
                 null,
                 ['foo' => 'foo bar']
             ],
+            'params-contain-non-string-scalar-values' => [
+                new Wildcard(),
+                '/int_param/42/float_param/4.2',
+                null,
+                ['int_param' => 42, 'float_param' => 4.2]
+            ],
         ];
     }