Fix broken code that assumes array keys are strings (#120)

Fix broken code that assumes array keys are strings see #119
thephpleague · Sep 8, 2023 · 656e759 · 656e759
1 parent d912b61
commit 656e759
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/uri/UriTemplate/Expression.php b/uri/UriTemplate/Expression.php
@@ -37,10 +37,12 @@ final class Expression
     private function __construct(public readonly Operator $operator, VarSpecifier ...$varSpecifiers)
     {
         $this->varSpecifiers = $varSpecifiers;
-        $this->variableNames = array_keys(array_fill_keys(
-            array_map(static fn (VarSpecifier $varSpecifier): string => $varSpecifier->name, $varSpecifiers),
-            1
-        ));
+        $this->variableNames = array_unique(
+            array_map(
+                static fn (VarSpecifier $varSpecifier): string => $varSpecifier->name,
+                $varSpecifiers
+            )
+        );
         $this->value = '{'.$operator->value.implode(',', array_map(
             static fn (VarSpecifier $varSpecifier): string => $varSpecifier->toString(),
             $varSpecifiers

diff --git a/uri/UriTemplate/Template.php b/uri/UriTemplate/Template.php
@@ -43,14 +43,14 @@ final class Template implements Stringable
     private function __construct(public readonly string $value, Expression ...$expressions)
     {
         $this->expressions = $expressions;
-        $this->variableNames = array_keys(array_reduce(
-            $expressions,
-            fn (array $curry, Expression $expression): array => [
-                ...$curry,
-                ...array_fill_keys($expression->variableNames, 1),
-            ],
-            []
-        ));
+        $this->variableNames = array_unique(
+            array_merge(
+                ...array_map(
+                    static fn (Expression $expression): array => $expression->variableNames,
+                    $expressions
+                )
+            )
+        );
     }
 
     /**

diff --git a/uri/UriTemplate/TemplateTest.php b/uri/UriTemplate/TemplateTest.php
@@ -144,8 +144,8 @@ public static function expectedVariableNames(): iterable
                 'expected' => [],
             ],
             [
-                'template' => '{foo}{bar}',
-                'expected' => ['foo', 'bar'],
+                'template' => '{foo}{bar}{420}',
+                'expected' => ['foo', 'bar', '420'],
             ],
             [
                 'template' => '{foo}{foo:2}{+foo}',