symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
Lines changed: 4 additions & 3 deletions b/‎src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/LazyServiceDumper.php
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/LazyServiceDumperTest.php
Lines changed: 39 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/LazyServiceDumperTest.php
Lines changed: 39 additions & 0 deletions
diff --git a/‎src/Symfony/Component/VarExporter/ProxyHelper.php
Lines changed: 6 additions & 12 deletions b/‎src/Symfony/Component/VarExporter/ProxyHelper.php
Lines changed: 6 additions & 12 deletions
diff --git a/‎src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
Lines changed: 5 additions & 0 deletions b/‎src/Symfony/Component/VarExporter/Tests/ProxyHelperTest.php
Lines changed: 5 additions & 0 deletions
@@ -123,12 +123,13 @@ public function getProxyCode(Definition $definition, string $id = null): string
                 if (!interface_exists($tag['interface']) && !class_exists($tag['interface'], false)) {
                     throw new InvalidArgumentException(sprintf('Invalid definition for service "%s": several "proxy" tags found but "%s" is not an interface.', $id ?? $definition->getClass(), $tag['interface']));
                 }
+                if (!is_a($class->name, $tag['interface'], true)) {
+                    throw new InvalidArgumentException(sprintf('Invalid "proxy" tag for service "%s": class "%s" doesn\'t implement "%s".', $id ?? $definition->getClass(), $definition->getClass(), $tag['interface']));
+                }
                 $interfaces[] = new \ReflectionClass($tag['interface']);
             }
 
-            if (1 === \count($interfaces) && !$interfaces[0]->isInterface()) {
-                $class = array_pop($interfaces);
-            }
+            $class = 1 === \count($interfaces) && !$interfaces[0]->isInterface() ? array_pop($interfaces) : null;
         } elseif ($class->isInterface()) {
             $interfaces = [$class];
             $class = null;
 
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\LazyServiceDumper;
 
 class LazyServiceDumperTest extends TestCase
@@ -26,4 +27,42 @@ public function testProxyInterface()
         $this->assertTrue($dumper->isProxyCandidate($definition));
         $this->assertStringContainsString('function get(', $dumper->getProxyCode($definition));
     }
+
+    public function testFinalClassInterface()
+    {
+        $dumper = new LazyServiceDumper();
+        $definition = (new Definition(TestContainer::class))
+            ->setLazy(true)
+            ->addTag('proxy', ['interface' => ContainerInterface::class]);
+
+        $this->assertTrue($dumper->isProxyCandidate($definition));
+        $this->assertStringContainsString('function get(', $dumper->getProxyCode($definition));
+    }
+
+    public function testInvalidClass()
+    {
+        $dumper = new LazyServiceDumper();
+        $definition = (new Definition(\stdClass::class))
+            ->setLazy(true)
+            ->addTag('proxy', ['interface' => ContainerInterface::class]);
+
+        $this->assertTrue($dumper->isProxyCandidate($definition));
+
+        $this->expectException(InvalidArgumentException::class);
+        $this->expectExceptionMessage('Invalid "proxy" tag for service "stdClass": class "stdClass" doesn\'t implement "Psr\Container\ContainerInterface".');
+        $dumper->getProxyCode($definition);
+    }
+}
+
+final class TestContainer implements ContainerInterface
+{
+    public function has(string $key): bool
+    {
+        return true;
+    }
+
+    public function get(string $key): string
+    {
+        return $key;
+    }
 }
@@ -191,18 +191,7 @@ public static function generateLazyProxy(?\ReflectionClass $class, array $interf
             $methods = ['initializeLazyObject' => implode('', $body).'    }'] + $methods;
         }
         $body = $methods ? "\n".implode("\n\n", $methods)."\n" : '';
-
-        if ($class) {
-            $propertyScopes = substr(self::exportPropertyScopes($class->name), 1, -6);
-            $body = <<<EOPHP
-
-                private const LAZY_OBJECT_PROPERTY_SCOPES = [
-                    'lazyObjectReal' => [self::class, 'lazyObjectReal', null],
-                    "\\0".self::class."\\0lazyObjectReal" => [self::class, 'lazyObjectReal', null],{$propertyScopes}
-                ];
-            {$body}
-            EOPHP;
-        }
+        $propertyScopes = $class ? substr(self::exportPropertyScopes($class->name), 1, -6) : '';
 
         return <<<EOPHP
             {$parent} implements \\{$interfaces}
@@ -211,6 +200,11 @@ public static function generateLazyProxy(?\ReflectionClass $class, array $interf
 
                 private {$readonly}int \$lazyObjectId;
                 private {$readonly}{$type} \$lazyObjectReal;
+
+                private const LAZY_OBJECT_PROPERTY_SCOPES = [
+                    'lazyObjectReal' => [self::class, 'lazyObjectReal', null],
+                    "\\0".self::class."\\0lazyObjectReal" => [self::class, 'lazyObjectReal', null],{$propertyScopes}
+                ];
             {$body}}
 
             // Help opcache.preload discover always-needed symbols
 
@@ -122,6 +122,11 @@ public function testGenerateLazyProxyForInterfaces()
             private int $lazyObjectId;
             private \Symfony\Component\VarExporter\Tests\TestForProxyHelperInterface1&\Symfony\Component\VarExporter\Tests\TestForProxyHelperInterface2 $lazyObjectReal;
 
+            private const LAZY_OBJECT_PROPERTY_SCOPES = [
+                'lazyObjectReal' => [self::class, 'lazyObjectReal', null],
+                "\0".self::class."\0lazyObjectReal" => [self::class, 'lazyObjectReal', null],
+            ];
+
             public function initializeLazyObject(): \Symfony\Component\VarExporter\Tests\TestForProxyHelperInterface1&\Symfony\Component\VarExporter\Tests\TestForProxyHelperInterface2
             {
                 if (isset($this->lazyObjectReal)) {