Revert "Revert "Update HHVM to 4.160 (#1220)" to test deploy"

Wilfred · Wilfred · commit f0f6c9fa8329 · 2022-06-02T17:34:19.000-07:00
This reverts commit 1071f1b.
diff --git a/.deploy/built-site.Dockerfile b/.deploy/built-site.Dockerfile
@@ -1,6 +1,6 @@
 # Creates a docker image with a built copy of the site. Not repo-auth.
 # Useful as a scratch/testing area.
-FROM hhvm/hhvm:4.154-latest
+FROM hhvm/hhvm:4.160-latest
 ENV TZ UTC
 ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
diff --git a/.deploy/prod.Dockerfile b/.deploy/prod.Dockerfile
@@ -1,4 +1,4 @@
-FROM hhvm/hhvm-proxygen:4.154-latest
+FROM hhvm/hhvm-proxygen:4.160-latest
 
 ADD hhvm.prod.ini /etc/hhvm/site.ini
 ADD hhvm.hhbc /var/www/hhvm.hhbc
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM hhvm/hhvm-proxygen:4.154-latest
+FROM hhvm/hhvm-proxygen:4.160-latest
 
 ARG WORKSPACE
 
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu ]
-        hhvm: [ '4.154' ]
+        hhvm: [ '4.160' ]
     runs-on: ${{matrix.os}}-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/build/extracted-examples/guides/hack/16-readonly/04-explicit-readonly-keywords/readonly_coeffects.hack b/build/extracted-examples/guides/hack/16-readonly/04-explicit-readonly-keywords/readonly_coeffects.hack
@@ -12,6 +12,6 @@ class Foo {
 function read_static()[read_globals]: void {
   $y = readonly Foo::$bar; // keyword required
 }
-function read_static2()[controlled]: void {
+function read_static2()[leak_safe]: void {
   $y = readonly Foo::$bar; // keyword required
 }
diff --git a/build/extracted-examples/guides/hack/30-silencing-errors/05-error-codes/4324_array_access.hack b/build/extracted-examples/guides/hack/30-silencing-errors/05-error-codes/4324_array_access.hack
@@ -4,6 +4,6 @@
 namespace HHVM\UserDocumentation\Guides\Hack\SilencingErrors\ErrorCodes\ArrayAccess;
 
 function foo(int $m): void {
-  /* HH_FIXME[4005] Indexing a type that isn't indexable. */
+  /* HH_FIXME[4324] Indexing a type that isn't indexable. */
   $value = $m['foo'];
 }
diff --git a/build/extracted-examples/guides/hack/30-silencing-errors/05-error-codes/4324_array_access.hack.hhvm.expect b/build/extracted-examples/guides/hack/30-silencing-errors/05-error-codes/4324_array_access.hack.hhvm.expect
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "require": {
         "facebook/xhp-lib": "^4.0",
-        "hhvm": "4.154.*",
+        "hhvm": "4.160.*",
         "usox/hackttp": "~0.5.3",
         "hhvm/hhvm-autoload": "^3.0",
         "hhvm/type-assert": "^4.0",
diff --git a/composer.lock b/composer.lock
diff --git a/guides/hack/16-readonly/04-explicit-readonly-keywords.md b/guides/hack/16-readonly/04-explicit-readonly-keywords.md
@@ -33,7 +33,7 @@ function test(Foo $f): void {
 ```
 
 ## Interactions with [Coeffects](https://docs.hhvm.com/hack/contexts-and-capabilities/available-contexts-and-capabilities)
-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:
+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:
 
 ``` Hack readonly_coeffects.hack
 <<file:__EnableUnstableFeatures("readonly")>> 
@@ -45,7 +45,7 @@ class Foo {
 function read_static()[read_globals]: void {
   $y = readonly Foo::$bar; // keyword required
 }
-function read_static2()[controlled]: void {
+function read_static2()[leak_safe]: void {
   $y = readonly Foo::$bar; // keyword required
 }
 ```
diff --git a/guides/hack/30-silencing-errors/05-error-codes.md b/guides/hack/30-silencing-errors/05-error-codes.md
@@ -51,11 +51,11 @@ which the typechecker is unaware of.
 Suggestions: Check your spelling. Use safe Hack APIs rather than
 legacy PHP APIs.
 
-## 4005: Array access on a type that doesn't support indexing
+## 4324: Array access on a type that doesn't support indexing
 
-```4005_array_access.hack no-auto-output
+```4324_array_access.hack no-auto-output
 function foo(int $m): void {
-  /* HH_FIXME[4005] Indexing a type that isn't indexable. */
+  /* HH_FIXME[4324] Indexing a type that isn't indexable. */
   $value = $m['foo'];
 }
 ```
@@ -67,6 +67,8 @@ leading to runtime type errors later.
 Suggestions: Refactor the code to use a Hack array or a
 `KeyedContainer`.
 
+** Note:** In previous versions of HHVM, error `4324` was known as error `4005`.
+
 ## 4006: Array append on an inappropriate type
 
 ```4006_array_append.hack no-auto-output
diff --git a/src/codegen/PRODUCT_TAGS.php b/src/codegen/PRODUCT_TAGS.php
@@ -2,12 +2,12 @@
 /**
  * This file is generated. Do not modify it manually!
  *
- * @generated SignedSource<<cb1185ac93592547f05c7f139b42211d>>
+ * @generated SignedSource<<3a5e67a90bcf26a3d8d406c0d568a52f>>
  */
 namespace HHVM\UserDocumentation;
 
 const dict<APIProduct, string> PRODUCT_TAGS = dict[
-  APIProduct::HACK => 'HHVM-4.154.0',
+  APIProduct::HACK => 'HHVM-4.160.0',
   APIProduct::HSL => 'v4.108.1',
   APIProduct::HSL_EXPERIMENTAL => 'v4.108.0',
 ];

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM hhvm/hhvm-proxygen:4.154-latest`
	`1`	`+FROM hhvm/hhvm-proxygen:4.160-latest`
`2`	`2`
`3`	`3`	`ADD hhvm.prod.ini /etc/hhvm/site.ini`
`4`	`4`	`ADD hhvm.hhbc /var/www/hhvm.hhbc`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ class Foo {`
`12`	`12`	`function read_static()[read_globals]: void {`
`13`	`13`	`$y = readonly Foo::$bar; // keyword required`
`14`	`14`	`}`
`15`		`-function read_static2()[controlled]: void {`
	`15`	`+function read_static2()[leak_safe]: void {`
`16`	`16`	`$y = readonly Foo::$bar; // keyword required`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@`
`4`	`4`	`namespace HHVM\UserDocumentation\Guides\Hack\SilencingErrors\ErrorCodes\ArrayAccess;`
`5`	`5`
`6`	`6`	`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. */`
`8`	`8`	`$value = $m['foo'];`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"require": {`
`3`	`3`	`"facebook/xhp-lib": "^4.0",`
`4`		`- "hhvm": "4.154.*",`
	`4`	`+ "hhvm": "4.160.*",`
`5`	`5`	`"usox/hackttp": "~0.5.3",`
`6`	`6`	`"hhvm/hhvm-autoload": "^3.0",`
`7`	`7`	`"hhvm/type-assert": "^4.0",`