Fix data type for NelmioApiDoc

api-platform · Apr 12, 2016 · 89622aa · 89622aa
1 parent 164f99b
commit 89622aa
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/src/Bridge/NelmioApiDoc/Parser/ApiPlatformParser.php b/src/Bridge/NelmioApiDoc/Parser/ApiPlatformParser.php
@@ -169,7 +169,9 @@ private function parseProperty(ResourceMetadata $resourceMetadata, PropertyMetad
                 }
 
                 $data['subType'] = $subProperty['subType'];
-                $data['children'] = $subProperty['children'];
+                if (isset($subProperty['children'])) {
+                    $data['children'] = $subProperty['children'];
+                }
             }
 
             return $data;
@@ -186,9 +188,18 @@ private function parseProperty(ResourceMetadata $resourceMetadata, PropertyMetad
                 return $data;
             }
 
+            try {
+                $this->resourceMetadataFactory->create($className);
+            } catch (ResourceClassNotFoundException $e) {
+                $data['actualType'] = DataTypes::MODEL;
+                $data['subType'] = $className;
+
+                return $data;
+            }
+
             if (
-                (self::OUT_PREFIX === $io && $propertyMetadata->isReadableLink()) ||
-                (self::IN_PREFIX === $io && $propertyMetadata->isWritableLink())
+                (self::OUT_PREFIX === $io && !$propertyMetadata->isReadableLink()) ||
+                (self::IN_PREFIX === $io && !$propertyMetadata->isWritableLink())
             ) {
                 $data['dataType'] = self::TYPE_IRI;
                 $data['actualType'] = DataTypes::STRING;

diff --git a/tests/Bridge/NelmioApiDoc/Parser/ApiPlatformParserTest.php b/tests/Bridge/NelmioApiDoc/Parser/ApiPlatformParserTest.php
@@ -214,6 +214,7 @@ public function testParseRelation()
     {
         $resourceMetadataFactoryProphecy = $this->prophesize(ResourceMetadataFactoryInterface::class);
         $resourceMetadataFactoryProphecy->create(Dummy::class)->willReturn(new ResourceMetadata())->shouldBeCalled();
+        $resourceMetadataFactoryProphecy->create(RelatedDummy::class)->willReturn(new ResourceMetadata())->shouldBeCalled();
         $resourceMetadataFactory = $resourceMetadataFactoryProphecy->reveal();
 
         $propertyNameCollectionFactoryProphecy = $this->prophesize(PropertyNameCollectionFactoryInterface::class);
@@ -266,11 +267,18 @@ public function testParseRelation()
 
         $this->assertEquals([
             'relatedDummy' => [
-                'dataType' => null,
+                'dataType' => 'IRI',
                 'required' => false,
                 'description' => 'A related dummy.',
                 'readonly' => false,
-                'actualType' => DataTypes::MODEL,
+                'actualType' => DataTypes::STRING,
+            ],
+            'relatedDummies' => [
+                'dataType' => null,
+                'required' => false,
+                'description' => 'Several dummies.',
+                'readonly' => false,
+                'actualType' => DataTypes::COLLECTION,
                 'subType' => RelatedDummy::class,
                 'children' => [
                     'id' => [
@@ -287,14 +295,6 @@ public function testParseRelation()
                     ],
                 ],
             ],
-            'relatedDummies' => [
-                'dataType' => 'array of IRIs',
-                'required' => false,
-                'description' => 'Several dummies.',
-                'readonly' => false,
-                'actualType' => DataTypes::COLLECTION,
-                'subType' => DataTypes::STRING,
-            ],
         ], $actual);
     }
 }