feat: set symfony/uid in dev dependencies

Author: vincentchalamon

composer.json

@@ -81,6 +81,7 @@
         "symfony/security-bundle": "^3.4 || ^4.4 || ^5.1 || ^6.0",
         "symfony/security-core": "^4.4 || ^5.1 || ^6.0",
         "symfony/twig-bundle": "^3.4 || ^4.4 || ^5.1 || ^6.0",
+        "symfony/uid": "^5.1 || ^6.0",
         "symfony/validator": "^3.4 || ^4.4 || ^5.1 || ^6.0",
         "symfony/web-profiler-bundle": "^4.4 || ^5.1 || ^6.0",
         "symfony/yaml": "^3.4 || ^4.4 || ^5.1 || ^6.0",

tests/Fixtures/TestBundle/Doctrine/Generator/Uuid.php

@@ -27,11 +27,7 @@ public function __toString(): string
         return $this->id;
     }
 
-    /**
-     * @return mixed
-     */
-    #[\ReturnTypeWillChange] // TODO: remove this and add the typehint in API Platform 3
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         return $this->id;
     }

tests/Fixtures/TestBundle/Entity/SymfonyUuidDummy.php

@@ -15,45 +15,41 @@
 
 use ApiPlatform\Metadata\ApiResource;
 use Doctrine\ORM\Mapping as ORM;
-use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Component\Uid\Uuid;
 
-/* @TODO remove this check in 3.0 */
-if (\PHP_VERSION_ID >= 70200 && class_exists(Uuid::class) && class_exists(UuidType::class)) {
-    /**
-     * @author Vincent Chalamon <[email protected]>
-     */
-    #[ApiResource]
-    #[ORM\Entity]
-    class SymfonyUuidDummy
+/**
+ * @author Vincent Chalamon <[email protected]>
+ */
+#[ApiResource]
+#[ORM\Entity]
+class SymfonyUuidDummy
+{
+    #[ORM\Id]
+    #[ORM\Column(type: 'symfony_uuid', unique: true)]
+    #[ORM\GeneratedValue(strategy: 'NONE')]
+    private $id;
+    #[ORM\Column(nullable: true)]
+    private $number;
+
+    public function __construct(?Uuid $id = null)
+    {
+        $this->id = $id ?? Uuid::v4();
+    }
+
+    public function getId(): Uuid
     {
-        #[ORM\Id]
-        #[ORM\Column(type: 'symfony_uuid', unique: true)]
-        #[ORM\GeneratedValue(strategy: 'NONE')]
-        private $id;
-        #[ORM\Column(nullable: true)]
-        private $number;
-
-        public function __construct(?Uuid $id = null)
-        {
-            $this->id = $id ?? Uuid::v4();
-        }
-
-        public function getId(): Uuid
-        {
-            return $this->id;
-        }
-
-        public function getNumber(): ?string
-        {
-            return $this->number;
-        }
-
-        public function setNumber(?string $number): self
-        {
-            $this->number = $number;
-
-            return $this;
-        }
+        return $this->id;
+    }
+
+    public function getNumber(): ?string
+    {
+        return $this->number;
+    }
+
+    public function setNumber(?string $number): self
+    {
+        $this->number = $number;
+
+        return $this;
     }
 }

tests/Fixtures/app/AppKernel.php

@@ -22,7 +22,6 @@
 use Doctrine\Inflector\InflectorFactory;
 use FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle;
 use Nelmio\ApiDocBundle\NelmioApiDocBundle;
-use Symfony\Bridge\Doctrine\Types\UuidType;
 use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
 use Symfony\Bundle\MakerBundle\MakerBundle;
@@ -39,7 +38,6 @@
 use Symfony\Component\Security\Core\Authorization\Strategy\AccessDecisionStrategyInterface;
 use Symfony\Component\Security\Core\User\User as SymfonyCoreUser;
 use Symfony\Component\Security\Core\User\UserInterface;
-use Symfony\Component\Uid\Uuid;
 
 /**
  * AppKernel for tests.
@@ -111,10 +109,6 @@ protected function configureContainer(ContainerBuilder $c, LoaderInterface $load
 
         $loader->load(__DIR__."/config/config_{$this->getEnvironment()}.yml");
 
-        if (class_exists(Uuid::class) && class_exists(UuidType::class)) {
-            $loader->load(__DIR__.'/config/config_symfony_uid.yml');
-        }
-
         $c->getDefinition(DoctrineContext::class)->setArgument('$passwordHasher', class_exists(NativePasswordHasher::class) ? 'security.user_password_encoder' : 'security.user_password_hasher');
 
         $messengerConfig = [

tests/Fixtures/app/config/config_common.yml

@@ -5,6 +5,7 @@ doctrine:
         charset:                      'UTF8'
         types:
             uuid:  Ramsey\Uuid\Doctrine\UuidType
+            symfony_uuid: Symfony\Bridge\Doctrine\Types\UuidType
 
     orm:
         auto_generate_proxy_classes:   '%kernel.debug%'

tests/Fixtures/app/config/config_mysql.yml

@@ -15,3 +15,4 @@ doctrine:
         server_version: '%env(MYSQL_VERSION)%'
         types:
             uuid: Ramsey\Uuid\Doctrine\UuidType
+            symfony_uuid: Symfony\Bridge\Doctrine\Types\UuidType

tests/Fixtures/app/config/config_postgres.yml

@@ -15,3 +15,4 @@ doctrine:
         server_version: '%env(POSTGRES_VERSION)%'
         types:
             uuid: Ramsey\Uuid\Doctrine\UuidType
+            symfony_uuid: Symfony\Bridge\Doctrine\Types\UuidType

tests/Fixtures/app/config/config_sqlite.yml

@@ -12,3 +12,4 @@ doctrine:
         url: '%env(resolve:DATABASE_URL)%'
         types:
             uuid: Ramsey\Uuid\Doctrine\UuidType
+            symfony_uuid: Symfony\Bridge\Doctrine\Types\UuidType

tests/Fixtures/app/config/config_symfony_uid.yml

@@ -86,7 +86,6 @@ public function testClassFoundAndParentFound()
         $this->assertFalse($metadata->isIdentifier());
         $this->assertSame('Default', $metadata->getDefault());
         $this->assertSame('Example', $metadata->getExample());
-        // TODO need https://github.com/api-platform/core/pull/4422
-        // $this->assertSame(['https://example.com'], $metadata->getTypes());
+        $this->assertSame(['https://example.com'], $metadata->getTypes());
     }
 }