From 0c3da8b9ad17785c5b96d5df4bcaece86145f601 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Tue, 15 Jul 2025 09:36:37 +0200
Subject: [PATCH] [DependencyInjection] Fix proxying services defined with an
 abstract class and a factory

---
 .../LazyProxy/PhpDumper/LazyServiceDumper.php |  2 +-
 .../Tests/Fixtures/AbstractSayClass.php       | 17 +++++++
 .../LazyServiceInstantiatorTest.php           | 45 +++++++++++++++++++
 .../PhpDumper/LazyServiceDumperTest.php       | 11 +++++
 4 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/Fixtures/AbstractSayClass.php
 create mode 100644 src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/LazyServiceInstantiatorTest.php

diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
index 0933c1a5993f6..c534630e36ec8 100644
--- a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
+++ b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
@@ -197,7 +197,7 @@ public function getProxyClass(Definition $definition, bool $asGhostObject, ?\Ref
             return $class->name;
         }
 
-        if (!$definition->hasTag('proxy') && !$class->isInterface()) {
+        if (!$definition->hasTag('proxy') && !$class->isAbstract()) {
             $parent = $class;
             do {
                 $extendsInternalClass = $parent->isInternal();
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AbstractSayClass.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AbstractSayClass.php
new file mode 100644
index 0000000000000..f59aa1bf4a8d6
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/AbstractSayClass.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+abstract class AbstractSayClass
+{
+    abstract public function say(): string;
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/LazyServiceInstantiatorTest.php b/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/LazyServiceInstantiatorTest.php
new file mode 100644
index 0000000000000..359b9824bd270
--- /dev/null
+++ b/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/Instantiator/LazyServiceInstantiatorTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\LazyProxy\Instantiator;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\LazyServiceInstantiator;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\AbstractSayClass;
+
+class LazyServiceInstantiatorTest extends TestCase
+{
+    public function testInstantiateAbstractClassProxy()
+    {
+        $instantiator = new LazyServiceInstantiator();
+        $instance = new class extends AbstractSayClass {
+            public int $calls = 0;
+
+            public function say(): string
+            {
+                ++$this->calls;
+
+                return 'Hello from the abstract class!';
+            }
+        };
+
+        $definition = (new Definition(AbstractSayClass::class))
+            ->setLazy(true);
+
+        $proxy = $instantiator->instantiateProxy(new Container(), $definition, 'foo', fn () => $instance);
+
+        $this->assertSame(0, $instance->calls);
+        $this->assertSame('Hello from the abstract class!', $proxy->say());
+        $this->assertSame(1, $instance->calls);
+    }
+}
diff --git a/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/LazyServiceDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/LazyServiceDumperTest.php
index 14d2f81b673ec..1d5e9b6bf2dcf 100644
--- a/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/LazyServiceDumperTest.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/LazyServiceDumperTest.php
@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\LazyServiceDumper;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\AbstractSayClass;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\ReadOnlyClass;
 
 class LazyServiceDumperTest extends TestCase
@@ -40,6 +41,16 @@ public function testFinalClassInterface()
         $this->assertStringContainsString('function get(', $dumper->getProxyCode($definition));
     }
 
+    public function testAbstractClass()
+    {
+        $dumper = new LazyServiceDumper();
+        $definition = (new Definition(AbstractSayClass::class))
+            ->setLazy(true);
+
+        $this->assertTrue($dumper->isProxyCandidate($definition));
+        $this->assertNotSame(AbstractSayClass::class, $dumper->getProxyClass($definition, false));
+    }
+
     public function testInvalidClass()
     {
         $dumper = new LazyServiceDumper();