Fix context of getResourceFieldConfiguration when a property is a subresource

alanpoulain · alanpoulain · commit f5906337b17f · 2018-08-22T19:11:15.000+02:00
diff --git a/src/GraphQl/Type/SchemaBuilder.php b/src/GraphQl/Type/SchemaBuilder.php
@@ -448,9 +448,15 @@ private function getResourceObjectTypeFields(string $resourceClass, ResourceMeta
                 continue;
             }
 
-            if ($fieldConfiguration = $this->getResourceFieldConfiguration($resourceClass, $resourceMetadata, $propertyMetadata->getDescription(), $propertyMetadata->getAttribute('deprecation_reason', ''), $propertyType, $resourceClass, $input, $mutationName, ++$depth)) {
+            $rootResource = $resourceClass;
+            if (null !== $propertyMetadata->getSubresource()) {
+                $resourceClass = $propertyMetadata->getSubresource()->getResourceClass();
+                $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);
+            }
+            if ($fieldConfiguration = $this->getResourceFieldConfiguration($resourceClass, $resourceMetadata, $propertyMetadata->getDescription(), $propertyMetadata->getAttribute('deprecation_reason', ''), $propertyType, $rootResource, $input, $mutationName, ++$depth)) {
                 $fields['id' === $property ? '_id' : $property] = $fieldConfiguration;
             }
+            $resourceClass = $rootResource;
         }
 
         if (null !== $mutationName) {

Original file line number	Diff line number	Diff line change
`@@ -448,9 +448,15 @@ private function getResourceObjectTypeFields(string $resourceClass, ResourceMeta`
`448`	`448`	`continue;`
`449`	`449`	`}`
`450`	`450`
`451`		`- if ($fieldConfiguration = $this->getResourceFieldConfiguration($resourceClass, $resourceMetadata, $propertyMetadata->getDescription(), $propertyMetadata->getAttribute('deprecation_reason', ''), $propertyType, $resourceClass, $input, $mutationName, ++$depth)) {`
	`451`	`+ $rootResource = $resourceClass;`
	`452`	`+ if (null !== $propertyMetadata->getSubresource()) {`
	`453`	`+ $resourceClass = $propertyMetadata->getSubresource()->getResourceClass();`
	`454`	`+ $resourceMetadata = $this->resourceMetadataFactory->create($resourceClass);`
	`455`	`+ }`
	`456`	`+ if ($fieldConfiguration = $this->getResourceFieldConfiguration($resourceClass, $resourceMetadata, $propertyMetadata->getDescription(), $propertyMetadata->getAttribute('deprecation_reason', ''), $propertyType, $rootResource, $input, $mutationName, ++$depth)) {`
`452`	`457`	`$fields['id' === $property ? '_id' : $property] = $fieldConfiguration;`
`453`	`458`	`}`
	`459`	`+ $resourceClass = $rootResource;`
`454`	`460`	`}`
`455`	`461`
`456`	`462`	`if (null !== $mutationName) {`