Merge pull request #59 from betsyalegria/revert-rm-arrayconstraint

Revert changes that removed ArrayConstraint coercion

Author: ianhoffman

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

@@ -8,7 +8,7 @@ jobs:
       # Run tests on all OS's and HHVM versions, even if one fails
       fail-fast: false
       matrix:
-        os: [ubuntu]
+        os: [ ubuntu ]
         hhvm:
           - "4.128"
     runs-on: ${{matrix.os}}-latest

src/Constraints/ArrayConstraint.php

@@ -3,7 +3,8 @@
 namespace Slack\Hack\JsonSchema\Constraints;
 
 use namespace HH\Lib\Str;
-use namespace Facebook\{TypeAssert, TypeSpec};
+use type Facebook\TypeAssert\{TypeCoercionException};
+use namespace Facebook\TypeSpec;
 use namespace Slack\Hack\JsonSchema;
 
 class ArrayConstraint {
@@ -25,8 +26,9 @@ public static function check(mixed $input, string $pointer, bool $coerce): vec<m
 
     $spec = TypeSpec\vec(TypeSpec\mixed());
     try {
-      return $spec->assertType($input);
-    } catch (TypeAssert\IncorrectTypeException $e) {
+      # To allow for either PHP or hack arrays, we coerce to a vec here.
+      return $spec->coerceType($input);
+    } catch (TypeCoercionException $e) {
       $error = shape(
         'code' => JsonSchema\FieldErrorCode::INVALID_TYPE,
         'message' => 'must provide an array',

tests/ArraySchemaValidatorTest.php

@@ -18,7 +18,7 @@ final class ArraySchemaValidatorTest extends BaseCodegenTestCase {
   }
 
   public function testArrayOfStringsInvalidRoot(): void {
-    $validator = new ArraySchemaValidator(vec['test', 'list', 'of', 'strings']);
+    $validator = new ArraySchemaValidator(varray['test', 'list', 'of', 'strings']);
     $validator->validate();
 
     expect($validator->isValid())->toBeFalse();
@@ -36,26 +36,28 @@ public function testArrayOfStringsValid(): void {
   }
 
   public function testArrayOfStringsLegacyArrays(): void {
-    $validator = new ArraySchemaValidator(darray['array_of_strings' => vec['test', 'list', 'of', 'strings']]);
+    $validator = new ArraySchemaValidator(darray['array_of_strings' => varray['test', 'list', 'of', 'strings']]);
     $validator->validate();
 
     expect($validator->isValid())->toBeTrue();
     $validated = $validator->getValidatedInput();
     expect(C\count($validated['array_of_strings'] ?? vec[]))->toBeSame(4);
   }
 
-  public function testDictOfStringsInvalid(): void {
+  public function testArrayOfStringsLegacyAndHackArrays(): void {
     $validator = new ArraySchemaValidator(dict[
-      'array_of_strings' => dict['test' => 'test'],
+      'array_of_strings' => varray['test', 'list', 'of', 'strings'],
     ]);
     $validator->validate();
 
-    expect($validator->isValid())->toBeFalse();
+    expect($validator->isValid())->toBeTrue();
+    $validated = $validator->getValidatedInput();
+    expect(C\count($validated['array_of_strings'] ?? vec[]))->toBeSame(4);
   }
 
   public function testUntypedArrayValid(): void {
     $validator = new ArraySchemaValidator(dict[
-      'untyped_array' => vec['test', 'values'],
+      'untyped_array' => varray['test', 'values'],
     ]);
     $validator->validate();
 

tests/DiscardAddititionalPropertiesValidatorTest.php

@@ -61,7 +61,7 @@ public function testAdditionalProperitesRef(): void {
     $input = dict[
       'additional_properties_ref' => dict[
         'something' => dict[
-          'something-else' => vec['array', 'of', 'strings'],
+          'something-else' => varray['array', 'of', 'strings'],
         ],
       ],
     ];
@@ -73,7 +73,7 @@ public function testAdditionalProperitesRef(): void {
     $input = dict[
       'additional_properties_ref' => dict[
         'something' => dict[
-          'something-else' => vec[34, 'of', 'strings'],
+          'something-else' => varray[34, 'of', 'strings'],
         ],
       ],
     ];

tests/ObjectSchemaValidatorTest.php

@@ -486,7 +486,7 @@ public function testNoAdditionalProperties(): void {
   public function testAdditionalProperitesArray(): void {
     $input = dict[
       'additional_properties_array' => dict[
-        'something' => vec['array', 'of', 'strings'],
+        'something' => varray['array', 'of', 'strings'],
       ],
     ];
 
@@ -496,7 +496,7 @@ public function testAdditionalProperitesArray(): void {
 
     $input = dict[
       'additional_properties_array' => dict[
-        'something' => vec[34, 'of', 'strings'],
+        'something' => varray[34, 'of', 'strings'],
       ],
     ];
 
@@ -509,7 +509,7 @@ public function testAdditionalProperitesRef(): void {
     $input = dict[
       'additional_properties_ref' => dict[
         'something' => dict[
-          'something-else' => vec['array', 'of', 'strings'],
+          'something-else' => varray['array', 'of', 'strings'],
         ],
       ],
     ];
@@ -521,7 +521,7 @@ public function testAdditionalProperitesRef(): void {
     $input = dict[
       'additional_properties_ref' => dict[
         'something' => dict[
-          'something-else' => vec[34, 'of', 'strings'],
+          'something-else' => varray[34, 'of', 'strings'],
         ],
       ],
     ];

tests/RefSchemaValidatorTest.php

@@ -64,7 +64,7 @@ public function testUniqueRefs(): void {
       ),
       shape(
         'input' => darray[
-          'single-item-array-ref' => vec[
+          'single-item-array-ref' => varray[
             darray['string' => 'test', 'integer' => 5],
             darray['string' => 'test2', 'integer' => 10],
           ],