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

Commit f5d9ab3

Browse files
committed
update for 2019.03.22 nightlies
1 parent 5484240 commit f5d9ab3

File tree

5 files changed

+26
-25
lines changed

5 files changed

+26
-25
lines changed

.travis.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ php --version
99
cd $(mktemp -d)
1010
curl https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
1111
)
12+
if (hhvm --version | grep -q -- -dev); then
13+
rm composer.lock
14+
fi
1215
composer install
1316

1417
hh_client
1518

16-
hhvm vendor/bin/hacktest tests/
17-
if !(hhvm --version | grep -q -- -dev); then
18-
hhvm vendor/bin/hhast-lint
19-
fi
19+
vendor/bin/hacktest tests/
20+
vendor/bin/hhast-lint
2021

2122
hhvm examples/dorm/codegen.php examples/dorm/demo/DormUserSchema.php
2223
if ! git diff --quiet; then

composer.lock

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

src/BaseCodeBuilder.hack

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ abstract class BaseCodeBuilder {
314314
// Continue if the line is empty
315315
continue;
316316
}
317-
invariant(is_string($line), 'For Hack');
317+
$line = $line as string;
318318
if (C\is_empty($final_lines)) {
319319
$final_lines[] = $line;
320320
} else {

src/CodegenShapeMember.hack

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
private mixed $type,
1919
) {
2020
invariant(
21-
is_string($type) || $type instanceof CodegenShape,
21+
$type is string || $type is CodegenShape,
2222
"You must provide either a string or shape",
2323
);
2424
}

src/key-value-render/HackBuilderShapeRenderer.hack

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ final class HackBuilderShapeRenderer
4343
$value_renderer instanceof IHackBuilderValueRenderer,
4444
'Value renderer for key "%s" is of type "%s", which is not a %s',
4545
$key,
46-
is_object($value_renderer)
46+
\is_object($value_renderer)
4747
? \get_class($value_renderer)
4848
: \gettype($value_renderer),
4949
IHackBuilderValueRenderer::class,

0 commit comments

Comments
 (0)