0 should be allowed as an expandable value (#21)

Co-authored-by: Antoine Wattier <wattier@adobe.com>
guzzle · Aug 27, 2023 · 2573d77 · 2573d77
1 parent a6a9904
commit 2573d77
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/UriTemplate.php b/src/UriTemplate.php
@@ -206,7 +206,7 @@ private static function expandMatch(array $matches, array $variables): string
             }
 
             if ($actuallyUseQuery) {
-                if (!$expanded && $joiner !== '&') {
+                if ($expanded === '' && $joiner !== '&') {
                     $expanded = $value['value'];
                 } else {
                     $expanded = \sprintf('%s=%s', $value['value'], $expanded);

diff --git a/tests/UriTemplateTest.php b/tests/UriTemplateTest.php
@@ -22,6 +22,7 @@ public function templateProvider(): array
             'x' => '1024',
             'y' => 768,
             'null' => null,
+            'zero' => 0,
             'list' => ['red', 'green', 'blue'],
             'keys' => [
                 'semi' => ';',
@@ -56,6 +57,7 @@ public function templateProvider(): array
                ['{/var}',              '/value'],
                ['{/var,x}/here',       '/value/1024/here'],
                ['{;x,y}',              ';x=1024;y=768'],
+               ['{;zero}',             ';zero=0'],
                ['{;x,y,empty}',        ';x=1024;y=768;empty'],
                ['{?x,y}',              '?x=1024&y=768'],
                ['{?x,y,empty}',        '?x=1024&y=768&empty='],