Merge pull request #3397 from api-platform/revert-3362-fix/type-facto…

…ry-readblelink Revert "fix getClassType with no readableLink"
api-platform · Feb 18, 2020 · bba9fc4 · bba9fc4
2 parents 21145c7 + 328eafd
commit bba9fc4
Show file tree

Hide file tree

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

diff --git a/tests/JsonSchema/TypeFactoryTest.php b/tests/JsonSchema/TypeFactoryTest.php
@@ -19,7 +19,6 @@
 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
@@ -40,21 +39,10 @@ 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);