Replace static local with a a caching mechanism that actually works

It was never initialized :/ whoops
hhvm · Mar 26, 2019 · d22d3e2 · d22d3e2
1 parent a8c2ce9
commit d22d3e2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/.hhconfig b/.hhconfig
@@ -7,3 +7,4 @@ decl_override_require_hint=true
 enable_experimental_tc_features=shape_field_check,sealed_classes
 user_attributes=
 disable_primitive_refinement=true
+disable_static_local_variables = true
diff --git a/composer.lock b/composer.lock
diff --git a/src/router/BaseRouter.php b/src/router/BaseRouter.php
@@ -56,11 +56,11 @@ final public function routeRequest(
     return $this->routeMethodAndPath($method, $request->getUri()->getPath());
   }
 
+  private ?IResolver<TResponder> $resolver = null;
+
   protected function getResolver(): IResolver<TResponder> {
-    // Don't use <<__Memoize>> because that can be surprising with subclassing
-    static $resolver = null;
-    if ($resolver !== null) {
-      return $resolver;
+    if ($this->resolver !== null) {
+      return $this->resolver;
     }
 
     if (is_dev()) {
@@ -84,6 +84,7 @@ protected function getResolver(): IResolver<TResponder> {
         \apc_store(__FILE__.'/cache', $routes);
       }
     }
-    return new PrefixMatchingResolver($routes);
+    $this->resolver = new PrefixMatchingResolver($routes);
+    return $this->resolver;
   }
 }