8000 [DoctrineBridge] Remove deprecated classes and `ContainerAwareEventMa… · symfony/symfony@a97b1f2 · GitHub
[go: up one dir, main page]

Skip to content

Commit a97b1f2

Browse files
[DoctrineBridge] Remove deprecated classes and ContainerAwareEventManager::getListeners() deprecation
1 parent f0a5f45 commit a97b1f2

9 files changed

+38
-288
lines changed

UPGRADE-7.0.md

+9
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ Symfony 6.4 and Symfony 7.0 will be released simultaneously at the end of Novemb
55
release process, both versions will have the same features, but Symfony 7.0 won't include any deprecated features.
66
To upgrade, make sure to resolve all deprecation notices.
77

8+
DoctrineBridge
9+
--------------
10+
11+
* Removed `DoctrineDbalCacheAdapterSchemaSubscriber`, use `DoctrineDbalCacheAdapterSchemaListener` instead
12+
* Removed `MessengerTransportDoctrineSchemaSubscriber`, use `MessengerTransportDoctrineSchemaListener` instead
13+
* Removed `RememberMeTokenProviderDoctrineSchemaSubscriber`, use `RememberMeTokenProviderDoctrineSchemaListener` instead
14+
* `ContainerAwareEventManager::getListeners()` must be called with an event name
15+
* DoctrineBridge now requires `doctrine/event-manager:^2`
16+
817
Serializer
918
----------
1019

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"composer-runtime-api": ">=2.1",
3838
"ext-xml": "*",
3939
"friendsofphp/proxy-manager-lts": "^1.0.2",
40-
"doctrine/event-manager": "^1.2|^2",
40+
"doctrine/event-manager": "^2",
4141
"doctrine/persistence": "^2|^3",
4242
"twig/twig": "^2.13|^3.0.4",
4343
"psr/cache": "^2.0|^3.0",

src/Symfony/Bridge/Doctrine/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
CHANGELOG
22
=========
33

4+
7.0
5+
---
6+
7+
* Remove `DoctrineDbalCacheAdapterSchemaSubscriber`, `MessengerTransportDoctrineSchemaSubscriber` and `RememberMeTokenProviderDoctrineSchemaSubscriber`
8+
* `ContainerAwareEventManager::getListeners()` must be called with an event name
9+
* DoctrineBridge now requires `doctrine/event-manager:^2`
10+
411
6.3
512
---
613

src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

+3-12
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,8 @@ public function dispatchEvent($eventName, EventArgs $eventArgs = null): void
6666
/**
6767
* @return object[][]
6868
*/
69-
public function getListeners($event = null): array
69+
public function getListeners(string $event): array
7070
{
71-
if (null === $event) {
72-
trigger_deprecation('symfony/doctrine-bridge', '6.2', 'Calling "%s()" without an event name is deprecated. Call "getAllListeners()" instead.', __METHOD__);
73-
74-
return $this->getAllListeners();
75-
}
7671
if (!$this->initializedSubscribers) {
7772
$this->initializeSubscribers();
7873
}
@@ -188,12 +183,8 @@ private function initializeSubscribers(): void
188183
$this->addEventListener(...$listener);
189184
continue;
190185
}
191-
if (\is_string($listener)) {
192-
$listener = $this->container->get($listener);
193-
}
194-
// throw new \InvalidArgumentException(sprintf('Using Doctrine subscriber "%s" is not allowed, declare it as a listener instead.', \is_object($listener) ? $listener::class : $listener));
195-
trigger_deprecation('symfony/doctrine-bridge', '6.3', 'Using Doctrine subscribers as services is deprecated, declare listeners instead');
196-
parent::addEventSubscriber($listener);
186+
187+
throw new \InvalidArgumentException(sprintf('Using Doctrine subscriber "%s" is not allowed, declare it as a listener instead.', \is_object($listener) ? $listener::class : $listener));
197188
}
198189
}
199190

src/Symfony/Bridge/Doctrine/SchemaListener/DoctrineDbalCacheAdapterSchemaSubscriber.php

-39
This file was deleted.

src/Symfony/Bridge/Doctrine/SchemaListener/MessengerTransportDoctrineSchemaSubscriber.php

-43
This file was deleted.

src/Symfony/Bridge/Doctrine/SchemaListener/RememberMeTokenProviderDoctrineSchemaSubscriber.php

-39
This file was deleted.

0 commit comments

Comments
 (0)
0