From 787d5695e4b79e030e398b7b83357a0538c77666 Mon Sep 17 00:00:00 2001 From: Allison Guilhem Date: Sun, 5 Mar 2023 20:59:28 +0100 Subject: [PATCH] [DoctrineBridge] deprecate doctrine schema subscribers in favor of listeners --- UPGRADE-6.3.md | 7 ++ src/Symfony/Bridge/Doctrine/CHANGELOG.md | 8 ++ ...scriber.php => AbstractSchemaListener.php} | 15 +--- ...DoctrineDbalCacheAdapterSchemaListener.php | 38 +++++++++ ...ctrineDbalCacheAdapterSchemaSubscriber.php | 31 ++++--- ...criber.php => LockStoreSchemaListener.php} | 2 +- ...ssengerTransportDoctrineSchemaListener.php | 82 +++++++++++++++++++ ...engerTransportDoctrineSchemaSubscriber.php | 78 +++--------------- ...hp => PdoSessionHandlerSchemaListener.php} | 11 ++- ...rMeTokenProviderDoctrineSchemaListener.php | 44 ++++++++++ ...eTokenProviderDoctrineSchemaSubscriber.php | 38 ++++----- ...neDbalCacheAdapterSchemaSubscriberTest.php | 4 +- ...rTransportDoctrineSchemaSubscriberTest.php | 10 ++- ...> PdoSessionHandlerSchemaListenerTest.php} | 6 +- 14 files changed, 236 insertions(+), 138 deletions(-) rename src/Symfony/Bridge/Doctrine/SchemaListener/{AbstractSchemaSubscriber.php => AbstractSchemaListener.php} (78%) create mode 100644 src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaListener.php rename src/Symfony/Bridge/Doctrine/SchemaListener/{LockStoreSchemaSubscriber.php => LockStoreSchemaListener.php} (93%) create mode 100644 src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaListener.php rename src/Symfony/Bridge/Doctrine/SchemaListener/{PdoSessionHandlerSchemaSubscriber.php => PdoSessionHandlerSchemaListener.php} (81%) create mode 100644 src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaListener.php rename src/Symfony/Bridge/Doctrine/Tests/SchemaListener/{PdoSessionHandlerSchemaSubscriberTest.php => PdoSessionHandlerSchemaListenerTest.php} (89%) diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md index 43e3abbe9f5f9..2be9f5342b885 100644 --- a/UPGRADE-6.3.md +++ b/UPGRADE-6.3.md @@ -13,6 +13,13 @@ DependencyInjection * Deprecate `PhpDumper` options `inline_factories_parameter` and `inline_class_loader_parameter`, use `inline_factories` and `inline_class_loader` instead * Deprecate undefined and numeric keys with `service_locator` config, use string aliases instead +DoctrineBridge +-------------- + + * Deprecate `DoctrineDbalCacheAdapterSchemaSubscriber` in favor of `DoctrineDbalCacheAdapterSchemaListener` + * Deprecate `MessengerTransportDoctrineSchemaSubscriber` in favor of `MessengerTransportDoctrineSchemaListener` + * Deprecate `RememberMeTokenProviderDoctrineSchemaSubscriber` in favor of `RememberMeTokenProviderDoctrineSchemaListener` + FrameworkBundle --------------- diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md index b313594e4ec6a..4c55f6e45ebae 100644 --- a/src/Symfony/Bridge/Doctrine/CHANGELOG.md +++ b/src/Symfony/Bridge/Doctrine/CHANGELOG.md @@ -1,6 +1,14 @@ CHANGELOG ========= +6.3 +--- + + * Add `AbstractSchemaListener`, `LockStoreSchemaListener` and `PdoSessionHandlerSchemaListener` + * Deprecate `DoctrineDbalCacheAdapterSchemaSubscriber` in favor of `DoctrineDbalCacheAdapterSchemaListener` + * Deprecate `MessengerTransportDoctrineSchemaSubscriber` in favor of `MessengerTransportDoctrineSchemaListener` + * Deprecate `RememberMeTokenProviderDoctrineSchemaSubscriber` in favor of `RememberMeTokenProviderDoctrineSchemaListener` + 6.2 --- diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php similarity index 78% rename from src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaSubscriber.php rename to src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php index 52b81d6b98c58..04907ee9a78bd 100644 --- a/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaSubscriber.php +++ b/src/Symfony/Bridge/Doctrine/SchemaListener/AbstractSchemaListener.php @@ -11,27 +11,14 @@ namespace Symfony\Bridge\Doctrine\SchemaListener; -use Doctrine\Common\EventSubscriber; use Doctrine\DBAL\Connection; use Doctrine\DBAL\Exception\TableNotFoundException; use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; -use Doctrine\ORM\Tools\ToolEvents; -abstract class AbstractSchemaSubscriber implements EventSubscriber +abstract class AbstractSchemaListener { abstract public function postGenerateSchema(GenerateSchemaEventArgs $event): void; - public function getSubscribedEvents(): array - { - if (!class_exists(ToolEvents::class)) { - return []; - } - - return [ - ToolEvents::postGenerateSchema, - ]; - } - protected function getIsSameDatabaseChecker(Connection $connection): \Closure { return static function (\Closure $exec) use ($connection): bool { diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaListener.php b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaListener.php new file mode 100644 index 0000000000000..7be883db807a8 --- /dev/null +++ b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaListener.php @@ -0,0 +1,38 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\Doctrine\SchemaListener; + +use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; +use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter; + +/** + * Automatically adds the cache table needed for the DoctrineDbalAdapter of + * the Cache component. + */ +class DoctrineDbalCacheAdapterSchemaListener extends AbstractSchemaListener +{ + /** + * @param iterable $dbalAdapters + */ + public function __construct(private iterable $dbalAdapters) + { + } + + public function postGenerateSchema(GenerateSchemaEventArgs $event): void + { + $connection = $event->getEntityManager()->getConnection(); + + foreach ($this->dbalAdapters as $dbalAdapter) { + $dbalAdapter->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection)); + } + } +} diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php index 5df11249f92df..ce05ce5c38aee 100644 --- a/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php +++ b/src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php @@ -11,33 +11,30 @@ namespace Symfony\Bridge\Doctrine\SchemaListener; -use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; +use Doctrine\Common\EventSubscriber; +use Doctrine\ORM\Tools\ToolEvents; use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter; +trigger_deprecation('symfony/doctrine-bridge', '6.3', 'The "%s" class is deprecated. Use "%s" instead.', DoctrineDbalCacheAdapterSchemaSubscriber::class, DoctrineDbalCacheAdapterSchemaListener::class); + /** * Automatically adds the cache table needed for the DoctrineDbalAdapter of * the Cache component. * * @author Ryan Weaver + * + * @deprecated since Symfony 6.3, use {@link DoctrineDbalCacheAdapterSchemaListener} instead */ -final class DoctrineDbalCacheAdapterSchemaSubscriber extends AbstractSchemaSubscriber +final class DoctrineDbalCacheAdapterSchemaSubscriber extends DoctrineDbalCacheAdapterSchemaListener implements EventSubscriber { - private $dbalAdapters; - - /** - * @param iterable $dbalAdapters - */ - public function __construct(iterable $dbalAdapters) - { - $this->dbalAdapters = $dbalAdapters; - } - - public function postGenerateSchema(GenerateSchemaEventArgs $event): void + public function getSubscribedEvents(): array { - $connection = $event->getEntityManager()->getConnection(); - - foreach ($this->dbalAdapters as $dbalAdapter) { - $dbalAdapter->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection)); + if (!class_exists(ToolEvents::class)) { + return []; } + + return [ + ToolEvents::postGenerateSchema, + ]; } } diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php similarity index 93% rename from src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaSubscriber.php rename to src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php index cbd76fe1d10e2..0902b376d8968 100644 --- a/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaSubscriber.php +++ b/src/Symfony/Bridge/Doctrine/SchemaListener/LockStoreSchemaListener.php @@ -15,7 +15,7 @@ use Symfony\Component\Lock\PersistingStoreInterface; use Symfony\Component\Lock\Store\DoctrineDbalStore; -final class LockStoreSchemaSubscriber extends AbstractSchemaSubscriber +final class LockStoreSchemaListener extends AbstractSchemaListener { /** * @param iterable $stores diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaListener.php b/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaListener.php new file mode 100644 index 0000000000000..f5416115cba8f --- /dev/null +++ b/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaListener.php @@ -0,0 +1,82 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\Doctrine\SchemaListener; + +use Doctrine\DBAL\Event\SchemaCreateTableEventArgs; +use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; +use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransport; +use Symfony\Component\Messenger\Transport\TransportInterface; + +/** + * Automatically adds any required database tables to the Doctrine Schema. + */ +class MessengerTransportDoctrineSchemaListener extends AbstractSchemaListener +{ + private const PROCESSING_TABLE_FLAG = self::class.':processing'; + + /** + * @param iterable $transports + */ + public function __construct(private iterable $transports) + { + } + + public function postGenerateSchema(GenerateSchemaEventArgs $event): void + { + $connection = $event->getEntityManager()->getConnection(); + + foreach ($this->transports as $transport) { + if (!$transport instanceof DoctrineTransport) { + continue; + } + + $transport->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection)); + } + } + + public function onSchemaCreateTable(SchemaCreateTableEventArgs $event): void + { + $table = $event->getTable(); + + // if this method triggers a nested create table below, allow Doctrine to work like normal + if ($table->hasOption(self::PROCESSING_TABLE_FLAG)) { + return; + } + + foreach ($this->transports as $transport) { + if (!$transport instanceof DoctrineTransport) { + continue; + } + + if (!$extraSql = $transport->getExtraSetupSqlForTable($table)) { + continue; + } + + // avoid this same listener from creating a loop on this table + $table->addOption(self::PROCESSING_TABLE_FLAG, true); + $createTableSql = $event->getPlatform()->getCreateTableSQL($table); + + /* + * Add all the SQL needed to create the table and tell Doctrine + * to "preventDefault" so that only our SQL is used. This is + * the only way to inject some extra SQL. + */ + $event->addSql($createTableSql); + foreach ($extraSql as $sql) { + $event->addSql($sql); + } + $event->preventDefault(); + + return; + } + } +} diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php index 155c5e9602515..10b2372ab161e 100644 --- a/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php +++ b/src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php @@ -11,84 +11,28 @@ namespace Symfony\Bridge\Doctrine\SchemaListener; -use Doctrine\DBAL\Event\SchemaCreateTableEventArgs; +use Doctrine\Common\EventSubscriber; use Doctrine\DBAL\Events; -use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; -use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransport; -use Symfony\Component\Messenger\Transport\TransportInterface; +use Doctrine\ORM\Tools\ToolEvents; + +trigger_deprecation('symfony/doctrine-bridge', '6.3', 'The "%s" class is deprecated. Use "%s" instead.', MessengerTransportDoctrineSchemaSubscriber::class, MessengerTransportDoctrineSchemaListener::class); /** * Automatically adds any required database tables to the Doctrine Schema. * * @author Ryan Weaver + * + * @deprecated since Symfony 6.3, use {@link MessengerTransportDoctrineSchemaListener} instead */ -final class MessengerTransportDoctrineSchemaSubscriber extends AbstractSchemaSubscriber +final class MessengerTransportDoctrineSchemaSubscriber extends MessengerTransportDoctrineSchemaListener implements EventSubscriber { - private const PROCESSING_TABLE_FLAG = self::class.':processing'; - - private iterable $transports; - - /** - * @param iterable $transports - */ - public function __construct(iterable $transports) - { - $this->transports = $transports; - } - - public function postGenerateSchema(GenerateSchemaEventArgs $event): void - { - $connection = $event->getEntityManager()->getConnection(); - - foreach ($this->transports as $transport) { - if (!$transport instanceof DoctrineTransport) { - continue; - } - - $transport->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection)); - } - } - - public function onSchemaCreateTable(SchemaCreateTableEventArgs $event): void + public function getSubscribedEvents(): array { - $table = $event->getTable(); - - // if this method triggers a nested create table below, allow Doctrine to work like normal - if ($table->hasOption(self::PROCESSING_TABLE_FLAG)) { - return; - } - - foreach ($this->transports as $transport) { - if (!$transport instanceof DoctrineTransport) { - continue; - } - - if (!$extraSql = $transport->getExtraSetupSqlForTable($table)) { - continue; - } + $subscribedEvents = []; - // avoid this same listener from creating a loop on this table - $table->addOption(self::PROCESSING_TABLE_FLAG, true); - $createTableSql = $event->getPlatform()->getCreateTableSQL($table); - - /* - * Add all the SQL needed to create the table and tell Doctrine - * to "preventDefault" so that only our SQL is used. This is - * the only way to inject some extra SQL. - */ - $event->addSql($createTableSql); - foreach ($extraSql as $sql) { - $event->addSql($sql); - } - $event->preventDefault(); - - return; + if (class_exists(ToolEvents::class)) { + $subscribedEvents[] = ToolEvents::postGenerateSchema; } - } - - public function getSubscribedEvents(): array - { - $subscribedEvents = parent::getSubscribedEvents(); if (class_exists(Events::class)) { $subscribedEvents[] = Events::onSchemaCreateTable; diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaListener.php similarity index 81% rename from src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php rename to src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaListener.php index a2be4582bf421..5035743080e9d 100644 --- a/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaSubscriber.php +++ b/src/Symfony/Bridge/Doctrine/SchemaListener/PdoSessionHandlerSchemaListener.php @@ -14,7 +14,7 @@ use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler; -final class PdoSessionHandlerSchemaSubscriber extends AbstractSchemaSubscriber +final class PdoSessionHandlerSchemaListener extends AbstractSchemaListener { private PdoSessionHandler $sessionHandler; @@ -25,13 +25,12 @@ public function __construct(\SessionHandlerInterface $sessionHandler) } } - public function getSubscribedEvents(): array - { - return isset($this->sessionHandler) ? parent::getSubscribedEvents() : []; - } - public function postGenerateSchema(GenerateSchemaEventArgs $event): void { + if (!isset($this->sessionHandler)) { + return; + } + $connection = $event->getEntityManager()->getConnection(); $this->sessionHandler->configureSchema($event->getSchema(), $this->getIsSameDatabaseChecker($connection)); diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaListener.php b/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaListener.php new file mode 100644 index 0000000000000..a7f4c49d58784 --- /dev/null +++ b/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaListener.php @@ -0,0 +1,44 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\Doctrine\SchemaListener; + +use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; +use Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider; +use Symfony\Component\Security\Http\RememberMe\PersistentRememberMeHandler; +use Symfony\Component\Security\Http\RememberMe\RememberMeHandlerInterface; + +/** + * Automatically adds the rememberme table needed for the {@see DoctrineTokenProvider}. + */ +class RememberMeTokenProviderDoctrineSchemaListener extends AbstractSchemaListener +{ + /** + * @param iterable $rememberMeHandlers + */ + public function __construct(private iterable $rememberMeHandlers) + { + } + + public function postGenerateSchema(GenerateSchemaEventArgs $event): void + { + $connection = $event->getEntityManager()->getConnection(); + + foreach ($this->rememberMeHandlers as $rememberMeHandler) { + if ( + $rememberMeHandler instanceof PersistentRememberMeHandler + && ($tokenProvider = $rememberMeHandler->getTokenProvider()) instanceof DoctrineTokenProvider + ) { + $tokenProvider->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection)); + } + } + } +} diff --git a/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php b/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php index bd7540f1bbe44..82a5a7817b7b5 100644 --- a/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php +++ b/src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php @@ -11,39 +11,29 @@ namespace Symfony\Bridge\Doctrine\SchemaListener; -use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; +use Doctrine\Common\EventSubscriber; +use Doctrine\ORM\Tools\ToolEvents; use Symfony\Bridge\Doctrine\Security\RememberMe\DoctrineTokenProvider; -use Symfony\Component\Security\Http\RememberMe\PersistentRememberMeHandler; -use Symfony\Component\Security\Http\RememberMe\RememberMeHandlerInterface; + +trigger_deprecation('symfony/doctrine-bridge', '6.3', 'The "%s" class is deprecated. Use "%s" instead.', RememberMeTokenProviderDoctrineSchemaSubscriber::class, RememberMeTokenProviderDoctrineSchemaListener::class); /** * Automatically adds the rememberme table needed for the {@see DoctrineTokenProvider}. * * @author Wouter de Jong + * + * @deprecated since Symfony 6.3, use {@link RememberMeTokenProviderDoctrineSchemaListener} instead */ -final class RememberMeTokenProviderDoctrineSchemaSubscriber extends AbstractSchemaSubscriber +final class RememberMeTokenProviderDoctrineSchemaSubscriber extends RememberMeTokenProviderDoctrineSchemaListener implements EventSubscriber { - private iterable $rememberMeHandlers; - - /** - * @param iterable $rememberMeHandlers - */ - public function __construct(iterable $rememberMeHandlers) - { - $this->rememberMeHandlers = $rememberMeHandlers; - } - - public function postGenerateSchema(GenerateSchemaEventArgs $event): void + public function getSubscribedEvents(): array { - $connection = $event->getEntityManager()->getConnection(); - - foreach ($this->rememberMeHandlers as $rememberMeHandler) { - if ( - $rememberMeHandler instanceof PersistentRememberMeHandler - && ($tokenProvider = $rememberMeHandler->getTokenProvider()) instanceof DoctrineTokenProvider - ) { - $tokenProvider->configureSchema($event->getSchema(), $connection, $this->getIsSameDatabaseChecker($connection)); - } + if (!class_exists(ToolEvents::class)) { + return []; } + + return [ + ToolEvents::postGenerateSchema, + ]; } } diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php index 0a65b6e6bc720..4386ff6c51d3e 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriberTest.php @@ -16,7 +16,7 @@ use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaSubscriber; +use Symfony\Bridge\Doctrine\SchemaListener\DoctrineDbalCacheAdapterSchemaListener; use Symfony\Component\Cache\Adapter\DoctrineDbalAdapter; class DoctrineDbalCacheAdapterSchemaSubscriberTest extends TestCase @@ -37,7 +37,7 @@ public function testPostGenerateSchema() ->method('configureSchema') ->with($schema, $dbalConnection); - $subscriber = new DoctrineDbalCacheAdapterSchemaSubscriber([$dbalAdapter]); + $subscriber = new DoctrineDbalCacheAdapterSchemaListener([$dbalAdapter]); $subscriber->postGenerateSchema($event); } } diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php index ff4ab2c27a19c..31d4004d923a5 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/MessengerTransportDoctrineSchemaSubscriberTest.php @@ -19,7 +19,7 @@ use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\Doctrine\SchemaListener\MessengerTransportDoctrineSchemaSubscriber; +use Symfony\Bridge\Doctrine\SchemaListener\MessengerTransportDoctrineSchemaListener; use Symfony\Component\Messenger\Bridge\Doctrine\Transport\DoctrineTransport; use Symfony\Component\Messenger\Transport\TransportInterface; @@ -43,7 +43,7 @@ public function testPostGenerateSchema() $otherTransport->expects($this->never()) ->method($this->anything()); - $subscriber = new MessengerTransportDoctrineSchemaSubscriber([$doctrineTransport, $otherTransport]); + $subscriber = new MessengerTransportDoctrineSchemaListener([$doctrineTransport, $otherTransport]); $subscriber->postGenerateSchema($event); } @@ -69,7 +69,8 @@ public function testOnSchemaCreateTable() ->with($table) ->willReturn('CREATE TABLE pizza (id integer NOT NULL)'); - $subscriber = new MessengerTransportDoctrineSchemaSubscriber([$otherTransport, $doctrineTransport]); + $subscriber = new MessengerTransportDoctrineSchemaListener([$otherTransport, $doctrineTransport]); + $subscriber->onSchemaCreateTable($event); $this->assertTrue($event->isDefaultPrevented()); $this->assertSame([ @@ -92,7 +93,8 @@ public function testOnSchemaCreateTableNoExtraSql() $platform->expects($this->never()) ->method('getCreateTableSQL'); - $subscriber = new MessengerTransportDoctrineSchemaSubscriber([$doctrineTransport]); + $subscriber = new MessengerTransportDoctrineSchemaListener([$doctrineTransport]); + $subscriber->onSchemaCreateTable($event); $this->assertFalse($event->isDefaultPrevented()); } diff --git a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaListenerTest.php similarity index 89% rename from src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php rename to src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaListenerTest.php index 627848c0bcc0a..fce89261082c7 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaSubscriberTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/SchemaListener/PdoSessionHandlerSchemaListenerTest.php @@ -16,10 +16,10 @@ use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; use PHPUnit\Framework\TestCase; -use Symfony\Bridge\Doctrine\SchemaListener\PdoSessionHandlerSchemaSubscriber; +use Symfony\Bridge\Doctrine\SchemaListener\PdoSessionHandlerSchemaListener; use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler; -class PdoSessionHandlerSchemaSubscriberTest extends TestCase +class PdoSessionHandlerSchemaListenerTest extends TestCase { public function testPostGenerateSchemaPdo() { @@ -36,7 +36,7 @@ public function testPostGenerateSchemaPdo() ->method('configureSchema') ->with($schema, fn () => true); - $subscriber = new PdoSessionHandlerSchemaSubscriber($pdoSessionHandler); + $subscriber = new PdoSessionHandlerSchemaListener($pdoSessionHandler); $subscriber->postGenerateSchema($event); } } pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy