Merge remote-tracking branch 'origin/2.2.x' into 3.0.x

Author: greg0ire

DependencyInjection/CompilerPass/ConfigureDependencyFactoryPass.php

@@ -9,6 +9,8 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
 
+use function assert;
+use function is_string;
 use function sprintf;
 
 class ConfigureDependencyFactoryPass implements CompilerPassInterface
@@ -17,6 +19,7 @@ public function process(ContainerBuilder $container): void
     {
         $preferredEm  = $container->getParameter('doctrine.migrations.preferred_em');
         $diDefinition = $container->getDefinition('doctrine.migrations.dependency_factory');
+        assert(is_string($preferredEm) || $preferredEm === null);
 
         $emID = sprintf('doctrine.orm.%s_entity_manager', $preferredEm ?? 'default');
 
@@ -28,7 +31,8 @@ public function process(ContainerBuilder $container): void
             $diDefinition->setArgument(1, new Reference('doctrine.migrations.em_loader'));
         } else {
             $preferredConnection = $container->getParameter('doctrine.migrations.preferred_connection');
-            $connectionId        = sprintf('doctrine.dbal.%s_connection', $preferredConnection ?? 'default');
+            assert(is_string($preferredConnection) || $preferredConnection === null);
+            $connectionId = sprintf('doctrine.dbal.%s_connection', $preferredConnection ?? 'default');
             $container->getDefinition('doctrine.migrations.connection_loader')
                 ->setArgument(0, new Reference($connectionId));
 

DependencyInjection/Configuration.php

@@ -59,10 +59,10 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->useAttributeAsKey('service')
                     ->defaultValue([])
                     ->validate()
-                        ->ifTrue(static function ($v) {
+                        ->ifTrue(static function ($v): bool {
                             return count(array_filter(array_keys($v), static function (string $doctrineService): bool {
                                 return strpos($doctrineService, 'Doctrine\Migrations\\') !== 0;
-                            }));
+                            })) > 0;
                         })
                         ->thenInvalid('Valid services for the DoctrineMigrationsBundle must be in the "Doctrine\Migrations" namespace.')
                     ->end()
@@ -74,10 +74,10 @@ public function getConfigTreeBuilder(): TreeBuilder
                     ->useAttributeAsKey('factory')
                     ->defaultValue([])
                     ->validate()
-                        ->ifTrue(static function ($v) {
+                        ->ifTrue(static function ($v): bool {
                             return count(array_filter(array_keys($v), static function (string $doctrineService): bool {
                                 return strpos($doctrineService, 'Doctrine\Migrations\\') !== 0;
-                            }));
+                            })) > 0;
                         })
                         ->thenInvalid('Valid callables for the DoctrineMigrationsBundle must be in the "Doctrine\Migrations" namespace.')
                     ->end()

DependencyInjection/DoctrineMigrationsExtension.php

@@ -17,8 +17,10 @@
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 use function array_keys;
+use function assert;
 use function explode;
 use function implode;
+use function is_array;
 use function sprintf;
 use function strlen;
 use function substr;
@@ -135,6 +137,7 @@ private function checkIfBundleRelativePath(string $path, ContainerBuilder $conta
     private function getBundlePath(string $bundleName, ContainerBuilder $container): string
     {
         $bundleMetadata = $container->getParameter('kernel.bundles_metadata');
+        assert(is_array($bundleMetadata));
 
         if (! isset($bundleMetadata[$bundleName])) {
             throw new RuntimeException(sprintf(