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

Commit 746b123

Browse files
alexandre-dauboisnicolas-grekas
alexandre-daubois
authored and
nicolas-grekas
committed
[DoctrineBridge] Remove deprecated classes and ContainerAwareEventManager::getListeners() deprecation
1 parent aca170b commit 746b123

14 files changed

+56
-789
lines changed

‎.github/expected-missing-return-types.diff

+13-31
Original file line numberDiff line numberDiff line change
@@ -8,31 +8,24 @@ git checkout src/Symfony/Contracts/Service/ResetInterface.php
88
git checkout composer.json src/
99

1010
diff --git a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
11-
index ada5fcbd49..51af652f08 100644
11+
index f127a38708..ed7fd8b1b6 100644
1212
--- a/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
1313
+++ b/src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php
14-
@@ -51,5 +51,5 @@ class DoctrineDataCollector extends DataCollector
15-
* @return void
16-
*/
17-
- public function addLogger(string $name, DebugStack $logger)
18-
+ public function addLogger(string $name, DebugStack $logger): void
19-
{
20-
$this->loggers[$name] = $logger;
21-
@@ -59,5 +59,5 @@ class DoctrineDataCollector extends DataCollector
14+
@@ -49,5 +49,5 @@ class DoctrineDataCollector extends DataCollector
2215
* @return void
2316
*/
2417
- public function collect(Request $request, Response $response, \Throwable $exception = null)
2518
+ public function collect(Request $request, Response $response, \Throwable $exception = null): void
2619
{
2720
$this->data = [
28-
@@ -90,5 +90,5 @@ class DoctrineDataCollector extends DataCollector
21+
@@ -80,5 +80,5 @@ class DoctrineDataCollector extends DataCollector
2922
* @return void
3023
*/
3124
- public function reset()
3225
+ public function reset(): void
3326
{
3427
$this->data = [];
35-
@@ -119,5 +119,5 @@ class DoctrineDataCollector extends DataCollector
28+
@@ -109,5 +109,5 @@ class DoctrineDataCollector extends DataCollector
3629
* @return int
3730
*/
3831
- public function getQueryCount()
@@ -201,17 +194,6 @@ index c096b558db..8d584900a9 100644
201194
+ public function configureOptions(OptionsResolver $resolver): void
202195
{
203196
parent::configureOptions($resolver);
204-
diff --git a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
205-
index b2369e95d6..c33484608e 100644
206-
--- a/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
207-
+++ b/src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php
208-
@@ -52,5 +52,5 @@ class DbalLogger implements SQLLogger
209-
* @return void
210-
*/
211-
- protected function log(string $message, array $params)
212-
+ protected function log(string $message, array $params): void
213-
{
214-
$this->logger->debug($message, $params);
215197
diff --git a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php b/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
216198
index 38618fc15e..eb599eb0b4 100644
217199
--- a/src/Symfony/Bridge/Doctrine/Messenger/DoctrineClearEntityManagerWorkerSubscriber.php
@@ -999,17 +981,17 @@ index a2c5815e4b..1c9721ccc6 100644
999981
+ public function addConfiguration(NodeDefinition $builder): void;
1000982
}
1001983
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
1002-
index 37978b285f..ca1f5ae517 100644
984+
index 3c504b6001..55f1a0353b 100644
1003985
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
1004986
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
1005-
@@ -82,5 +82,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
987+
@@ -83,5 +83,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
1006988
* @return void
1007989
*/
1008990
- public function prepend(ContainerBuilder $container)
1009991
+ public function prepend(ContainerBuilder $container): void
1010992
{
1011993
foreach ($this->getSortedFactories() as $factory) {
1012-
@@ -94,5 +94,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
994+
@@ -95,5 +95,5 @@ class SecurityExtension extends Extension implements PrependExtensionInterface
1013995
* @return void
1014996
*/
1015997
- public function load(array $configs, ContainerBuilder $container)
@@ -4698,7 +4680,7 @@ index f610b014a0..9458751c28 100644
46984680
+ abstract protected function setNode(\DOMElement $node): void;
46994681
}
47004682
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
4701-
index 59eec3068c..b750e80938 100644
4683+
index 274aeee5fc..ccf37dae8b 100644
47024684
--- a/src/Symfony/Component/DomCrawler/Crawler.php
47034685
+++ b/src/Symfony/Component/DomCrawler/Crawler.php
47044686
@@ -96,5 +96,5 @@ class Crawler implements \Countable, \IteratorAggregate
@@ -8383,7 +8365,7 @@ index efa1a4f737..752eb19faf 100644
83838365
+ public function lateCollect(): void;
83848366
}
83858367
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
8386-
index 094683ccce..5582af522e 100644
8368+
index 91e17358a0..d1c8bfe7d0 100644
83878369
--- a/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
83888370
+++ b/src/Symfony/Component/HttpKernel/DataCollector/RequestDataCollector.php
83898371
@@ -199,5 +199,5 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
@@ -8964,7 +8946,7 @@ index 0f3630e7fe..ddf77b8a19 100644
89648946
{
89658947
return <<<'EOF'
89668948
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
8967-
index 9d4c5f22b3..4030ab8b12 100644
8949+
index 76205bc0b8..f4240cdd1b 100644
89688950
--- a/src/Symfony/Component/HttpKernel/Kernel.php
89698951
+++ b/src/Symfony/Component/HttpKernel/Kernel.php
89708952
@@ -107,5 +107,5 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl
@@ -10911,7 +10893,7 @@ index bde72c0eb0..3d6813e1d4 100644
1091110893
{
1091210894
if (!\is_array($config)) {
1091310895
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
10914-
index e92a5ea3d7..4a0af31349 100644
10896+
index 0e740bdf6c..21b68e3600 100644
1091510897
--- a/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
1091610898
+++ b/src/Symfony/Component/Routing/Matcher/Dumper/CompiledUrlMatcherDumper.php
1091710899
@@ -54,5 +54,5 @@ EOF;
@@ -13947,7 +13929,7 @@ index d2d3fc1294..c28829f4e2 100644
1394713929
{
1394813930
$a += [
1394913931
diff --git a/src/Symfony/Component/VarDumper/Caster/DateCaster.php b/src/Symfony/Component/VarDumper/Caster/DateCaster.php
13950-
index 1394a78132..ee8471c88f 100644
13932+
index 2779b37f9e..4bb25e9966 100644
1395113933
--- a/src/Symfony/Component/VarDumper/Caster/DateCaster.php
1395213934
+++ b/src/Symfony/Component/VarDumper/Caster/DateCaster.php
1395313935
@@ -28,5 +28,5 @@ class DateCaster
@@ -14292,7 +14274,7 @@ index 6ff046754d..2b9382f1a7 100644
1429214274
{
1429314275
$prefix = Caster::PREFIX_VIRTUAL;
1429414276
diff --git a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
14295-
index 4adb9bc9fe..bc151bb2a2 100644
14277+
index a356729bd0..a3f1b49e4e 100644
1429614278
--- a/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
1429714279
+++ b/src/Symfony/Component/VarDumper/Caster/ReflectionCaster.php
1429814280
@@ -39,5 +39,5 @@ class ReflectionCaster

‎UPGRADE-7.0.md

+11
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,17 @@ 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+
* Remove `DoctrineDbalCacheAdapterSchemaSubscriber`, use `DoctrineDbalCacheAdapterSchemaListener` instead
12+
* Remove `MessengerTransportDoctrineSchemaSubscriber`, use `MessengerTransportDoctrineSchemaListener` instead
13+
* Remove `RememberMeTokenProviderDoctrineSchemaSubscriber`, use `RememberMeTokenProviderDoctrineSchemaListener` instead
14+
* Remove `DbalLogger`, use a middleware instead
15+
* Remove `DoctrineDataCollector::addLogger()`, use a `DebugDataHolder` instead
16+
* `ContainerAwareEventManager::getListeners()` must be called with an event name
17+
* DoctrineBridge now requires `doctrine/event-manager:^2`
18+
819
ProxyManagerBridge
920
------------------
1021

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"php": ">=8.2",
3737
"composer-runtime-api": ">=2.1",
3838
"ext-xml": "*",
39-
"doctrine/event-manager": "^1.2|^2",
39+
"doctrine/event-manager": "^2",
4040
"doctrine/persistence": "^2|^3",
4141
"twig/twig": "^2.13|^3.0.4",
4242
"psr/cache": "^2.0|^3.0",

‎src/Symfony/Bridge/Doctrine/CHANGELOG.md

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

4+
7.0
5+
---
6+
7+
* Remove `DoctrineDbalCacheAdapterSchemaSubscriber`, use `DoctrineDbalCacheAdapterSchemaListener` instead
8+
* Remove `MessengerTransportDoctrineSchemaSubscriber`, use `MessengerTransportDoctrineSchemaListener` instead
9+
* Remove `RememberMeTokenProviderDoctrineSchemaSubscriber`, use `RememberMeTokenProviderDoctrineSchemaListener` instead
10+
* Remove `DbalLogger`, use a middleware instead
11+
* Remove `DoctrineDataCollector::addLogger()`, use a `DebugDataHolder` instead
12+
* `ContainerAwareEventManager::getListeners()` must be called with an event name
13+
* DoctrineBridge now requires `doctrine/event-manager:^2`
14+
415
6.4
516
---
617

‎src/Symfony/Bridge/Doctrine/ContainerAwareEventManager.php

+7-16
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function __construct(ContainerInterface $container, array $listeners = []
4343
$this->listeners = $listeners;
4444
}
4545

46-
public function dispatchEvent($eventName, EventArgs $eventArgs = null): void
46+
public function dispatchEvent(string $eventName, EventArgs $eventArgs = null): void
4747
{
4848
if (!$this->initializedSubscribers) {
4949
$this->initializeSubscribers();
@@ -63,13 +63,8 @@ public function dispatchEvent($eventName, EventArgs $eventArgs = null): void
6363
}
6464
}
6565

66-
public function getListeners($event = null): array
66+
public function getListeners(string $event): array
6767
{
68-
if (null === $event) {
69-
trigger_deprecation('symfony/doctrine-bridge', '6.2', 'Calling "%s()" without an event name is deprecated. Call "getAllListeners()" instead.', __METHOD__);
70-
71-
return $this->getAllListeners();
72-
}
7368
if (!$this->initializedSubscribers) {
7469
$this->initializeSubscribers();
7570
}
@@ -95,7 +90,7 @@ public function getAllListeners(): array
9590
return $this->listeners;
9691
}
9792

98-
public function hasListeners($event): bool
93+
public function hasListeners(string $event): bool
9994
{
10095
if (!$this->initializedSubscribers) {
10196
$this->initializeSubscribers();
@@ -104,7 +99,7 @@ public function hasListeners($event): bool
10499
return isset($this->listeners[$event]) && $this->listeners[$event];
105100
}
106101

107-
public function addEventListener($events, $listener): void
102+
public function addEventListener(string|array $events, object|string $listener): void
108103
{
109104
if (!$this->initializedSubscribers) {
110105
$this->initializeSubscribers();
@@ -125,7 +120,7 @@ public function addEventListener($events, $listener): void
125120
}
126121
}
127122

128-
public function removeEventListener($events, $listener): void
123+
public function removeEventListener(string|array $events, object|string $listener): void
129124
{
130125
if (!$this->initializedSubscribers) {
131126
$this->initializeSubscribers();
@@ -185,12 +180,8 @@ private function initializeSubscribers(): void
185180
$this->addEventListener(...$listener);
186181
continue;
187182
}
188-
if (\is_string($listener)) {
189-
$listener = $this->container->get($listener);
190-
}
191-
// throw new \InvalidArgumentException(sprintf('Using Doctrine subscriber "%s" is not allowed, declare it as a listener instead.', \is_object($listener) ? $listener::class : $listener));
192-
trigger_deprecation('symfony/doctrine-bridge', '6.3', 'Using Doctrine subscribers as services is deprecated, declare listeners instead');
193-
parent::addEventSubscriber($listener);
183+
184+
throw new \InvalidArgumentException(sprintf('Using Doctrine subscriber "%s" is not allowed, declare it as a listener instead.', get_debug_type($listener)));
194185
}
195186
}
196187

‎src/Symfony/Bridge/Doctrine/DataCollector/DoctrineDataCollector.php

+1-19
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,10 @@ class DoctrineDataCollector extends DataCollector
3939

4040
public function __construct(
4141
private ManagerRegistry $registry,
42-
private ?DebugDataHolder $debugDataHolder = null,
42+
private DebugDataHolder $debugDataHolder,
4343
) {
4444
$this->connections = $registry->getConnectionNames();
4545
$this->managers = $registry->getManagerNames();
46-
47-
if (null === $debugDataHolder) {
48-
trigger_deprecation('symfony/doctrine-bridge', '6.4', 'Not passing an instance of "%s" as "$debugDataHolder" to "%s()" is deprecated.', DebugDataHolder::class, __METHOD__);
49-
}
50-
}
51-
52-
/**
53-
* Adds the stack logger for a connection.
54-
*
55-
* @return void
56-
*
57-
* @deprecated since Symfony 6.4, use a DebugDataHolder instead.
58-
*/
59-
public function addLogger(string $name, DebugStack $logger)
60-
{
61-
trigger_deprecation('symfony/doctrine-bridge', '6.4', '"%s()" is deprecated. Pass an instance of "%s" to the constructor instead.', __METHOD__, DebugDataHolder::class);
62-
63-
$this->loggers[$name] = $logger;
6446
}
6547

6648
/**

‎src/Symfony/Bridge/Doctrine/Logger/DbalLogger.php

-91
This file was deleted.

0 commit comments

Comments
 (0)
0