Require hhvm 4.128 and support autoloading with ext_watchman

The hsl is always built-in.
ext_watchman and HH\Facts are always available.
varray eq vec and darray eq dict is always true.
All legacy arrays have been replaced with Hack arrays.

Author: lexidor

.gitattributes

@@ -2,3 +2,4 @@ tests/ export-ignore
 examples/ export-ignore
 data/ export-ignore
 .hhconfig export-ignore
+.hhvmconfig.hdf export-ignore

.github/workflows/build-and-test.yml

@@ -13,7 +13,7 @@ jobs:
       matrix:
         os: [ ubuntu ]
         hhvm:
-          - '4.102'
+          - '4.128'
           - latest
           - nightly
     runs-on: ${{matrix.os}}-latest

.hhvmconfig.hdf

@@ -0,0 +1,3 @@
+Autoload {
+  Query = {"expression": ["allof", ["type", "f"], ["suffix", ["anyof", "hack", "php"]], ["not",["anyof",["dirname",".var"],["dirname",".git"]]]]}
+}

composer.json

@@ -5,8 +5,7 @@
   "keywords": ["hack", "router", "routing", "hhvm"],
   "homepage": "https://github.com/hhvm/hack-router",
   "require": {
-    "hhvm": "^4.102",
-    "hhvm/hsl": "^4.0",
+    "hhvm": "^4.128",
     "facebook/hack-http-request-response-interfaces": "^0.2|^0.3"
   },
   "extra": {

hh_autoload.json

@@ -5,5 +5,6 @@
   "devRoots": [
     "tests/"
   ],
-  "devFailureHandler": "Facebook\\AutoloadMap\\HHClientFallbackHandler"
+  "devFailureHandler": "Facebook\\AutoloadMap\\HHClientFallbackHandler",
+  "useFactsIfAvailable": true
 }

src/router/PrefixMatchingResolver.php

