[FrameworkBundle] Rename service notifier.logger_notification_listener to notifier.notification_logger_listener

ker0x · ker0x · commit 16fa082a18c3 · 2022-12-30T12:53:15.000+01:00
diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
@@ -38,6 +38,11 @@ FrameworkBundle
    </framework:config>
    ```
 
+FrameworkBundle
+---------------
+
+* Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
+
 HttpKernel
 ----------
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -9,6 +9,7 @@ CHANGELOG
  * Add `--format` option to the `debug:config` command
  * Add support to pass namespace wildcard in `framework.messenger.routing`
  * Deprecate `framework:exceptions` tag, unwrap it and replace `framework:exception` tags' `name` attribute by `class`
+ * Deprecate the `notifier.logger_notification_listener` service, use the `notifier.notification_logger_listener` service instead
 
 6.2
 ---
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier.php
@@ -128,5 +128,9 @@
 
         ->set('notifier.logger_notification_listener', NotificationLoggerListener::class)
             ->tag('kernel.event_subscriber')
+            ->deprecate('symfony/framework-bundle', '6.3', 'The "%service_id%" service is deprecated, use "notifier.notification_logger_listener" instead.')
+
+        ->set('notifier.notification_logger_listener', NotificationLoggerListener::class)
+            ->tag('kernel.event_subscriber')
     ;
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_debug.php b/src/Symfony/Bundle/FrameworkBundle/Resources/config/notifier_debug.php
@@ -16,7 +16,7 @@
 return static function (ContainerConfigurator $container) {
     $container->services()
         ->set('notifier.data_collector', NotificationDataCollector::class)
-            ->args([service('notifier.logger_notification_listener')])
+            ->args([service('notifier.notification_logger_listener')])
             ->tag('data_collector', ['template' => '@WebProfiler/Collector/notifier.html.twig', 'id' => 'notifier'])
     ;
 };
diff --git a/src/Symfony/Bundle/FrameworkBundle/Test/NotificationAssertionsTrait.php b/src/Symfony/Bundle/FrameworkBundle/Test/NotificationAssertionsTrait.php
@@ -91,6 +91,10 @@ public static function getNotifierMessage(int $index = 0, string $transportName
     public static function getNotificationEvents(): NotificationEvents
     {
         $container = static::getContainer();
+        if ($container->has('notifier.notification_logger_listener')) {
+            return $container->get('notifier.notification_logger_listener')->getEvents();
+        }
+
         if ($container->has('notifier.logger_notification_listener')) {
             return $container->get('notifier.logger_notification_listener')->getEvents();
         }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/NotificationTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/NotificationTest.php
@@ -11,13 +11,21 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
+use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
+
 final class NotificationTest extends AbstractWebTestCase
 {
+    use ExpectDeprecationTrait;
+
     /**
      * @requires function \Symfony\Bundle\MercureBundle\MercureBundle::build
+     *
+     * @group legacy
      */
     public function testNotifierAssertion()
     {
+        $this->expectDeprecation('Since symfony/framework-bundle 6.3: The "notifier.logger_notification_listener" service is deprecated, use "notifier.notification_logger_listener" instead.');
+
         $client = $this->createClient(['test_case' => 'Notifier', 'root_config' => 'config.yml', 'debug' => true]);
         $client->request('GET', '/send_notification');
 

Original file line number	Diff line number	Diff line change
`@@ -128,5 +128,9 @@`
`128`	`128`
`129`	`129`	`->set('notifier.logger_notification_listener', NotificationLoggerListener::class)`
`130`	`130`	`->tag('kernel.event_subscriber')`
	`131`	`+ ->deprecate('symfony/framework-bundle', '6.3', 'The "%service_id%" service is deprecated, use "notifier.notification_logger_listener" instead.')`
	`132`	`+`
	`133`	`+ ->set('notifier.notification_logger_listener', NotificationLoggerListener::class)`
	`134`	`+ ->tag('kernel.event_subscriber')`
`131`	`135`	`;`
`132`	`136`	`};`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`return static function (ContainerConfigurator $container) {`
`17`	`17`	`$container->services()`
`18`	`18`	`->set('notifier.data_collector', NotificationDataCollector::class)`
`19`		`- ->args([service('notifier.logger_notification_listener')])`
	`19`	`+ ->args([service('notifier.notification_logger_listener')])`
`20`	`20`	`->tag('data_collector', ['template' => '@WebProfiler/Collector/notifier.html.twig', 'id' => 'notifier'])`
`21`	`21`	`;`
`22`	`22`	`};`
Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,10 @@ public static function getNotifierMessage(int $index = 0, string $transportName`
`91`	`91`	`public static function getNotificationEvents(): NotificationEvents`
`92`	`92`	`{`
`93`	`93`	`$container = static::getContainer();`
	`94`	`+ if ($container->has('notifier.notification_logger_listener')) {`
	`95`	`+ return $container->get('notifier.notification_logger_listener')->getEvents();`
	`96`	`+ }`
	`97`	`+`
`94`	`98`	`if ($container->has('notifier.logger_notification_listener')) {`
`95`	`99`	`return $container->get('notifier.logger_notification_listener')->getEvents();`
`96`	`100`	`}`