Skip to content

Commit f0f6c9f

Browse files
committed
Revert "Revert "Update HHVM to 4.160 (#1220)" to test deploy"
This reverts commit 1071f1b.
1 parent c7137c2 commit f0f6c9f

File tree

12 files changed

+47
-45
lines changed

12 files changed

+47
-45
lines changed

.deploy/built-site.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Creates a docker image with a built copy of the site. Not repo-auth.
22
# Useful as a scratch/testing area.
3-
FROM hhvm/hhvm:4.154-latest
3+
FROM hhvm/hhvm:4.160-latest
44
ENV TZ UTC
55
ENV LANG en_US.UTF-8
66
ENV LANGUAGE en_US:en

.deploy/prod.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM hhvm/hhvm-proxygen:4.154-latest
1+
FROM hhvm/hhvm-proxygen:4.160-latest
22

33
ADD hhvm.prod.ini /etc/hhvm/site.ini
44
ADD hhvm.hhbc /var/www/hhvm.hhbc

.devcontainer/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM hhvm/hhvm-proxygen:4.154-latest
1+
FROM hhvm/hhvm-proxygen:4.160-latest
22

33
ARG WORKSPACE
44

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [ ubuntu ]
13-
hhvm: [ '4.154' ]
13+
hhvm: [ '4.160' ]
1414
runs-on: ${{matrix.os}}-latest
1515
steps:
1616
- uses: actions/checkout@v2

build/extracted-examples/guides/hack/16-readonly/04-explicit-readonly-keywords/readonly_coeffects.hack

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ class Foo {
1212
function read_static()[read_globals]: void {
1313
$y = readonly Foo::$bar; // keyword required
1414
}
15-
function read_static2()[controlled]: void {
15+
function read_static2()[leak_safe]: void {
1616
$y = readonly Foo::$bar; // keyword required
1717
}

build/extracted-examples/guides/hack/30-silencing-errors/05-error-codes/4005_array_access.hack renamed to build/extracted-examples/guides/hack/30-silencing-errors/05-error-codes/4324_array_access.hack

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
namespace HHVM\UserDocumentation\Guides\Hack\SilencingErrors\ErrorCodes\ArrayAccess;
55

66
function foo(int $m): void {
7-
/* HH_FIXME[4005] Indexing a type that isn't indexable. */
7+
/* HH_FIXME[4324] Indexing a type that isn't indexable. */
88
$value = $m['foo'];
99
}

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"facebook/xhp-lib": "^4.0",
4-
"hhvm": "4.154.*",
4+
"hhvm": "4.160.*",
55
"usox/hackttp": "~0.5.3",
66
"hhvm/hhvm-autoload": "^3.0",
77
"hhvm/type-assert": "^4.0",

composer.lock

+31-31
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

guides/hack/16-readonly/04-explicit-readonly-keywords.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function test(Foo $f): void {
3333
```
3434

3535
## Interactions with [Coeffects](https://docs.hhvm.com/hack/contexts-and-capabilities/available-contexts-and-capabilities)
36-
If your function has the `ReadGlobals` capability but not the `AccessGlobals` capability (i.e. is marked `read_globals` or `controlled`), it can only access class static variables if they are wrapped in a readonly expression:
36+
If your function has the `ReadGlobals` capability but not the `AccessGlobals` capability (i.e. is marked `read_globals` or `leak_safe`), it can only access class static variables if they are wrapped in a readonly expression:
3737

3838
``` Hack readonly_coeffects.hack
3939
<<file:__EnableUnstableFeatures("readonly")>>
@@ -45,7 +45,7 @@ class Foo {
4545
function read_static()[read_globals]: void {
4646
$y = readonly Foo::$bar; // keyword required
4747
}
48-
function read_static2()[controlled]: void {
48+
function read_static2()[leak_safe]: void {
4949
$y = readonly Foo::$bar; // keyword required
5050
}
5151
```

guides/hack/30-silencing-errors/05-error-codes.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ which the typechecker is unaware of.
5151
Suggestions: Check your spelling. Use safe Hack APIs rather than
5252
legacy PHP APIs.
5353

54-
## 4005: Array access on a type that doesn't support indexing
54+
## 4324: Array access on a type that doesn't support indexing
5555

56-
```4005_array_access.hack no-auto-output
56+
```4324_array_access.hack no-auto-output
5757
function foo(int $m): void {
58-
/* HH_FIXME[4005] Indexing a type that isn't indexable. */
58+
/* HH_FIXME[4324] Indexing a type that isn't indexable. */
5959
$value = $m['foo'];
6060
}
6161
```
@@ -67,6 +67,8 @@ leading to runtime type errors later.
6767
Suggestions: Refactor the code to use a Hack array or a
6868
`KeyedContainer`.
6969

70+
** Note:** In previous versions of HHVM, error `4324` was known as error `4005`.
71+
7072
## 4006: Array append on an inappropriate type
7173

7274
```4006_array_append.hack no-auto-output

src/codegen/PRODUCT_TAGS.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
/**
33
* This file is generated. Do not modify it manually!
44
*
5-
* @generated SignedSource<<cb1185ac93592547f05c7f139b42211d>>
5+
* @generated SignedSource<<3a5e67a90bcf26a3d8d406c0d568a52f>>
66
*/
77
namespace HHVM\UserDocumentation;
88

99
const dict<APIProduct, string> PRODUCT_TAGS = dict[
10-
APIProduct::HACK => 'HHVM-4.154.0',
10+
APIProduct::HACK => 'HHVM-4.160.0',
1111
APIProduct::HSL => 'v4.108.1',
1212
APIProduct::HSL_EXPERIMENTAL => 'v4.108.0',
1313
];

0 commit comments

Comments
 (0)