From dcb5629784f27bdddb88da39e84578c298f106fd Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 9 Aug 2021 11:40:37 +0200 Subject: [PATCH] make use of doctrine-bundle 2.1 + and EventSubscriberInterface (#649) --- composer.json | 2 +- .../DependencyInjection/DoctrineBehaviorsExtension.php | 10 ---------- src/EventSubscriber/BlameableEventSubscriber.php | 4 ++-- src/EventSubscriber/LoggableEventSubscriber.php | 4 ++-- src/EventSubscriber/SluggableEventSubscriber.php | 4 ++-- src/EventSubscriber/SoftDeletableEventSubscriber.php | 4 ++-- src/EventSubscriber/TimestampableEventSubscriber.php | 4 ++-- src/EventSubscriber/TranslatableEventSubscriber.php | 4 ++-- src/EventSubscriber/TreeEventSubscriber.php | 4 ++-- src/EventSubscriber/UuidableEventSubscriber.php | 4 ++-- 10 files changed, 17 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index c07ff7f4..82fb50cb 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,7 @@ "doctrine/persistence": "^2.0", "doctrine/dbal": "^2.9", "doctrine/orm": "^2.8", + "doctrine/doctrine-bundle": "^2.4", "symfony/cache": "^4.4|^5.2", "symfony/dependency-injection": "^4.4|^5.2", "symfony/http-kernel": "^4.4|^5.2", @@ -33,7 +34,6 @@ "ext-pdo_pgsql": "*", "psr/log": "^1.1", "doctrine/annotations": "^1.12", - "doctrine/doctrine-bundle": "^2.2", "php-parallel-lint/php-parallel-lint": "^1.3", "phpstan/phpstan": "^0.12.84", "phpunit/phpunit": "^9.5", diff --git a/src/Bundle/DependencyInjection/DoctrineBehaviorsExtension.php b/src/Bundle/DependencyInjection/DoctrineBehaviorsExtension.php index d466d8b0..93ff3f56 100644 --- a/src/Bundle/DependencyInjection/DoctrineBehaviorsExtension.php +++ b/src/Bundle/DependencyInjection/DoctrineBehaviorsExtension.php @@ -4,7 +4,6 @@ namespace Knp\DoctrineBehaviors\Bundle\DependencyInjection; -use Doctrine\Common\EventSubscriber; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\Extension; @@ -12,11 +11,6 @@ final class DoctrineBehaviorsExtension extends Extension { - /** - * @var string - */ - private const DOCTRINE_EVENT_SUBSCRIBER_TAG = 'doctrine.event_subscriber'; - /** * @param string[] $configs */ @@ -24,9 +18,5 @@ public function load(array $configs, ContainerBuilder $containerBuilder): void { $phpFileLoader = new PhpFileLoader($containerBuilder, new FileLocator(__DIR__ . '/../../../config')); $phpFileLoader->load('services.php'); - - // @see https://github.com/doctrine/DoctrineBundle/issues/674 - $containerBuilder->registerForAutoconfiguration(EventSubscriber::class) - ->addTag(self::DOCTRINE_EVENT_SUBSCRIBER_TAG); } } diff --git a/src/EventSubscriber/BlameableEventSubscriber.php b/src/EventSubscriber/BlameableEventSubscriber.php index e317316f..866cc917 100644 --- a/src/EventSubscriber/BlameableEventSubscriber.php +++ b/src/EventSubscriber/BlameableEventSubscriber.php @@ -4,7 +4,7 @@ namespace Knp\DoctrineBehaviors\EventSubscriber; -use Doctrine\Common\EventSubscriber; +use Doctrine\Bundle\DoctrineBundle\EventSubscriber\EventSubscriberInterface; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Event\LoadClassMetadataEventArgs; @@ -14,7 +14,7 @@ use Knp\DoctrineBehaviors\Contract\Entity\BlameableInterface; use Knp\DoctrineBehaviors\Contract\Provider\UserProviderInterface; -final class BlameableEventSubscriber implements EventSubscriber +final class BlameableEventSubscriber implements EventSubscriberInterface { /** * @var string diff --git a/src/EventSubscriber/LoggableEventSubscriber.php b/src/EventSubscriber/LoggableEventSubscriber.php index 04b5a302..8f60cdde 100644 --- a/src/EventSubscriber/LoggableEventSubscriber.php +++ b/src/EventSubscriber/LoggableEventSubscriber.php @@ -4,14 +4,14 @@ namespace Knp\DoctrineBehaviors\EventSubscriber; -use Doctrine\Common\EventSubscriber; +use Doctrine\Bundle\DoctrineBundle\EventSubscriber\EventSubscriberInterface; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Events; use Knp\DoctrineBehaviors\Contract\Entity\LoggableInterface; use Psr\Log\LoggerInterface; use Psr\Log\LogLevel; -final class LoggableEventSubscriber implements EventSubscriber +final class LoggableEventSubscriber implements EventSubscriberInterface { /** * @var LoggerInterface diff --git a/src/EventSubscriber/SluggableEventSubscriber.php b/src/EventSubscriber/SluggableEventSubscriber.php index 913e0bb8..3dfc5d2b 100644 --- a/src/EventSubscriber/SluggableEventSubscriber.php +++ b/src/EventSubscriber/SluggableEventSubscriber.php @@ -4,7 +4,7 @@ namespace Knp\DoctrineBehaviors\EventSubscriber; -use Doctrine\Common\EventSubscriber; +use Doctrine\Bundle\DoctrineBundle\EventSubscriber\EventSubscriberInterface; use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Event\LoadClassMetadataEventArgs; @@ -13,7 +13,7 @@ use Knp\DoctrineBehaviors\Contract\Entity\SluggableInterface; use Knp\DoctrineBehaviors\Repository\DefaultSluggableRepository; -final class SluggableEventSubscriber implements EventSubscriber +final class SluggableEventSubscriber implements EventSubscriberInterface { /** * @var string diff --git a/src/EventSubscriber/SoftDeletableEventSubscriber.php b/src/EventSubscriber/SoftDeletableEventSubscriber.php index 948d5765..e8ba92e2 100644 --- a/src/EventSubscriber/SoftDeletableEventSubscriber.php +++ b/src/EventSubscriber/SoftDeletableEventSubscriber.php @@ -4,13 +4,13 @@ namespace Knp\DoctrineBehaviors\EventSubscriber; -use Doctrine\Common\EventSubscriber; +use Doctrine\Bundle\DoctrineBundle\EventSubscriber\EventSubscriberInterface; use Doctrine\ORM\Event\LoadClassMetadataEventArgs; use Doctrine\ORM\Event\OnFlushEventArgs; use Doctrine\ORM\Events; use Knp\DoctrineBehaviors\Contract\Entity\SoftDeletableInterface; -final class SoftDeletableEventSubscriber implements EventSubscriber +final class SoftDeletableEventSubscriber implements EventSubscriberInterface { /** * @var string diff --git a/src/EventSubscriber/TimestampableEventSubscriber.php b/src/EventSubscriber/TimestampableEventSubscriber.php index 760ed6ea..84f1ecf1 100644 --- a/src/EventSubscriber/TimestampableEventSubscriber.php +++ b/src/EventSubscriber/TimestampableEventSubscriber.php @@ -4,12 +4,12 @@ namespace Knp\DoctrineBehaviors\EventSubscriber; -use Doctrine\Common\EventSubscriber; +use Doctrine\Bundle\DoctrineBundle\EventSubscriber\EventSubscriberInterface; use Doctrine\ORM\Event\LoadClassMetadataEventArgs; use Doctrine\ORM\Events; use Knp\DoctrineBehaviors\Contract\Entity\TimestampableInterface; -final class TimestampableEventSubscriber implements EventSubscriber +final class TimestampableEventSubscriber implements EventSubscriberInterface { /** * @var string diff --git a/src/EventSubscriber/TranslatableEventSubscriber.php b/src/EventSubscriber/TranslatableEventSubscriber.php index 867ed427..224e6e1c 100644 --- a/src/EventSubscriber/TranslatableEventSubscriber.php +++ b/src/EventSubscriber/TranslatableEventSubscriber.php @@ -4,7 +4,7 @@ namespace Knp\DoctrineBehaviors\EventSubscriber; -use Doctrine\Common\EventSubscriber; +use Doctrine\Bundle\DoctrineBundle\EventSubscriber\EventSubscriberInterface; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Event\LoadClassMetadataEventArgs; use Doctrine\ORM\Events; @@ -13,7 +13,7 @@ use Knp\DoctrineBehaviors\Contract\Entity\TranslationInterface; use Knp\DoctrineBehaviors\Contract\Provider\LocaleProviderInterface; -final class TranslatableEventSubscriber implements EventSubscriber +final class TranslatableEventSubscriber implements EventSubscriberInterface { /** * @var string diff --git a/src/EventSubscriber/TreeEventSubscriber.php b/src/EventSubscriber/TreeEventSubscriber.php index 5b42494d..15ea5595 100644 --- a/src/EventSubscriber/TreeEventSubscriber.php +++ b/src/EventSubscriber/TreeEventSubscriber.php @@ -4,12 +4,12 @@ namespace Knp\DoctrineBehaviors\EventSubscriber; -use Doctrine\Common\EventSubscriber; +use Doctrine\Bundle\DoctrineBundle\EventSubscriber\EventSubscriberInterface; use Doctrine\ORM\Event\LoadClassMetadataEventArgs; use Doctrine\ORM\Events; use Knp\DoctrineBehaviors\Contract\Entity\TreeNodeInterface; -final class TreeEventSubscriber implements EventSubscriber +final class TreeEventSubscriber implements EventSubscriberInterface { public function loadClassMetadata(LoadClassMetadataEventArgs $loadClassMetadataEventArgs): void { diff --git a/src/EventSubscriber/UuidableEventSubscriber.php b/src/EventSubscriber/UuidableEventSubscriber.php index 8ea9a3c7..525eb4dc 100644 --- a/src/EventSubscriber/UuidableEventSubscriber.php +++ b/src/EventSubscriber/UuidableEventSubscriber.php @@ -4,13 +4,13 @@ namespace Knp\DoctrineBehaviors\EventSubscriber; -use Doctrine\Common\EventSubscriber; +use Doctrine\Bundle\DoctrineBundle\EventSubscriber\EventSubscriberInterface; use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Event\LoadClassMetadataEventArgs; use Doctrine\ORM\Events; use Knp\DoctrineBehaviors\Contract\Entity\UuidableInterface; -final class UuidableEventSubscriber implements EventSubscriber +final class UuidableEventSubscriber implements EventSubscriberInterface { public function loadClassMetadata(LoadClassMetadataEventArgs $loadClassMetadataEventArgs): void {