Skip to content

Commit

Permalink
Merge pull request #950 from xabbuh/symfony-30948
Browse files Browse the repository at this point in the history
abstain from registering incomplete services
  • Loading branch information
alcaeus committed Apr 8, 2019
2 parents 8af32bd + 709d6cf commit 5ad6645
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion DependencyInjection/DoctrineExtension.php
Expand Up @@ -25,6 +25,7 @@
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\Messenger\MessageBusInterface;
use Symfony\Component\Messenger\Transport\Doctrine\DoctrineTransportFactory;
use Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface;
use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
use function class_exists;
use function sprintf;
Expand Down Expand Up @@ -358,11 +359,17 @@ protected function ormLoad(array $config, ContainerBuilder $container)

$config['entity_managers'] = $this->fixManagersAutoMappings($config['entity_managers'], $container->getParameter('kernel.bundles'));

$loadPropertyInfoExtractor = interface_exists(PropertyInfoExtractorInterface::class)
&& class_exists(DoctrineExtractor::class);

foreach ($config['entity_managers'] as $name => $entityManager) {
$entityManager['name'] = $name;
$this->loadOrmEntityManager($entityManager, $container);

$this->loadPropertyInfoExtractor($name, $container);
if ($loadPropertyInfoExtractor) {
$this->loadPropertyInfoExtractor($name, $container);
}

$this->loadValidatorLoader($name, $container);
}

Expand Down

0 comments on commit 5ad6645

Please sign in to comment.