Merge 4379501 into 255b22f

api-platform · Jan 23, 2020 · 7584ffe · 7584ffe
2 parents 255b22f + 4379501
commit 7584ffe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/src/JsonSchema/TypeFactory.php b/src/JsonSchema/TypeFactory.php
@@ -99,11 +99,14 @@ private function getClassType(?string $className, string $format = 'json', ?bool
             return ['type' => 'string'];
         }
 
-        if ($this->isResourceClass($className) && true !== $readableLink) {
-            return [
-                'type' => 'string',
-                'format' => 'iri-reference',
-            ];
+        if (true !== $readableLink) {
+            if ($this->isResourceClass($className)) {
+                return [
+                    'type' => 'string',
+                    'format' => 'iri-reference',
+                ];
+            }
+            return ['type' => 'string'];
         }
 
         $version = $schema->getVersion();

diff --git a/tests/JsonSchema/TypeFactoryTest.php b/tests/JsonSchema/TypeFactoryTest.php
@@ -13,12 +13,16 @@
 
 namespace ApiPlatform\Core\Tests\JsonSchema;
 
+use ApiPlatform\Core\Exception\ResourceClassNotFoundException;
 use ApiPlatform\Core\JsonSchema\Schema;
 use ApiPlatform\Core\JsonSchema\SchemaFactoryInterface;
 use ApiPlatform\Core\JsonSchema\TypeFactory;
+use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
+use ApiPlatform\Core\Metadata\Resource\ResourceMetadata;
 use ApiPlatform\Core\Tests\Fixtures\TestBundle\Entity\Dummy;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Ramsey\Uuid\Uuid;
 use Symfony\Component\PropertyInfo\Type;
 
 class TypeFactoryTest extends TestCase
@@ -39,10 +43,21 @@ public function typeProvider(): iterable
         yield [['type' => 'boolean'], new Type(Type::BUILTIN_TYPE_BOOL)];
         yield [['type' => 'string'], new Type(Type::BUILTIN_TYPE_OBJECT)];
         yield [['type' => 'string', 'format' => 'date-time'], new Type(Type::BUILTIN_TYPE_OBJECT, false, \DateTimeImmutable::class)];
+        yield [['type' => 'string', 'format' => 'uuid'], new Type(Type::BUILTIN_TYPE_OBJECT, false, Uuid::class)];
         yield [['type' => 'string'], new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)];
         yield [['type' => 'array', 'items' => ['type' => 'string']], new Type(Type::BUILTIN_TYPE_STRING, false, null, true)];
     }
 
+    public function testGetTypeWithSchema(): void
+    {
+        $typeFactory = new TypeFactory();
+        $type = new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class);
+        $this->assertSame(
+            ['type' => 'string', 'format' => 'iri-reference'],
+            $typeFactory->getType($type, 'json', null, null, new Schema())
+        );
+    }
+
     public function testGetClassType(): void
     {
         $schemaFactoryProphecy = $this->prophesize(SchemaFactoryInterface::class);