support older HHVM releases

is_vec_or_varray, is_dict_or_darray, is_any_array not available until HHVM 4.65

Author: jjergus

src/TypeSpec/__Private/ShapeSpec.hack

@@ -67,7 +67,7 @@ final class ShapeSpec extends TypeSpec<shape()> {
 
   <<__Override>>
   public function assertType(mixed $value): shape() {
-    if (!\HH\is_dict_or_darray($value)) {
+    if (!(\HH\is_php_array($value) || ($value is dict<_, _>))) {
       throw IncorrectTypeException::withValue(
         $this->getTrace(),
         'shape',
@@ -80,9 +80,7 @@ final class ShapeSpec extends TypeSpec<shape()> {
     foreach ($this->inners as $key => $spec) {
       $trace = $this->getTrace()->withFrame('shape['.$key.']');
       if (C\contains_key($value, $key)) {
-        // Using idx() even though we just checked the key's existence, to avoid
-        // a Hack error.
-        $out[$key] = $spec->withTrace($trace)->assertType(idx($value, $key));
+        $out[$key] = $spec->withTrace($trace)->assertType($value[$key] ?? null);
         continue;
       }
 

src/TypeSpec/__Private/TupleSpec.hack

@@ -22,7 +22,7 @@ final class TupleSpec extends TypeSpec<BogusTuple> {
 
   <<__Override>>
   public function coerceType(mixed $value): BogusTuple {
-    if (!\HH\is_vec_or_varray($value)) {
+    if (!(\HH\is_php_array($value) || ($value is vec<_>))) {
       throw
         TypeCoercionException::withValue($this->getTrace(), 'tuple', $value);
     }
@@ -49,13 +49,12 @@ final class TupleSpec extends TypeSpec<BogusTuple> {
 
   <<__Override>>
   public function assertType(mixed $value): BogusTuple {
-    if (!\HH\is_vec_or_varray($value)) {
+    if (\HH\is_php_array($value)) {
+      $value = vec($value);
+    } else if (!($value is vec<_>)) {
       throw
         IncorrectTypeException::withValue($this->getTrace(), 'tuple', $value);
     }
-    if (!$value is vec<_>) {
-      $value = vec($value);
-    }
     $values = $value;
 
     $count = \count($values);