Skip to content

Commit

Permalink
Revert "Inject the EntityManager instead of the factory in DoctrineEx…
Browse files Browse the repository at this point in the history
…tractor"

This reverts commit e65ac7f.
  • Loading branch information
dunglas committed Nov 15, 2018
1 parent e65ac7f commit 342f23a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
11 changes: 10 additions & 1 deletion DependencyInjection/DoctrineExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -797,8 +797,17 @@ protected function loadOrmCacheDrivers(array $entityManager, ContainerBuilder $c
*/
private function loadPropertyInfoExtractor($entityManagerName, ContainerBuilder $container)
{
$metadataFactoryService = sprintf('doctrine.orm.%s_entity_manager.metadata_factory', $entityManagerName);

$metadataFactoryDefinition = $container->register($metadataFactoryService, 'Doctrine\Common\Persistence\Mapping\ClassMetadataFactory');
$metadataFactoryDefinition->setFactory([
new Reference(sprintf('doctrine.orm.%s_entity_manager', $entityManagerName)),
'getMetadataFactory',
]);
$metadataFactoryDefinition->setPublic(false);

$propertyExtractorDefinition = $container->register(sprintf('doctrine.orm.%s_entity_manager.property_info_extractor', $entityManagerName), 'Symfony\Bridge\Doctrine\PropertyInfo\DoctrineExtractor');
$propertyExtractorDefinition->addArgument(new Reference(sprintf('doctrine.orm.%s_entity_manager', $entityManagerName)));
$propertyExtractorDefinition->addArgument(new Reference($metadataFactoryService));
$propertyExtractorDefinition->addTag('property_info.list_extractor', ['priority' => -1001]);
$propertyExtractorDefinition->addTag('property_info.type_extractor', ['priority' => -999]);
}
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"symfony/dependency-injection": "~2.7|~3.0|~4.0",
"doctrine/dbal": "^2.5.12",
"jdorn/sql-formatter": "^1.2.16",
"symfony/doctrine-bridge": "^4.2",
"symfony/doctrine-bridge": "~2.7|~3.0|~4.0",
"doctrine/doctrine-cache-bundle": "~1.2"
},
"require-dev": {
Expand Down

0 comments on commit 342f23a

Please sign in to comment.