Merge branch '6.4' into 7.0

* 6.4:
  [Notifier][Webhook] Add Vonage support
  [Notifier] Add GoIP bridge
  [Workflow] Use TRANSITION_TYPE_WORKFLOW for rendering workflow in profiler
  Remove unneeded calls to setPublic(false)

Author: fabpot

DependencyInjection/AbstractDoctrineExtension.php

@@ -180,7 +180,6 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder
             $chainDriverDef = $container->getDefinition($this->getObjectManagerElementName($objectManager['name'].'_metadata_driver'));
         } else {
             $chainDriverDef = new Definition($this->getMetadataDriverClass('driver_chain'));
-            $chainDriverDef->setPublic(false);
         }
 
         foreach ($this->drivers as $driverType => $driverPaths) {
@@ -208,7 +207,6 @@ protected function registerMappingDrivers(array $objectManager, ContainerBuilder
                     array_values($driverPaths),
                 ]);
             }
-            $mappingDriverDef->setPublic(false);
             if (str_contains($mappingDriverDef->getClass(), 'yml') || str_contains($mappingDriverDef->getClass(), 'xml')) {
                 $mappingDriverDef->setArguments([array_flip($driverPaths)]);
                 $mappingDriverDef->addMethodCall('setGlobalBasename', ['mapping']);
@@ -374,8 +372,6 @@ protected function loadCacheDriver(string $cacheName, string $objectManagerName,
                 throw new \InvalidArgumentException(sprintf('"%s" is an unrecognized Doctrine cache driver.', $cacheDriver['type']));
         }
 
-        $cacheDef->setPublic(false);
-
         if (!isset($cacheDriver['namespace'])) {
             // generate a unique namespace for the given application
             if ($container->hasParameter('cache.prefix.seed')) {

Tests/DependencyInjection/CompilerPass/RegisterEventListenersAndSubscribersPassTest.php

@@ -42,7 +42,6 @@ public function testProcessEventListenersWithPriorities()
 
         $container
             ->register('a', 'stdClass')
-            ->setPublic(false)
             ->addTag('doctrine.event_listener', [
                 'event' => 'bar',
             ])
@@ -181,6 +180,42 @@ public function testProcessEventListenersWithMultipleConnections()
         );
     }
 
+    public function testSubscribersAreSkippedIfListenerDefinedForSameDefinition()
+    {
+        $container = $this->createBuilder();
+
+        $container
+            ->register('a', 'stdClass')
+            ->addTag('doctrine.event_listener', [
+                'event' => 'bar',
+                'priority' => 3,
+            ])
+        ;
+        $container
+            ->register('b', 'stdClass')
+            ->addTag('doctrine.event_listener', [
+                'event' => 'bar',
+            ])
+            ->addTag('doctrine.event_listener', [
+                'event' => 'foo',
+                'priority' => -5,
+            ])
+            ->addTag('doctrine.event_subscriber')
+        ;
+        $this->process($container);
+
+        $eventManagerDef = $container->getDefinition('doctrine.dbal.default_connection.event_manager');
+
+        $this->assertEquals(
+            [
+                [['bar'], 'a'],
+                [['bar'], 'b'],
+                [['foo'], 'b'],
+            ],
+            $eventManagerDef->getArgument(1)
+        );
+    }
+
     public function testProcessNoTaggedServices()
     {
         $container = $this->createBuilder(true);