8000 minor #50878 [6.4] Fix remainings from previous deprecations (nicolas… · symfony/symfony@2ca1643 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2ca1643

Browse files
nicolas-grekasnicolas-grekas
committed
minor #50878 [6.4] Fix remainings from previous deprecations (nicolas-grekas)
This PR was merged into the 6.4 branch. Discussion ---------- [6.4] Fix remainings from previous deprecations | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Found while working on #50873 Commits ------- 2d59b2f [6.4] Fix remainings from previous deprecations
2 parents 4985561 + 2d59b2f commit 2ca1643

File tree

7 files changed

+32
-14
lines changed

7 files changed

+32
-14
lines changed

‎UPGRADE-6.4.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
UPGRADE FROM 6.3 to 6.4
22
=======================
33

4+
Cache
5+
-----
6+
7+
* `EarlyExpirationHandler` no longer implements `MessageHandlerInterface`, rely on `AsMessageHandler` instead
8+
49
DependencyInjection
510
-------------------
611

‎src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,5 +277,7 @@ public function testWithoutStopwatch(callable $sqlMethod, callable $endTransacti
277277
$this->conn->beginTransaction();
278278
$sqlMethod($this->conn, 'SELECT * FROM products');
279279
$endTransactionMethod($this->conn);
280+
281+
$this->addToAssertionCount(1);
280282
}
281283
}

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function process(ContainerBuilder $container)
128128
$container->getDefinition('twig.extension.expression')->addTag('twig.extension');
129129
}
130130

131-
if (!class_exists(Workflow::class) || !$container->has('workflow.registry')) {
131+
if (!class_exists(Workflow::class) || !$container->has('.workflow.registry')) {
132132
$container->removeDefinition('workflow.twig_extension');
133133
} else {
134134
$container->getDefinition('workflow.twig_extension')->addTag('twig.extension');

‎src/Symfony/Component/Cache/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
6.4
5+
---
6+
7+
* `EarlyExpirationHandler` no longer implements `MessageHandlerInterface`, rely on `AsMessageHandler` instead
8+
49
6.3
510
---
611

‎src/Symfony/Component/Cache/Messenger/EarlyExpirationHandler.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313

1414
use Symfony\Component\Cache\CacheItem;
1515
use Symfony\Component\DependencyInjection\ReverseContainer;
16-
use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
16+
use Symfony\Component\Messenger\Attribute\AsMessageHandler;
1717

1818
/**
1919
* Computes cached values sent to a message bus.
2020
*/
21-
class EarlyExpirationHandler implements MessageHandlerInterface
21+
#[AsMessageHandler]
22+
class EarlyExpirationHandler
2223
{
2324
private ReverseContainer $reverseContainer;
2425
private array $processedNonces = [];

‎src/Symfony/Component/Config/Tests/Resource/ReflectionClassResourceTest.php

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@ public function testEventSubscriber()
175175
$this->assertTrue($res->isFresh(0));
176176
}
177177

178+
/**
179+
* @group legacy
180+
*/
178181
public function testMessageSubscriber()
179182
{
180183
$res = new ReflectionClassResource(new \ReflectionClass(TestMessageSubscriber::class));
@@ -229,18 +232,20 @@ public static function getSubscribedEvents(): array
229232
}
230233
}
231234

232-
class TestMessageSubscriber implements MessageSubscriberInterface
233-
{
234-
public static function getHandledMessages(): iterable
235+
if (interface_exists(MessageSubscriberInterface::class)) {
236+
class TestMessageSubscriber implements MessageSubscriberInterface
235237
{
236-
foreach (TestMessageSubscriberConfigHolder::$handledMessages as $key => $subscribedMessage) {
237-
yield $key => $subscribedMessage;
238+
public static function getHandledMessages(): iterable
239+
{
240+
foreach (TestMessageSubscriberConfigHolder::$handledMessages as $key => $subscribedMessage) {
241+
yield $key => $subscribedMessage;
242+
}
238243
}
239244
}
240-
}
241-
class TestMessageSubscriberConfigHolder
242-
{
243-
public static $handledMessages = [];
245+
class TestMessageSubscriberConfigHolder
246+
{
247+
public static $handledMessages = [];
248+
}
244249
}
245250

246251
class TestServiceSubscriber implements ServiceSubscriberInterface

‎src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Fixtures/long_receiver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
use Symfony\Component\Messenger\Bridge\Amqp\Transport\Connection;
1818
use Symfony\Component\Messenger\Envelope;
1919
use Symfony\Component\Messenger\EventListener\DispatchPcntlSignalListener;
20-
use Symfony\Component\Messenger\EventListener\StopWorkerOnSigtermSignalListener;
20+
use Symfony\Component\Messenger\EventListener\StopWorkerOnSignalsListener;
2121
use Symfony\Component\Messenger\MessageBusInterface;
2222
use Symfony\Component\Messenger\Transport\Serialization\Serializer;
2323
use Symfony\Component\Messenger\Worker;
@@ -33,7 +33,7 @@
3333
$connection = Connection::fromDsn(getenv('DSN'));
3434
$receiver = new AmqpReceiver($connection, $serializer);
3535
$eventDispatcher = new EventDispatcher();
36-
$eventDispatcher->addSubscriber(new StopWorkerOnSigtermSignalListener());
36+
$eventDispatcher->addSubscriber(new StopWorkerOnSignalsListener());
3737
$eventDispatcher->addSubscriber(new DispatchPcntlSignalListener());
3838

3939
$worker = new Worker(['the_receiver' => $receiver], new class() implements MessageBusInterface {

0 commit comments

Comments
 (0)
0