fix some PHP arrays creeping through

hhvm · Oct 23, 2017 · 1ef6cd8 · 1ef6cd8
1 parent c240b92
commit 1ef6cd8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/src/router/BaseRouter.php b/src/router/BaseRouter.php
@@ -35,6 +35,7 @@ final public function routeRequest(
         try {
           list($responder, $data) = $resolver->resolve($next, $path);
           if ($method === HttpMethod::HEAD && $next === HttpMethod::GET) {
+            $data = Dict\map($data, $value ==> urldecode($value));
             return tuple($responder, new ImmMap($data));
           }
           throw new MethodNotAllowedException();

diff --git a/src/router/FastRouteResolver.php b/src/router/FastRouteResolver.php
@@ -49,7 +49,7 @@ public function resolve(
       case \FastRoute\Dispatcher::FOUND:
         return tuple(
           $route[1],
-          $route[2],
+          dict($route[2]),
         );
     }
 

diff --git a/tests/RouterTest.php b/tests/RouterTest.php
@@ -157,10 +157,20 @@ public function testAllResolvers(
     dict<string, string> $expected_data,
   ): void {
     list($responder, $data) = $this->getRouter()->setResolver(
-      $resolver
+      $resolver,
     )->routeRequest(HttpMethod::GET, $in);
     expect($responder)->toBeSame($expected_responder);
     expect(dict($data))->toBeSame($expected_data);
+
+    list($responder, $data) = $resolver->resolve(HttpMethod::GET, $in);
+    expect($responder)->toBeSame($expected_responder);
+    expect($data)->toBeSame(dict($data));
+
+    list($responder, $data) = $this->getRouter()->setResolver(
+      $resolver,
+    )->routeRequest(HttpMethod::HEAD, $in);
+    expect($responder)->toBeSame($expected_responder);
+    expect(dict($data))->toBeSame($expected_data);
   }
 
   /**