Merge branch '7.3' into 7.4

xabbuh · xabbuh · commit 6ef731b76687 · 2025-07-15T12:18:27.000+02:00
* 7.3:
  do not install ext-zstd on PHP 8.5
  [DependencyInjection] Fix proxying services defined with an abstract class and a factory
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -34,6 +34,8 @@ jobs:
           - php: '8.3'
           - php: '8.4'
           - php: '8.5'
+            # to be removed when ext-zstd is ready for PHP 8.5
+            extensions: amqp,apcu,brotli,igbinary,intl,mbstring,memcached,redis,relay
             #mode: experimental
       fail-fast: false
 
@@ -234,7 +236,7 @@ jobs:
       - name: Run AssetMapper without ext-brotli nor ext-zstd
         if: "! matrix.mode"
         run: |
-          sudo rm /etc/php/*/cli/conf.d/*-{brotli,zstd}.ini
+          sudo rm -f /etc/php/*/cli/conf.d/*-{brotli,zstd}.ini
           ./phpunit src/Symfony/Component/AssetMapper
 
       - name: Run tests with SIGCHLD enabled PHP
diff --git 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
@@ -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
@@ -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
@@ -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();

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public function getProxyClass(Definition $definition, bool $asGhostObject, ?\Ref`
`197`	`197`	`return $class->name;`
`198`	`198`	`}`
`199`	`199`
`200`		`- if (!$definition->hasTag('proxy') && !$class->isInterface()) {`
	`200`	`+ if (!$definition->hasTag('proxy') && !$class->isAbstract()) {`
`201`	`201`	`$parent = $class;`
`202`	`202`	`do {`
`203`	`203`	`$extendsInternalClass = $parent->isInternal();`