fix: move event listeners to the symfony component (#6587)

soyuka · web-flow · commit 693f7bc06e66 · 2024-09-05T23:34:39.000+02:00
diff --git a/src/Doctrine/Common/composer.json b/src/Doctrine/Common/composer.json
@@ -27,19 +27,10 @@
         "api-platform/state": "^3.4 || ^4.0",
         "doctrine/collections": "^2.1",
         "doctrine/common": "^3.2.2",
-        "doctrine/persistence": "^3.2",
-        "symfony/property-access": "^6.4 || ^7.0",
-        "symfony/serializer": "^6.4 || ^7.0"
+        "doctrine/persistence": "^3.2"
     },
     "require-dev": {
-        "symfony/messenger": "^6.4 || ^7.0",
         "doctrine/mongodb-odm": "^2.6",
-        "symfony/expression-language": "^6.4 || 7.0",
-        "api-platform/http-cache": "^3.4 || ^4.0",
-        "api-platform/graphql": "^3.4 || ^4.0",
-        "api-platform/validator": "^3.4 || ^4.0",
-        "api-platform/serializer": "^3.4 || ^4.0",
-        "symfony/mercure-bundle": "*",
         "doctrine/orm": "^2.17 || ^3.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^10.0",
diff --git a/src/Symfony/Bundle/Resources/config/doctrine_odm_mercure_publisher.xml b/src/Symfony/Bundle/Resources/config/doctrine_odm_mercure_publisher.xml
@@ -8,7 +8,7 @@
 
         <!-- Event listener -->
 
-        <service id="api_platform.doctrine_mongodb.odm.listener.mercure.publish" class="ApiPlatform\Doctrine\Common\EventListener\PublishMercureUpdatesListener">
+        <service id="api_platform.doctrine_mongodb.odm.listener.mercure.publish" class="ApiPlatform\Symfony\Doctrine\EventListener\PublishMercureUpdatesListener">
             <argument type="service" id="api_platform.resource_class_resolver" />
             <argument type="service" id="api_platform.symfony.iri_converter" />
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
diff --git a/src/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml b/src/Symfony/Bundle/Resources/config/doctrine_orm_http_cache_purger.xml
@@ -8,7 +8,7 @@
 
         <!-- Event listener -->
 
-        <service id="api_platform.doctrine.listener.http_cache.purge" class="ApiPlatform\Doctrine\Common\EventListener\PurgeHttpCacheListener">
+        <service id="api_platform.doctrine.listener.http_cache.purge" class="ApiPlatform\Symfony\Doctrine\EventListener\PurgeHttpCacheListener">
             <argument type="service" id="api_platform.http_cache.purger" />
             <argument type="service" id="api_platform.iri_converter" />
             <argument type="service" id="api_platform.resource_class_resolver" />
diff --git a/src/Symfony/Bundle/Resources/config/doctrine_orm_mercure_publisher.xml b/src/Symfony/Bundle/Resources/config/doctrine_orm_mercure_publisher.xml
@@ -8,7 +8,7 @@
 
         <!-- Event listener -->
 
-        <service id="api_platform.doctrine.orm.listener.mercure.publish" class="ApiPlatform\Doctrine\Common\EventListener\PublishMercureUpdatesListener">
+        <service id="api_platform.doctrine.orm.listener.mercure.publish" class="ApiPlatform\Symfony\Doctrine\EventListener\PublishMercureUpdatesListener">
             <argument type="service" id="api_platform.resource_class_resolver" />
             <argument type="service" id="api_platform.iri_converter" />
             <argument type="service" id="api_platform.metadata.resource.metadata_collection_factory" />
diff --git a/src/Symfony/Doctrine/EventListener/PublishMercureUpdatesListener.php b/src/Symfony/Doctrine/EventListener/PublishMercureUpdatesListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\EventListener;
+namespace ApiPlatform\Symfony\Doctrine\EventListener;
 
 use ApiPlatform\Api\IriConverterInterface as LegacyIriConverterInterface;
 use ApiPlatform\Api\ResourceClassResolverInterface as LegacyResourceClassResolverInterface;
diff --git a/src/Symfony/Doctrine/EventListener/PurgeHttpCacheListener.php b/src/Symfony/Doctrine/EventListener/PurgeHttpCacheListener.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\EventListener;
+namespace ApiPlatform\Symfony\Doctrine\EventListener;
 
 use ApiPlatform\Api\IriConverterInterface as LegacyIriConverterInterface;
 use ApiPlatform\Api\ResourceClassResolverInterface as LegacyResourceClassResolverInterface;
diff --git a/src/Symfony/Tests/Doctrine/EventListener/PublishMercureUpdatesListenerTest.php b/src/Symfony/Tests/Doctrine/EventListener/PublishMercureUpdatesListenerTest.php
@@ -11,16 +11,8 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\Tests\EventListener;
-
-use ApiPlatform\Doctrine\Common\EventListener\PublishMercureUpdatesListener;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\NotAResource;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity\Dummy;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity\DummyCar;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity\DummyFriend;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity\DummyMercure;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity\DummyOffer;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity\MercureWithTopicsAndGetOperation;
+namespace ApiPlatform\Symfony\Tests\Doctrine\EventListener;
+
 use ApiPlatform\GraphQl\Subscription\MercureSubscriptionIriGeneratorInterface as GraphQlMercureSubscriptionIriGeneratorInterface;
 use ApiPlatform\GraphQl\Subscription\SubscriptionManagerInterface as GraphQlSubscriptionManagerInterface;
 use ApiPlatform\Metadata\ApiResource;
@@ -32,6 +24,14 @@
 use ApiPlatform\Metadata\Resource\ResourceMetadataCollection;
 use ApiPlatform\Metadata\ResourceClassResolverInterface;
 use ApiPlatform\Metadata\UrlGeneratorInterface;
+use ApiPlatform\Symfony\Doctrine\EventListener\PublishMercureUpdatesListener;
+use ApiPlatform\Symfony\Tests\Fixtures\NotAResource;
+use ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity\Dummy;
+use ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity\DummyCar;
+use ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity\DummyFriend;
+use ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity\DummyMercure;
+use ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity\DummyOffer;
+use ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity\MercureWithTopicsAndGetOperation;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\UnitOfWork;
diff --git a/src/Symfony/Tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php b/src/Symfony/Tests/Doctrine/EventListener/PurgeHttpCacheListenerTest.php
@@ -11,21 +11,21 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\Tests\EventListener;
-
-use ApiPlatform\Doctrine\Common\EventListener\PurgeHttpCacheListener;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\NotAResource;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity\ContainNonResource;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity\Dummy;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity\DummyNoGetOperation;
-use ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity\RelatedDummy;
+namespace ApiPlatform\Symfony\Tests\Doctrine\EventListener;
+
 use ApiPlatform\HttpCache\PurgerInterface;
 use ApiPlatform\Metadata\Exception\InvalidArgumentException;
 use ApiPlatform\Metadata\Exception\ItemNotFoundException;
 use ApiPlatform\Metadata\GetCollection;
 use ApiPlatform\Metadata\IriConverterInterface;
 use ApiPlatform\Metadata\ResourceClassResolverInterface;
 use ApiPlatform\Metadata\UrlGeneratorInterface;
+use ApiPlatform\Symfony\Doctrine\EventListener\PurgeHttpCacheListener;
+use ApiPlatform\Symfony\Tests\Fixtures\NotAResource;
+use ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity\ContainNonResource;
+use ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity\Dummy;
+use ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity\DummyNoGetOperation;
+use ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity\RelatedDummy;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Event\OnFlushEventArgs;
 use Doctrine\ORM\Event\PreUpdateEventArgs;
diff --git a/src/Symfony/Tests/Fixtures/NotAResource.php b/src/Symfony/Tests/Fixtures/NotAResource.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\Tests\Fixtures;
+namespace ApiPlatform\Symfony\Tests\Fixtures;
 
 use Symfony\Component\Serializer\Annotation\Groups;
 
diff --git a/src/Symfony/Tests/Fixtures/TestBundle/Entity/ContainNonResource.php b/src/Symfony/Tests/Fixtures/TestBundle/Entity/ContainNonResource.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity;
+namespace ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Tests\Fixtures\NotAResource;
diff --git a/src/Symfony/Tests/Fixtures/TestBundle/Entity/Dummy.php b/src/Symfony/Tests/Fixtures/TestBundle/Entity/Dummy.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity;
+
+class Dummy
+{
+    private $id;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setId($id): void
+    {
+        $this->id = $id;
+    }
+}
diff --git a/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyCar.php b/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyCar.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity;
+namespace ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Doctrine\Orm\Filter\BooleanFilter;
 use ApiPlatform\Doctrine\Orm\Filter\DateFilter;
diff --git a/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyCarInfo.php b/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyCarInfo.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity;
+namespace ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyFriend.php b/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyFriend.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity;
+
+use ApiPlatform\Metadata\ApiProperty;
+use ApiPlatform\Metadata\ApiResource;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Constraints as Assert;
+
+/**
+ * Dummy Friend.
+ *
+ * @author Kévin Dunglas <dunglas@gmail.com>
+ */
+#[ApiResource]
+#[ORM\Entity]
+class DummyFriend implements \Stringable
+{
+    /**
+     * @var int|null The id
+     */
+    #[ORM\Column(type: 'integer')]
+    #[ORM\Id]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private ?int $id = null;
+
+    /**
+     * @var string The dummy name
+     */
+    #[ApiProperty(types: ['https://schema.org/name'])]
+    #[ORM\Column]
+    #[Assert\NotBlank]
+    #[Groups(['fakemanytomany', 'friends'])]
+    private string $name;
+
+    /**
+     * Get id.
+     */
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set id.
+     *
+     * @param int $id the value to set
+     */
+    public function setId(int $id): void
+    {
+        $this->id = $id;
+    }
+
+    /**
+     * Get name.
+     */
+    public function getName(): ?string
+    {
+        return $this->name;
+    }
+
+    /**
+     * Set name.
+     *
+     * @param string $name the value to set
+     */
+    public function setName(string $name): void
+    {
+        $this->name = $name;
+    }
+
+    public function __toString(): string
+    {
+        return (string) $this->getId();
+    }
+}
diff --git a/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyMercure.php b/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyMercure.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity;
+namespace ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyNoGetOperation.php b/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyNoGetOperation.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity;
+namespace ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Post;
diff --git a/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyOffer.php b/src/Symfony/Tests/Fixtures/TestBundle/Entity/DummyOffer.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity;
+namespace ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
 use Doctrine\ORM\Mapping as ORM;
diff --git a/src/Symfony/Tests/Fixtures/TestBundle/Entity/MercureWithTopicsAndGetOperation.php b/src/Symfony/Tests/Fixtures/TestBundle/Entity/MercureWithTopicsAndGetOperation.php
@@ -11,7 +11,7 @@
 
 declare(strict_types=1);
 
-namespace ApiPlatform\Doctrine\Common\Tests\Fixtures\TestBundle\Entity;
+namespace ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity;
 
 use ApiPlatform\Metadata\ApiResource;
 use ApiPlatform\Metadata\Get;
diff --git a/src/Symfony/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php b/src/Symfony/Tests/Fixtures/TestBundle/Entity/RelatedDummy.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the API Platform project.
+ *
+ * (c) Kévin Dunglas <dunglas@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace ApiPlatform\Symfony\Tests\Fixtures\TestBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+class RelatedDummy
+{
+    private $id;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setId($id): void
+    {
+        $this->id = $id;
+    }
+}
diff --git a/src/Symfony/composer.json b/src/Symfony/composer.json
@@ -48,7 +48,8 @@
         "api-platform/elasticsearch": "^3.4 || ^4.0",
         "api-platform/doctrine-orm": "^3.4 || ^4.0",
         "api-platform/doctrine-odm": "^3.4 || ^4.0",
-        "api-platform/parameter-validator": "^3.1"
+        "api-platform/parameter-validator": "^3.1",
+        "symfony/expression-language": "^6.4 || ^7.1"
     },
     "suggest": {
         "api-platform/doctrine-orm": "To support Doctrine ORM.",
@@ -60,7 +61,7 @@
         "ramsey/uuid": "To support Ramsey's UUID identifiers.",
         "symfony/cache": "To have metadata caching when using Symfony integration.",
         "symfony/config": "To load XML configuration files.",
-        "symfony/expression-language": "To use authorization features.",
+        "symfony/expression-language": "To use authorization and mercure advanced features.",
         "symfony/http-client": "To use the HTTP cache invalidation system.",
         "symfony/security": "To use authorization features.",
         "symfony/twig-bundle": "To use the Swagger UI integration.",
diff --git a/src/deprecation.php b/src/deprecation.php
@@ -50,8 +50,8 @@
     ApiPlatform\Util\ClientTrait::class => ApiPlatform\Symfony\Bundle\Test\ClientTrait::class,
     ApiPlatform\Util\RequestAttributesExtractor::class => ApiPlatform\State\Util\RequestAttributesExtractor::class,
     ApiPlatform\Symfony\Util\RequestAttributesExtractor::class => ApiPlatform\State\Util\RequestAttributesExtractor::class,
-    ApiPlatform\Doctrine\EventListener\PublishMercureUpdatesListener::class => ApiPlatform\Doctrine\Common\EventListener\PublishMercureUpdatesListener::class,
-    ApiPlatform\Doctrine\EventListener\PurgeHttpCacheListener::class => ApiPlatform\Doctrine\Common\EventListener\PurgeHttpCacheListener::class,
+    ApiPlatform\Doctrine\EventListener\PublishMercureUpdatesListener::class => ApiPlatform\Symfony\Doctrine\EventListener\PublishMercureUpdatesListener::class,
+    ApiPlatform\Doctrine\EventListener\PurgeHttpCacheListener::class => ApiPlatform\Symfony\Doctrine\EventListener\PurgeHttpCacheListener::class,
 ];
 
 $removedClasses = [
