Skip to content
This repository was archived by the owner on Aug 1, 2023. It is now read-only.

Commit 85736d0

Browse files
committed
Support 3.24, require 3.23+
1 parent f9b7882 commit 85736d0

File tree

9 files changed

+104
-95
lines changed

9 files changed

+104
-95
lines changed

.hhconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
assume_php=false
2+
enable_experimental_tc_features = safe_pass_by_ref, safe_array, safe_vector_array, contextual_inference

.travis.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ hhvm /usr/local/bin/composer install
1010
hh_server --check $(pwd)
1111
hhvm -d hhvm.php7.all=0 vendor/bin/phpunit tests/
1212
hhvm -d hhvm.php7.all=1 vendor/bin/phpunit tests/
13+
14+
sed -i '/enable_experimental_tc_features/d' .hhconfig
15+
hh_server --check $(pwd)

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ language: generic
33
services:
44
- docker
55
env:
6+
- HHVM_VERSION=latest
67
- HHVM_VERSION=nightly
78
install:
89
- docker pull hhvm/hhvm:$HHVM_VERSION

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"homepage": "https://github.com/hhvm/hack-router-codegen",
66
"require": {
77
"hhvm": "^3.23.0",
8-
"facebook/hack-router": "^0.10",
8+
"facebook/hack-router": "^0.11",
99
"facebook/hack-codegen": "^3.0.1",
1010
"facebook/definition-finder": "^1.5.3",
1111
"hhvm/type-assert": "^3.0"

composer.lock

Lines changed: 90 additions & 86 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/UriMapBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function getUriMap(
4343
}
4444

4545
foreach ($map as $submap) {
46-
natsort($submap);
46+
natsort(&$submap);
4747
}
4848

4949
return $map

tests/RouterCLILookupCodegenBuilderTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ public function testCanLookupExampleController(): void {
5555
$path,
5656
})->map($x ==> escapeshellarg($x)),
5757
),
58-
$output,
59-
$exit_code,
58+
&$output,
59+
&$exit_code,
6060
);
6161
$output = implode("\n", $output);
6262
$this->assertSame(0, $exit_code);
@@ -83,8 +83,8 @@ public function testCantLookupInvalidPath(): void {
8383
self::CODEGEN_PATH,
8484
})->map($x ==> escapeshellarg($x)),
8585
),
86-
$output,
87-
$exit_code,
86+
&$output,
87+
&$exit_code,
8888
);
8989
$output = implode("\n", $output);
9090
$this->assertGreaterThan(0, $exit_code);

tests/TestTypechecksTestTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ final public function testTypechecks(): void {
2222
$out_array = [];
2323
exec(
2424
'hh_client',
25-
$out_array,
26-
$exit_code,
25+
&$out_array,
26+
&$exit_code,
2727
);
2828
$this->assertSame(0, $exit_code, "Typechecker errors found");
2929
}

tests/examples/codegen/lookup-path.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ private function prettifyControllerName(string $controller): string {
3232
'Too few NS parts found; expected everything to be in example NS',
3333
);
3434
$first = $parts[0];
35-
$last = array_pop($parts);
35+
$last = array_pop(&$parts);
3636
return '\\'.$first.'\\...\\'.$last;
3737
/* END MANUAL SECTION */
3838
}

0 commit comments

Comments
 (0)