Suggested constructor signature changes

hhvm · May 25, 2023 · 8c86992 · 8c86992
1 parent af6b6ea
commit 8c86992
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/router/BaseRouter.php b/src/router/BaseRouter.php
@@ -14,9 +14,12 @@
 use function Facebook\AutoloadMap\Generated\is_dev;
 
 abstract class BaseRouter<+TResponder> {
-  public function __construct(
-    private BaseRouterOptions $options = shape('use_get_responder_for_head' => true)
-  ) {}
+  private bool $useGetResponderForHead;
+
+  public function __construct(?BaseRouterOptions $options = null) {
+    $this->useGetResponderForHead =
+      Shapes::idx($options, 'use_get_responder_for_head', true);
+  }
 
   abstract protected function getRoutes(
   ): KeyedContainer<HttpMethod, KeyedContainer<string, TResponder>>;
@@ -37,7 +40,9 @@ final public function routeMethodAndPath(
       }
 
       if (
-        $this->options['use_get_responder_for_head'] && $method === HttpMethod::HEAD && $allowed === keyset[HttpMethod::GET]
+        $this->useGetResponderForHead &&
+        $method === HttpMethod::HEAD &&
+        $allowed === keyset[HttpMethod::GET]
       ) {
         list($responder, $data) = $resolver->resolve(HttpMethod::GET, $path);
         $data = Dict\map($data, \urldecode<>);

diff --git a/src/router/BaseRouterOptions.php b/src/router/BaseRouterOptions.php
@@ -12,5 +12,5 @@
 namespace Facebook\HackRouter;
 
 type BaseRouterOptions = shape(
-  'use_get_responder_for_head' => bool,
+  ?'use_get_responder_for_head' => bool,
 );