Support 3.24, require 3.23+

hhvm · Jan 9, 2018 · 85736d0 · 85736d0
1 parent f9b7882
commit 85736d0
Show file tree

Hide file tree

Showing 9 changed files with 104 additions and 95 deletions.
diff --git a/.hhconfig b/.hhconfig
@@ -1 +1,2 @@
 assume_php=false
+enable_experimental_tc_features = safe_pass_by_ref, safe_array, safe_vector_array, contextual_inference
diff --git a/.travis.sh b/.travis.sh
@@ -10,3 +10,6 @@ hhvm /usr/local/bin/composer install
 hh_server --check $(pwd)
 hhvm -d hhvm.php7.all=0 vendor/bin/phpunit tests/
 hhvm -d hhvm.php7.all=1 vendor/bin/phpunit tests/
+
+sed -i '/enable_experimental_tc_features/d' .hhconfig
+hh_server --check $(pwd)
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,7 @@ language: generic
 services:
  - docker
 env:
+ - HHVM_VERSION=latest
  - HHVM_VERSION=nightly
 install:
  - docker pull hhvm/hhvm:$HHVM_VERSION

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
     "homepage": "https://github.com/hhvm/hack-router-codegen",
     "require": {
         "hhvm": "^3.23.0",
-        "facebook/hack-router": "^0.10",
+        "facebook/hack-router": "^0.11",
         "facebook/hack-codegen": "^3.0.1",
         "facebook/definition-finder": "^1.5.3",
         "hhvm/type-assert": "^3.0"

diff --git a/composer.lock b/composer.lock
diff --git a/src/UriMapBuilder.php b/src/UriMapBuilder.php
@@ -43,7 +43,7 @@ public function getUriMap(
     }
 
     foreach ($map as $submap) {
-      natsort($submap);
+      natsort(&$submap);
     }
 
     return $map

diff --git a/tests/RouterCLILookupCodegenBuilderTest.php b/tests/RouterCLILookupCodegenBuilderTest.php
@@ -55,8 +55,8 @@ public function testCanLookupExampleController(): void {
           $path,
         })->map($x ==> escapeshellarg($x)),
       ),
-      $output,
-      $exit_code,
+      &$output,
+      &$exit_code,
     );
     $output = implode("\n", $output);
     $this->assertSame(0, $exit_code);
@@ -83,8 +83,8 @@ public function testCantLookupInvalidPath(): void {
           self::CODEGEN_PATH,
         })->map($x ==> escapeshellarg($x)),
       ),
-      $output,
-      $exit_code,
+      &$output,
+      &$exit_code,
     );
     $output = implode("\n", $output);
     $this->assertGreaterThan(0, $exit_code);

diff --git a/tests/TestTypechecksTestTrait.php b/tests/TestTypechecksTestTrait.php
@@ -22,8 +22,8 @@ final public function testTypechecks(): void {
     $out_array = [];
     exec(
       'hh_client',
-      $out_array,
-      $exit_code,
+      &$out_array,
+      &$exit_code,
     );
     $this->assertSame(0, $exit_code, "Typechecker errors found");
   }

diff --git a/tests/examples/codegen/lookup-path.php b/tests/examples/codegen/lookup-path.php
@@ -32,7 +32,7 @@ private function prettifyControllerName(string $controller): string {
       'Too few NS parts found; expected everything to be in example NS',
     );
     $first = $parts[0];
-    $last = array_pop($parts);
+    $last = array_pop(&$parts);
     return '\\'.$first.'\\...\\'.$last;
     /* END MANUAL SECTION */
   }