Merge pull request #2019 from MoltenCoreIO/fix-subresourceMaxDepth-xml-yaml

fix issue #1717 - Support Subresources MaxDepth for yaml and xml

Author: soyuka

src/Metadata/Extractor/XmlExtractor.php

@@ -122,6 +122,7 @@ private function getProperties(\SimpleXMLElement $resource): array
                 'subresource' => $property->subresource ? [
                     'collection' => $this->phpize($property->subresource, 'collection', 'bool'),
                     'resourceClass' => $this->phpize($property->subresource, 'resourceClass', 'string'),
+                    'maxDepth' => $this->phpize($property->subresource, 'maxDepth', 'integer'),
                 ] : null,
             ];
         }
@@ -143,6 +144,8 @@ private function phpize(\SimpleXMLElement $array, string $key, string $type)
         switch ($type) {
             case 'string':
                 return (string) $array[$key];
+            case 'integer':
+                return (int) $array[$key];
             case 'bool':
                 return (bool) XmlUtils::phpize($array[$key]);
         }

src/Metadata/Property/Factory/ExtractorPropertyMetadataFactory.php

@@ -142,6 +142,7 @@ private function createSubresourceMetadata($subresource, PropertyMetadata $prope
         }
 
         $type = $propertyMetadata->getType();
+        $maxDepth = $subresource['maxDepth'] ?? null;
 
         if (null !== $type) {
             $isCollection = $type->isCollection();
@@ -153,6 +154,6 @@ private function createSubresourceMetadata($subresource, PropertyMetadata $prope
             return null;
         }
 
-        return new SubresourceMetadata($resourceClass, $isCollection);
+        return new SubresourceMetadata($resourceClass, $isCollection, $maxDepth);
     }
 }

tests/Metadata/Property/Factory/ExtractorPropertyMetadataFactoryTest.php

@@ -145,7 +145,7 @@ public function testCreateWithCollectionTypedParentPropertyMetadataFactoryYaml(P
                 );
 
         $expectedPropertyMetadata = $expectedPropertyMetadata->withType($collectionType);
-        $expectedPropertyMetadata = $expectedPropertyMetadata->withSubresource(new SubresourceMetadata(RelatedDummy::class, true));
+        $expectedPropertyMetadata = $expectedPropertyMetadata->withSubresource(new SubresourceMetadata(RelatedDummy::class, true, 1));
 
         $decorated = $this->prophesize(PropertyMetadataFactoryInterface::class);
         $decorated
@@ -170,7 +170,7 @@ public function testCreateWithTypedParentPropertyMetadataFactoryYaml(PropertyMet
         $type = new Type(Type::BUILTIN_TYPE_OBJECT, false, RelatedDummy::class);
 
         $expectedPropertyMetadata = $expectedPropertyMetadata->withType($type);
-        $expectedPropertyMetadata = $expectedPropertyMetadata->withSubresource(new SubresourceMetadata(RelatedDummy::class, false));
+        $expectedPropertyMetadata = $expectedPropertyMetadata->withSubresource(new SubresourceMetadata(RelatedDummy::class, false, 1));
 
         $decorated = $this->prophesize(PropertyMetadataFactoryInterface::class);
         $decorated

tests/Metadata/Property/Factory/FileConfigurationMetadataFactoryProvider.php

@@ -38,7 +38,7 @@ public function propertyMetadataProvider()
                 'bar' => [['Bar'], 'baz' => 'Baz'],
                 'baz' => 'Baz',
             ],
-            'subresource' => new SubresourceMetadata('Foo', true),
+            'subresource' => new SubresourceMetadata('Foo', true, 1),
         ];
 
         return [[$this->getPropertyMetadata($metadata)]];
@@ -55,7 +55,7 @@ public function decoratedPropertyMetadataProvider()
             'required' => true,
             'identifier' => false,
             'attributes' => ['Foo'],
-            'subresource' => new SubresourceMetadata('Foo', true),
+            'subresource' => new SubresourceMetadata('Foo', true, 1),
         ];
 
         return [[$this->getPropertyMetadata($metadata)]];