@@ -62,7 +62,7 @@ private function resolveWithMap(
     $regexps = $map->getRegexps();
     foreach ($regexps as $regexp => $_sub_map) {
       $pattern = '#^'.$regexp.'#';
-      $matches = varray[];
+      $matches = dict[];
 
       if (\preg_match_with_matches($pattern, $path, inout $matches) !== 1) {
         continue;

src/router/SimpleRegexpResolver.php

@@ -33,7 +33,7 @@ public function resolve(
     }
     $map = $this->map[$method];
     foreach ($map as $regexp => $responder) {
-      $matches = varray[];
+      $matches = dict[];
       if (\preg_match_with_matches($regexp, $path, inout $matches) !== 1) {
         continue;
       }

src/router/UnknownRouterException.php

@@ -11,13 +11,13 @@
 namespace Facebook\HackRouter;
 
 class UnknownRouterException extends InternalServerErrorException {
-  public function __construct(private varray<mixed> $fastRouteData) {
+  public function __construct(private vec<mixed> $fastRouteData) {
     parent::__construct(
       'Unknown FastRoute response: '.\var_export($fastRouteData, true),
     );
   }
 
-  public function getFastRouteData(): varray<mixed> {
+  public function getFastRouteData(): vec<mixed> {
     return $this->fastRouteData;
   }
 }

tests/ParserTest.php

@@ -14,8 +14,8 @@
 use type Facebook\HackTest\DataProvider;
 
 final class ParserTest extends \Facebook\HackTest\HackTest {
-  public function getExamplePatterns(): varray<(string, string)> {
-    return varray[
+  public function getExamplePatterns(): vec<(string, string)> {
+    return vec[
       tuple('/foo', "['/foo']"),
       tuple('/foo/{bar}', "['/foo/', {bar}]"),
       tuple('/foo/[{bar}]', "['/foo/', ?[{bar}]]"),

tests/RequestParametersTest.php

@@ -15,38 +15,37 @@
 
 final class RequestParametersTest extends \Facebook\HackTest\HackTest {
   public function testStringParam(): void {
-    $parts = varray[new StringRequestParameter(
+    $parts = vec[new StringRequestParameter(
       StringRequestParameterSlashes::WITHOUT_SLASHES,
       'foo',
     )];
     $data = dict['foo' => 'bar'];
-    expect((new RequestParameters($parts, varray[], $data))->getString('foo'))
+    expect((new RequestParameters($parts, vec[], $data))->getString('foo'))
       ->toBeSame('bar');
   }
 
   public function testIntParam(): void {
-    $parts = varray[new IntRequestParameter('foo')];
+    $parts = vec[new IntRequestParameter('foo')];
     $data = dict['foo' => '123'];
-    expect((new RequestParameters($parts, varray[], $data))->getInt('foo'))->toBeSame(
-      123,
-    );
+    expect((new RequestParameters($parts, vec[], $data))->getInt('foo'))
+      ->toBeSame(123);
   }
 
   public function testFetchingStringAsInt(): void {
     expect(() ==> {
-      $parts = varray[new StringRequestParameter(
+      $parts = vec[new StringRequestParameter(
         StringRequestParameterSlashes::WITHOUT_SLASHES,
         'foo',
       )];
       $data = dict['foo' => 'bar'];
-      (new RequestParameters($parts, varray[], $data))->getInt('foo');
+      (new RequestParameters($parts, vec[], $data))->getInt('foo');
     })->toThrow(InvariantException::class);
   }
 
   public function testEnumParam(): void {
-    $parts = varray[new EnumRequestParameter(TestIntEnum::class, 'foo')];
+    $parts = vec[new EnumRequestParameter(TestIntEnum::class, 'foo')];
     $data = dict['foo' => (string)TestIntEnum::BAR];
-    $value = (new RequestParameters($parts, varray[], $data))->getEnum(
+    $value = (new RequestParameters($parts, vec[], $data))->getEnum(
       TestIntEnum::class,
       'foo',
     );
@@ -85,7 +84,7 @@ public function testFromPattern(): void {
       'bar' => '123',
       'baz' => (string)TestIntEnum::FOO,
     ];
-    $params = new RequestParameters($parts, varray[], $data);
+    $params = new RequestParameters($parts, vec[], $data);
     expect($params->getString('foo'))->toBeSame('some string');
     expect($params->getInt('bar'))->toBeSame(123);
     expect($params->getEnum(TestIntEnum::class, 'baz'))->toBeSame(
@@ -95,8 +94,8 @@ public function testFromPattern(): void {
 
   public function testGetOptional(): void {
     $params = new RequestParameters(
-      varray[],
-      varray[new StringRequestParameter(
+      vec[],
+      vec[new StringRequestParameter(
         StringRequestParameterSlashes::WITHOUT_SLASHES,
         'foo',
       )],
@@ -107,8 +106,8 @@ public function testGetOptional(): void {
 
   public function testGetMissingOptional(): void {
     $params = new RequestParameters(
-      varray[],
-      varray[new StringRequestParameter(
+      vec[],
+      vec[new StringRequestParameter(
         StringRequestParameterSlashes::WITHOUT_SLASHES,
         'foo',
       )],
@@ -120,8 +119,8 @@ public function testGetMissingOptional(): void {
   public function testGetOptionalAsRequired(): void {
     expect(() ==> {
       $params = new RequestParameters(
-        varray[],
-        varray[new StringRequestParameter(
+        vec[],
+        vec[new StringRequestParameter(
           StringRequestParameterSlashes::WITHOUT_SLASHES,
           'foo',
         )],
@@ -134,11 +133,11 @@ public function testGetOptionalAsRequired(): void {
   public function testGetRequiredAsOptional(): void {
     expect(() ==> {
       $params = new RequestParameters(
-        varray[new StringRequestParameter(
+        vec[new StringRequestParameter(
           StringRequestParameterSlashes::WITHOUT_SLASHES,
           'foo',
         )],
-        varray[],
+        vec[],
         dict['foo' => 'bar'],
       );
       $params->getOptionalString('foo');