Mar 22, 2025 · Apr 10, 2024
diff --git a/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php b/src/Symfony/Bridge/Doctrine/ArgumentResolver/EntityValueResolver.php
        private ManagerRegistry $registry,
        private ?ExpressionLanguage $expressionLanguage = null,
        private MapEntity $defaults = new MapEntity(),
        /** @var array<class-string, class-string> */
        private readonly array $typeAliases = [],
    ) {
    }

        if (!$options->class || $options->disabled) {
            return [];
        }

        $options->class = $this->typeAliases[$options->class] ?? $options->class;

        if (!$manager = $this->getManager($options->objectManager, $options->class)) {
            return [];
        }
diff --git a/src/Symfony/Bridge/Doctrine/Attribute/MapEntity.php b/src/Symfony/Bridge/Doctrine/Attribute/MapEntity.php
    public function withDefaults(self $defaults, ?string $class): static
    {
        $clone = clone $this;
        $clone->class ??= class_exists($class ?? '') ? $class : null;
        $clone->class ??= class_exists($class ?? '')|| interface_exists($class ?? '', false)? $class : null;
        $clone->objectManager ??= $defaults->objectManager;
        $clone->expr ??= $defaults->expr;
        $clone->mapping ??= $defaults->mapping;
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
 ---

 * Accept `ReadableCollection` in `CollectionToArrayTransformer`
 * Add type aliases support to `EntityValueResolver`

 7.1
 ---
diff --git a/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php b/src/Symfony/Bridge/Doctrine/Tests/ArgumentResolver/EntityValueResolverTest.php
        $this->assertSame([$object], $resolver->resolve($request, $argument));
    }

    /**
     * @dataProvider idsProvider
     */
    public function testResolveWithIdAndTypeAlias(string|int $id)
    {
        $manager = $this->getMockBuilder(ObjectManager::class)->getMock();
        $registry = $this->createRegistry($manager);
        $resolver = new EntityValueResolver(
            $registry,
            null,
            new MapEntity(),
            // Using \Throwable because it is an interface
            ['Throwable' => 'stdClass'],
        );

        $request = new Request();
        $request->attributes->set('id', $id);

        $argument = $this->createArgument('Throwable', $mapEntity = new MapEntity(id: 'id'));

        $repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
        $repository->expects($this->once())
            ->method('find')
            ->with($id)
            ->willReturn($object = new \stdClass());

        $manager->expects($this->once())
            ->method('getRepository')
            ->with('stdClass')
            ->willReturn($repository);

        $this->assertSame([$object], $resolver->resolve($request, $argument));
        // Ensure the original MapEntity object was not updated
        $this->assertNull($mapEntity->class);
    }

    public function testResolveWithNullId()
    {
        $manager = $this->createMock(ObjectManager::class);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,6 +35,8 @@ public function __construct(
		private ManagerRegistry $registry,
		private ?ExpressionLanguage $expressionLanguage = null,
		private MapEntity $defaults = new MapEntity(),
		/** @var array<class-string, class-string> */
		private readonly array $typeAliases = [],
		) {
		}

Expand All		@@ -50,6 +52,9 @@ public function resolve(Request $request, ArgumentMetadata $argument): array
		if (!$options->class \|\| $options->disabled) {
		return [];
		}

		$options->class = $this->typeAliases[$options->class] ?? $options->class;

		if (!$manager = $this->getManager($options->objectManager, $options->class)) {
		return [];
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,7 +53,7 @@ public function __construct(
		public function withDefaults(self $defaults, ?string $class): static
		{
		$clone = clone $this;
		$clone->class ??= class_exists($class ?? '') ? $class : null;
		$clone->class ??= class_exists($class ?? '')\|\| interface_exists($class ?? '', false)? $class : null;
		$clone->objectManager ??= $defaults->objectManager;
		$clone->expr ??= $defaults->expr;
		$clone->mapping ??= $defaults->mapping;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,7 @@ CHANGELOG
		---

		* Accept `ReadableCollection` in `CollectionToArrayTransformer`
		* Add type aliases support to `EntityValueResolver`

		7.1
		---
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -125,6 +125,42 @@ public function testResolveWithId(string\|int $id)
		$this->assertSame([$object], $resolver->resolve($request, $argument));
		}

		/**
		* @dataProvider idsProvider
		*/
		public function testResolveWithIdAndTypeAlias(string\|int $id)
		{
		$manager = $this->getMockBuilder(ObjectManager::class)->getMock();
		$registry = $this->createRegistry($manager);
		$resolver = new EntityValueResolver(
		$registry,
		null,
		new MapEntity(),
		// Using \Throwable because it is an interface
		['Throwable' => 'stdClass'],
		);

		$request = new Request();
		$request->attributes->set('id', $id);

		$argument = $this->createArgument('Throwable', $mapEntity = new MapEntity(id: 'id'));

		$repository = $this->getMockBuilder(ObjectRepository::class)->getMock();
		$repository->expects($this->once())
		->method('find')
		->with($id)
		->willReturn($object = new \stdClass());

		$manager->expects($this->once())
		->method('getRepository')
		->with('stdClass')
		->willReturn($repository);

		$this->assertSame([$object], $resolver->resolve($request, $argument));
		// Ensure the original MapEntity object was not updated
		$this->assertNull($mapEntity->class);
		}

		public function testResolveWithNullId()
		{
		$manager = $this->createMock(ObjectManager::class);
Expand Down