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

Commit 5b6293b

Browse files
lexidorjjergus
authored andcommitted
Support disallow_array_literal (#8)
* Support `disallow_array_literal` * Enable strict options that introduce test failures * Require HHVM 4.25 for HHI support of array_literal * Test on composer.json version of hhvm
1 parent f80439f commit 5b6293b

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

.hhconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ enable_experimental_tc_features=shape_field_check,sealed_classes
88
user_attributes=
99
disable_primitive_refinement=true
1010
disable_static_local_variables = true
11+
disallow_array_literal = true

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ sudo: required
22
language: generic
33
services: docker
44
env:
5-
- HHVM_VERSION=4.13-latest
5+
- HHVM_VERSION=4.25-latest
66
- HHVM_VERSION=latest
77
- HHVM_VERSION=nightly
88
install:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"keywords": ["hack", "router", "routing", "hhvm"],
55
"homepage": "https://github.com/hhvm/hack-router-codegen",
66
"require": {
7-
"hhvm": "^4.13",
7+
"hhvm": "^4.25",
88
"facebook/hack-router": "^0.19",
99
"facebook/hack-http-request-response-interfaces": "^0.2",
1010
"facebook/hack-codegen": "^4.1.0",

src/Codegen.hack

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,10 +242,10 @@ final class Codegen {
242242
))
243243
->setDiscardChanges(Shapes::idx($this->config ?? shape(), 'discardChanges', false))
244244
->setGeneratedFrom($this->getGeneratedFrom());
245-
foreach ($config['trait']['requireExtends'] ?? [] as $what) {
245+
foreach ($config['trait']['requireExtends'] ?? varray[] as $what) {
246246
$builder->traitRequireExtends($what);
247247
}
248-
foreach ($config['trait']['requireImplements'] ?? [] as $what) {
248+
foreach ($config['trait']['requireImplements'] ?? varray[] as $what) {
249249
$builder->traitRequireImplements($what);
250250
}
251251

tests/RouterCLILookupCodegenBuilderTest.hack

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ final class RouterCLILookupCodegenBuilderTest extends BaseCodegenTestCase {
4444
));
4545

4646
$exit_code = null;
47-
$output = [];
47+
$output = varray[];
4848
\exec(
4949
\vsprintf(
5050
'%s -d hhvm.jit=0 %s %s',
@@ -67,7 +67,7 @@ final class RouterCLILookupCodegenBuilderTest extends BaseCodegenTestCase {
6767
await $this->rebuildAsync();
6868

6969
$exit_code = 0;
70-
$output = [];
70+
$output = varray[];
7171
\exec(
7272
\vsprintf(
7373
'%s -d hhvm.jit=0 %s /foo/bar',

tests/RouterCodegenBuilderTest.hack

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ final class RouterCodegenBuilderTest extends BaseCodegenTestCase {
131131
expect($controller)->toBeSame(GetRequestExampleController::class);
132132
$params = new RequestParameters(
133133
GetRequestExampleController::getUriPattern()->getParameters(),
134-
[],
134+
varray[],
135135
$params,
136136
);
137137
expect($params->getString('MyString'))->toBeSame('foo');

tests/TestTypechecksTestTrait.hack

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ trait TestTypechecksTestTrait {
1818
final public async function testTypechecks(): Awaitable<void> {
1919
await $this->rebuildAsync();
2020
$exit_code = 0;
21-
$out_array = [];
21+
$out_array = varray[];
2222
\exec(
2323
'hh_client',
2424
inout $out_array,

0 commit comments

Comments
 (0)