service EntityValueResolver Changes

Service Definition change for allow user inject its own variables in EntityValueResolver single quotes
doctrine · Jul 8, 2024 · 9bc13c8 · 9bc13c8
1 parent 1ea2b5b
commit 9bc13c8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/config/orm.xml b/config/orm.xml
@@ -188,6 +188,10 @@
             <argument type="service" id="doctrine" />
         </service>
 
+        <service id="doctrine.orm.entity_value_resolver_variables_loader" class="Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolverVariablesLoader">
+            <argument type="service" id="security.token_storage" on-invalid="ignore" />
+        </service>
+
         <service id="doctrine.orm.entity_value_resolver" class="Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver">
             <argument type="service" id="doctrine" />
             <argument type="service" id="doctrine.orm.entity_value_resolver.expression_language" on-invalid="ignore" />

diff --git a/src/DependencyInjection/DoctrineExtension.php b/src/DependencyInjection/DoctrineExtension.php
@@ -33,6 +33,7 @@
 use InvalidArgumentException;
 use LogicException;
 use Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolver;
+use Symfony\Bridge\Doctrine\ArgumentResolver\EntityValueResolverVariableLoader;
 use Symfony\Bridge\Doctrine\Attribute\MapEntity;
 use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
 use Symfony\Bridge\Doctrine\IdGenerator\UlidGenerator;
@@ -533,6 +534,12 @@ protected function ormLoad(array $config, ContainerBuilder $container)
                     $controllerResolverDefaults['evict_cache'] ?? null,
                     $controllerResolverDefaults['disabled'] ?? false,
                 ]));
+            } else {
+                $container->getDefinition('doctrine.orm.entity_value_resolver')->setArgument(2, (new Definition(MapEntity::class)));
+            }
+
+            if (class_exists(ExpressionLanguage::class) && class_exists(EntityValueResolverVariableLoader::class)) {
+                $container->getDefinition('doctrine.orm.entity_value_resolver')->setArgument(3, new Reference('doctrine.orm.entity_value_resolver_variables_loader'));
             }
         }
 

diff --git a/tests/DependencyInjection/DoctrineExtensionTest.php b/tests/DependencyInjection/DoctrineExtensionTest.php
@@ -1451,7 +1451,7 @@ public function testControllerResolver(bool $simpleEntityManagerConfig): void
 
         $controllerResolver = $container->getDefinition('doctrine.orm.entity_value_resolver');
 
-        $this->assertEquals([new Reference('doctrine'), new Reference('doctrine.orm.entity_value_resolver.expression_language', $container::IGNORE_ON_INVALID_REFERENCE)], $controllerResolver->getArguments());
+        $this->assertEquals([new Reference('doctrine'), new Reference('doctrine.orm.entity_value_resolver.expression_language', $container::IGNORE_ON_INVALID_REFERENCE), new Definition(MapEntity::class)], $controllerResolver->getArguments());
 
         $container = $this->getContainer();