Merge pull request #71 from slackhq/ih_bugfix_merged_shapes

Bugfix: Alias merged allOf checks to the merged schema type

Author: ianhoffman

src/Codegen/Constraints/UntypedBuilder.php

@@ -337,6 +337,7 @@ public function getMergedAllOfChecks(): ?TSchema {
   private function generateMergedAllOfChecks(TSchema $schema, HackBuilder $hb): void {
     $schema_builder = new SchemaBuilder($this->ctx, $this->generateClassName($this->suffix, 'allOf'), $schema);
     $schema_builder->build();
+    $this->type_info = $schema_builder->getTypeInfo();
     $hb->addReturnf('%s::check($input, $pointer)', $schema_builder->getClassName());
   }
 

tests/examples/codegen/ExamplesAllofSchema1.php

@@ -5,7 +5,7 @@
  * To re-generate this file run `make test`
  *
  *
- * @generated SignedSource<<d86fe60f9a4b277d13542c3017f28e35>>
+ * @generated SignedSource<<391cff06fb3f584b3ca4670e891301d7>>
  */
 namespace Slack\Hack\JsonSchema\Tests\Generated;
 use namespace Slack\Hack\JsonSchema;
@@ -16,7 +16,7 @@
   'foo' => int,
 );
 
-type TExamplesAllofSchema1 = mixed;
+type TExamplesAllofSchema1 = TExamplesAllofSchema1AllOf;
 
 final class ExamplesAllofSchema1AllOfPropertiesBar {
 

tests/examples/codegen/ExamplesAllofSchema2.php

@@ -5,7 +5,7 @@
  * To re-generate this file run `make test`
  *
  *
- * @generated SignedSource<<337da92c52d98e9210c707a6ff9bd4a9>>
+ * @generated SignedSource<<aaac02e5d111884d1e116a9c82ca0dad>>
  */
 namespace Slack\Hack\JsonSchema\Tests\Generated;
 use namespace Slack\Hack\JsonSchema;
@@ -17,7 +17,7 @@
   'foo' => int,
 );
 
-type TExamplesAllofSchema2AllOfPropertiesXsItems = mixed;
+type TExamplesAllofSchema2AllOfPropertiesXsItems = TExamplesAllofSchema2AllOfPropertiesXsItemsAllOf;
 
 type TExamplesAllofSchema2AllOfPropertiesSimpleObjectProp2 = shape(
   'prop_1' => int,
@@ -33,7 +33,7 @@
   'foo' => int,
 );
 
-type TExamplesAllofSchema2 = mixed;
+type TExamplesAllofSchema2 = TExamplesAllofSchema2AllOf;
 
 final class ExamplesAllofSchema2AllOfPropertiesBaz {