darray and varray permit zero type arguments in non-strict files

Reviewed By: KendallHopkins

Differential Revision: D5023838

fbshipit-source-id: 218d2014a31f62bada2384165247ccdb932ba8f0

hphp/hack/src/naming/naming.ml

@@ -930,7 +930,10 @@ module Make (GetLocals : GetLocals) = struct
             TypecheckerOptions.experimental_darray_and_varray in
         if not darray_and_varray_allowed then Errors.darray_not_supported p;
         Some (match hl with
-          | []
+          | [] ->
+              if (fst env).in_mode = FileInfo.Mstrict then
+                Errors.too_few_type_arguments p;
+              N.Hdarray ((p, N.Hany), (p, N.Hany))
           | [_] -> Errors.too_few_type_arguments p; N.Hany
           | [key_; val_] -> N.Hdarray (hint env key_, hint env val_)
           | _ -> Errors.too_many_type_arguments p; N.Hany)
@@ -941,7 +944,10 @@ module Make (GetLocals : GetLocals) = struct
             TypecheckerOptions.experimental_darray_and_varray in
         if not darray_and_varray_allowed then Errors.varray_not_supported p;
         Some (match hl with
-          | [] -> Errors.too_few_type_arguments p; N.Hany
+          | [] ->
+              if (fst env).in_mode = FileInfo.Mstrict then
+                Errors.too_few_type_arguments p;
+              N.Hvarray (p, N.Hany)
           | [val_] -> N.Hvarray (hint env val_)
           | _ -> Errors.too_many_type_arguments p; N.Hany)
       | nm when nm = SN.Typehints.integer ->

hphp/hack/test/typecheck/array/allow_zero_type_parameters_for_non_strict_darray.php

@@ -0,0 +1,5 @@
+<?hh
+
+function test(): darray {
+  return darray[];
+}

hphp/hack/test/typecheck/array/allow_zero_type_parameters_for_non_strict_darray.php.exp

@@ -0,0 +1 @@
+No errors

hphp/hack/test/typecheck/array/allow_zero_type_parameters_for_non_strict_varray.php

@@ -0,0 +1,5 @@
+<?hh
+
+function test(): varray {
+  return varray[0, 1, 2];
+}

hphp/hack/test/typecheck/array/allow_zero_type_parameters_for_non_strict_varray.php.exp

@@ -0,0 +1 @@
+No errors

hphp/hack/test/typecheck/array/disallow_zero_type_parameters_for_darray.php

@@ -1,4 +1,4 @@
-<?hh
+<?hh // strict
 
 function test(): darray {
   return darray[];

hphp/hack/test/typecheck/array/disallow_zero_type_parameters_for_varray.php

@@ -1,4 +1,4 @@
-<?hh
+<?hh // strict
 
 function test(): varray {
   return varray[0, 1, 2];