support and require HHVM 4.45

don't use array functions that were added later (e.g. is_any_array)
hhvm · Aug 17, 2020 · 1282974 · 1282974
1 parent 2cecd71
commit 1282974
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ sudo: required
 language: generic
 services: docker
 env:
-- HHVM_VERSION=4.25-latest
+- HHVM_VERSION=4.45-latest
 - HHVM_VERSION=latest
 - HHVM_VERSION=nightly
 install:

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
   "description": "Unit test helpers for Facebook projects",
   "license": "MIT",
   "require": {
-    "hhvm": "^4.25",
+    "hhvm": "^4.45",
     "hhvm/hacktest": "^1.0|^2.0",
     "hhvm/hsl": "^4.0",
     "facebook/difflib": "^1.0.0"

diff --git a/src/utils.hack b/src/utils.hack
@@ -10,7 +10,11 @@
 namespace Facebook\FBExpect;
 
 function is_any_array(mixed $value): bool {
-  return \HH\is_any_array($value);
+  return
+    \HH\is_php_array($value) ||
+    ($value is dict<_, _>) ||
+    ($value is vec<_>) ||
+    ($value is keyset<_>);
 }
 
 function print_type(mixed $value): string {
@@ -21,7 +25,7 @@ function print_type(mixed $value): string {
 }
 
 function is_iterable(mixed $value): bool {
-  return \HH\is_any_array($value) ||
+  return is_any_array($value) ||
     (\is_object($value) && ($value is Traversable<_>));
 }