From 2d59b2f4c0845f405cec3810d73b095855934f03 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 4 Jul 2023 17:38:26 +0200 Subject: [PATCH] [6.4] Fix remainings from previous deprecations --- UPGRADE-6.4.md | 5 ++++ .../Tests/Middleware/Debug/MiddlewareTest.php | 2 ++ .../Compiler/ExtensionPass.php | 2 +- src/Symfony/Component/Cache/CHANGELOG.md | 5 ++++ .../Messenger/EarlyExpirationHandler.php | 5 ++-- .../Resource/ReflectionClassResourceTest.php | 23 +++++++++++-------- .../Amqp/Tests/Fixtures/long_receiver.php | 4 ++-- 7 files changed, 32 insertions(+), 14 deletions(-) diff --git a/UPGRADE-6.4.md b/UPGRADE-6.4.md index 58cbb0d322ada..0815c5ce9bd73 100644 --- a/UPGRADE-6.4.md +++ b/UPGRADE-6.4.md @@ -1,6 +1,11 @@ UPGRADE FROM 6.3 to 6.4 ======================= +Cache +----- + + * `EarlyExpirationHandler` no longer implements `MessageHandlerInterface`, rely on `AsMessageHandler` instead + DependencyInjection ------------------- diff --git a/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php index 84e48fbdf44df..72e77e00b00de 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php @@ -277,5 +277,7 @@ public function testWithoutStopwatch(callable $sqlMethod, callable $endTransacti $this->conn->beginTransaction(); $sqlMethod($this->conn, 'SELECT * FROM products'); $endTransactionMethod($this->conn); + + $this->addToAssertionCount(1); } } diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php index 63dd68e91b90d..a7d44e53ae72e 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php @@ -128,7 +128,7 @@ public function process(ContainerBuilder $container) $container->getDefinition('twig.extension.expression')->addTag('twig.extension'); } - if (!class_exists(Workflow::class) || !$container->has('workflow.registry')) { + if (!class_exists(Workflow::class) || !$container->has('.workflow.registry')) { $container->removeDefinition('workflow.twig_extension'); } else { $container->getDefinition('workflow.twig_extension')->addTag('twig.extension'); diff --git a/src/Symfony/Component/Cache/CHANGELOG.md b/src/Symfony/Component/Cache/CHANGELOG.md index 0715f5e726b27..4c1c9d4205762 100644 --- a/src/Symfony/Component/Cache/CHANGELOG.md +++ b/src/Symfony/Component/Cache/CHANGELOG.md @@ -1,6 +1,11 @@ CHANGELOG ========= +6.4 +--- + + * `EarlyExpirationHandler` no longer implements `MessageHandlerInterface`, rely on `AsMessageHandler` instead + 6.3 --- diff --git a/src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php b/src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php index 38b594c289252..b7155fbf97218 100644 --- a/src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php +++ b/src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php @@ -13,12 +13,13 @@ use Symfony\Component\Cache\CacheItem; use Symfony\Component\DependencyInjection\ReverseContainer; -use Symfony\Component\Messenger\Handler\MessageHandlerInterface; +use Symfony\Component\Messenger\Attribute\AsMessageHandler; /** * Computes cached values sent to a message bus. */ -class EarlyExpirationHandler implements MessageHandlerInterface +#[AsMessageHandler] +class EarlyExpirationHandler { private ReverseContainer $reverseContainer; private array $processedNonces = []; diff --git a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php index e851f20b76fe9..ef7a9b420fbdd 100644 --- a/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php +++ b/src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php @@ -175,6 +175,9 @@ public function testEventSubscriber() $this->assertTrue($res->isFresh(0)); } + /** + * @group legacy + */ public function testMessageSubscriber() { $res = new ReflectionClassResource(new \ReflectionClass(TestMessageSubscriber::class)); @@ -229,18 +232,20 @@ public static function getSubscribedEvents(): array } } -class TestMessageSubscriber implements MessageSubscriberInterface -{ - public static function getHandledMessages(): iterable +if (interface_exists(MessageSubscriberInterface::class)) { + class TestMessageSubscriber implements MessageSubscriberInterface { - foreach (TestMessageSubscriberConfigHolder::$handledMessages as $key => $subscribedMessage) { - yield $key => $subscribedMessage; + public static function getHandledMessages(): iterable + { + foreach (TestMessageSubscriberConfigHolder::$handledMessages as $key => $subscribedMessage) { + yield $key => $subscribedMessage; + } } } -} -class TestMessageSubscriberConfigHolder -{ - public static $handledMessages = []; + class TestMessageSubscriberConfigHolder + { + public static $handledMessages = []; + } } class TestServiceSubscriber implements ServiceSubscriberInterface diff --git a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php index 7a224a5c0b2c1..5aaca31e88cd0 100644 --- a/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php +++ b/src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php @@ -17,7 +17,7 @@ use Symfony\Component\Messenger\Bridge\Amqp\Transport\Connection; use Symfony\Component\Messenger\Envelope; use Symfony\Component\Messenger\EventListener\DispatchPcntlSignalListener; -use Symfony\Component\Messenger\EventListener\StopWorkerOnSigtermSignalListener; +use Symfony\Component\Messenger\EventListener\StopWorkerOnSignalsListener; use Symfony\Component\Messenger\MessageBusInterface; use Symfony\Component\Messenger\Transport\Serialization\Serializer; use Symfony\Component\Messenger\Worker; @@ -33,7 +33,7 @@ $connection = Connection::fromDsn(getenv('DSN')); $receiver = new AmqpReceiver($connection, $serializer); $eventDispatcher = new EventDispatcher(); -$eventDispatcher->addSubscriber(new StopWorkerOnSigtermSignalListener()); +$eventDispatcher->addSubscriber(new StopWorkerOnSignalsListener()); $eventDispatcher->addSubscriber(new DispatchPcntlSignalListener()); $worker = new Worker(['the_receiver' => $receiver], new class() implements MessageBusInterface { 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