Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't use a factory to create the EM when possible #1551

Merged
merged 1 commit into from
Jul 28, 2022
Merged

Don't use a factory to create the EM when possible #1551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions DependencyInjection/DoctrineExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use Doctrine\DBAL\Sharding\PoolingShardManager;
use Doctrine\DBAL\Tools\Console\Command\ImportCommand;
use Doctrine\DBAL\Tools\Console\ConnectionProvider;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Id\AbstractIdGenerator;
use Doctrine\ORM\Proxy\Autoloader;
Expand All @@ -28,6 +29,7 @@
use Doctrine\ORM\Tools\Export\ClassMetadataExporter;
use Doctrine\ORM\UnitOfWork;
use LogicException;
use ReflectionMethod;
use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
use Symfony\Bridge\Doctrine\IdGenerator\UlidGenerator;
use Symfony\Bridge\Doctrine\IdGenerator\UuidGenerator;
Expand Down Expand Up @@ -493,6 +495,11 @@ protected function ormLoad(array $config, ContainerBuilder $container)
$loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
$loader->load('orm.xml');

if (! (new ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
$container->getDefinition('doctrine.orm.entity_manager.abstract')
->setFactory(['%doctrine.orm.entity_manager.class%', 'create']);
}

if (class_exists(AbstractType::class)) {
$container->getDefinition('form.type.entity')->addTag('kernel.reset', ['method' => 'reset']);
}
Expand Down
4 changes: 1 addition & 3 deletions Resources/config/orm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@

<service id="doctrine.orm.configuration" class="%doctrine.orm.configuration.class%" abstract="true" public="false" />

<service id="doctrine.orm.entity_manager.abstract" class="%doctrine.orm.entity_manager.class%" abstract="true" lazy="true">
<factory class="%doctrine.orm.entity_manager.class%" method="create" />
</service>
<service id="doctrine.orm.entity_manager.abstract" class="%doctrine.orm.entity_manager.class%" abstract="true" lazy="true" />

<service id="doctrine.orm.container_repository_factory" class="Doctrine\Bundle\DoctrineBundle\Repository\ContainerRepositoryFactory" public="false">
<argument type="service">
Expand Down
15 changes: 7 additions & 8 deletions Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use InvalidArgumentException;
use PDO;
use PHPUnit\Framework\TestCase;
use ReflectionMethod;
use Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass\RegisterEventListenersAndSubscribersPass;
use Symfony\Bundle\DoctrineBundle\Tests\DependencyInjection\TestHydrator;
use Symfony\Component\Cache\Adapter\ArrayAdapter;
Expand Down Expand Up @@ -299,7 +300,12 @@ public function testLoadSimpleSingleConnection(): void

$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
$this->assertEquals(['%doctrine.orm.entity_manager.class%', 'create'], $definition->getFactory());

if (! (new ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
$this->assertSame(['%doctrine.orm.entity_manager.class%', 'create'], $definition->getFactory());
} else {
$this->assertNull($definition->getFactory());
}

$this->assertDICConstructorArguments($definition, [
new Reference('doctrine.dbal.default_connection'),
Expand Down Expand Up @@ -338,10 +344,6 @@ public function testLoadSimpleSingleConnectionWithoutDbName(): void

$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
$factory = $definition->getFactory();

$this->assertEquals('%doctrine.orm.entity_manager.class%', $factory[0]);
$this->assertEquals('create', $factory[1]);

$this->assertDICConstructorArguments($definition, [
new Reference('doctrine.dbal.default_connection'),
Expand Down Expand Up @@ -378,7 +380,6 @@ public function testLoadSingleConnection(): void

$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
$this->assertEquals(['%doctrine.orm.entity_manager.class%', 'create'], $definition->getFactory());

$this->assertDICConstructorArguments($definition, [
new Reference('doctrine.dbal.default_connection'),
Expand Down Expand Up @@ -410,7 +411,6 @@ public function testLoadMultipleConnections(): void

$definition = $container->getDefinition('doctrine.orm.em1_entity_manager');
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
$this->assertEquals(['%doctrine.orm.entity_manager.class%', 'create'], $definition->getFactory());

$arguments = $definition->getArguments();
$this->assertInstanceOf(Reference::class, $arguments[0]);
Expand All @@ -429,7 +429,6 @@ public function testLoadMultipleConnections(): void

$definition = $container->getDefinition('doctrine.orm.em2_entity_manager');
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
$this->assertEquals(['%doctrine.orm.entity_manager.class%', 'create'], $definition->getFactory());

$arguments = $definition->getArguments();
$this->assertInstanceOf(Reference::class, $arguments[0]);
Expand Down
11 changes: 7 additions & 4 deletions Tests/DependencyInjection/DoctrineExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
use LogicException;
use PHPUnit\Framework\TestCase;
use ReflectionClass;
use ReflectionMethod;
use Symfony\Bridge\Doctrine\Messenger\DoctrineClearEntityManagerWorkerSubscriber;
use Symfony\Bridge\Doctrine\Middleware\Debug\DebugDataHolder;
use Symfony\Bridge\Doctrine\Middleware\Debug\Middleware as SfDebugMiddleware;
Expand Down Expand Up @@ -467,7 +468,12 @@ public function testDependencyInjectionConfigurationDefaults(): void

$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
$this->assertEquals(['%doctrine.orm.entity_manager.class%', 'create'], $definition->getFactory());

if (! (new ReflectionMethod(EntityManager::class, '__construct'))->isPublic()) {
$this->assertSame(['%doctrine.orm.entity_manager.class%', 'create'], $definition->getFactory());
} else {
$this->assertNull($definition->getFactory());
}

$this->assertEquals(['default' => 'doctrine.orm.default_entity_manager'], $container->getParameter('doctrine.entity_managers'), 'Set of the existing EntityManagers names is incorrect.');
$this->assertEquals('%doctrine.entity_managers%', $container->getDefinition('doctrine')->getArgument(2), 'Set of the existing EntityManagers names is incorrect.');
Expand Down Expand Up @@ -579,7 +585,6 @@ public function testSingleEntityManagerWithDefaultConfiguration(): void

$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
$this->assertEquals(['%doctrine.orm.entity_manager.class%', 'create'], $definition->getFactory());

$this->assertDICConstructorArguments($definition, [
new Reference('doctrine.dbal.default_connection'),
Expand All @@ -605,7 +610,6 @@ public function testSingleEntityManagerWithDefaultSecondLevelCacheConfiguration(

$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
$this->assertEquals(['%doctrine.orm.entity_manager.class%', 'create'], $definition->getFactory());

$this->assertDICConstructorArguments($definition, [
new Reference('doctrine.dbal.default_connection'),
Expand Down Expand Up @@ -641,7 +645,6 @@ public function testSingleEntityManagerWithCustomSecondLevelCacheConfiguration()

$definition = $container->getDefinition('doctrine.orm.default_entity_manager');
$this->assertEquals('%doctrine.orm.entity_manager.class%', $definition->getClass());
$this->assertEquals(['%doctrine.orm.entity_manager.class%', 'create'], $definition->getFactory());

$this->assertDICConstructorArguments($definition, [
new Reference('doctrine.dbal.default_connection'),
Expand Down