Skip to content

Commit 8875b61

Browse files
committed
ensure checked types are consistent
1 parent df23e21 commit 8875b61

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

DependencyInjection/CompilerPass/ConfigureDependencyFactoryPass.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
use Symfony\Component\DependencyInjection\ContainerBuilder;
1010
use Symfony\Component\DependencyInjection\Reference;
1111

12+
use function assert;
13+
use function is_string;
1214
use function sprintf;
1315

1416
class ConfigureDependencyFactoryPass implements CompilerPassInterface
@@ -18,6 +20,7 @@ public function process(ContainerBuilder $container): void
1820
$preferredEm = $container->getParameter('doctrine.migrations.preferred_em');
1921
$diDefinition = $container->getDefinition('doctrine.migrations.dependency_factory');
2022

23+
assert(is_string($preferredEm) || $preferredEm === null);
2124
$emID = sprintf('doctrine.orm.%s_entity_manager', $preferredEm ?? 'default');
2225

2326
if ($container->has($emID)) {
@@ -28,7 +31,8 @@ public function process(ContainerBuilder $container): void
2831
$diDefinition->setArgument(1, new Reference('doctrine.migrations.em_loader'));
2932
} else {
3033
$preferredConnection = $container->getParameter('doctrine.migrations.preferred_connection');
31-
$connectionId = sprintf('doctrine.dbal.%s_connection', $preferredConnection ?? 'default');
34+
assert(is_string($preferredConnection) || $preferredConnection === null);
35+
$connectionId = sprintf('doctrine.dbal.%s_connection', $preferredConnection ?? 'default');
3236
$container->getDefinition('doctrine.migrations.connection_loader')
3337
->setArgument(0, new Reference($connectionId));
3438

DependencyInjection/DoctrineMigrationsExtension.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
1919

2020
use function array_keys;
21+
use function assert;
2122
use function explode;
2223
use function implode;
24+
use function is_array;
2325
use function sprintf;
2426
use function strlen;
2527
use function substr;
@@ -141,6 +143,8 @@ private function getBundlePath(string $bundleName, ContainerBuilder $container):
141143
{
142144
$bundleMetadata = $container->getParameter('kernel.bundles_metadata');
143145

146+
assert(is_array($bundleMetadata));
147+
144148
if (! isset($bundleMetadata[$bundleName])) {
145149
throw new RuntimeException(sprintf(
146150
'The bundle "%s" has not been registered, available bundles: %s',

0 commit comments

Comments
 (0)