fix tests

xabbuh · xabbuh · commit d6352f86cc75 · 2024-02-09T09:58:27.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ReadOnlyClass.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ReadOnlyClass.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
 
-readonly class ReadonlyTest
+readonly class ReadOnlyClass
 {
     public function say(): string
     {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/LazyServiceDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/LazyProxy/PhpDumper/LazyServiceDumperTest.php
@@ -16,7 +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\ReadonlyTest;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\ReadOnlyClass;
 
 class LazyServiceDumperTest extends TestCase
 {
@@ -55,15 +55,15 @@ public function testInvalidClass()
     }
 
     /**
-     * @requires PHP 8.2
+     * @requires PHP 8.3
      */
     public function testReadonlyClass()
     {
         $dumper = new LazyServiceDumper();
-        $definition = (new Definition(ReadonlyTest::class))->setLazy(true);
+        $definition = (new Definition(ReadOnlyClass::class))->setLazy(true);
 
         $this->assertTrue($dumper->isProxyCandidate($definition));
-        $this->assertStringContainsString('readonly class ReadonlyTestGhost', $dumper->getProxyCode($definition));
+        $this->assertStringContainsString('readonly class ReadOnlyClassGhost', $dumper->getProxyCode($definition));
     }
 }
 
diff --git a/src/Symfony/Component/VarExporter/ProxyHelper.php b/src/Symfony/Component/VarExporter/ProxyHelper.php
@@ -28,7 +28,7 @@ final class ProxyHelper
     public static function generateLazyGhost(\ReflectionClass $class): string
     {
         if (\PHP_VERSION_ID >= 80200 && \PHP_VERSION_ID < 80300 && $class->isReadOnly()) {
-            throw new LogicException(sprintf('Cannot generate lazy ghost: class "%s" is readonly.', $class->name));
+            throw new LogicException(sprintf('Cannot generate lazy ghost with PHP < 8.3: class "%s" is readonly.', $class->name));
         }
         if ($class->isFinal()) {
             throw new LogicException(sprintf('Cannot generate lazy ghost: class "%s" is final.', $class->name));
@@ -92,7 +92,7 @@ public static function generateLazyProxy(?\ReflectionClass $class, array $interf
             throw new LogicException(sprintf('Cannot generate lazy proxy: class "%s" is final.', $class->name));
         }
         if (\PHP_VERSION_ID >= 80200 && \PHP_VERSION_ID < 80300 && $class?->isReadOnly()) {
-            throw new LogicException(sprintf('Cannot generate lazy proxy: class "%s" is readonly.', $class->name));
+            throw new LogicException(sprintf('Cannot generate lazy proxy with PHP < 8.3: class "%s" is readonly.', $class->name));
         }
 
         $methodReflectors = [$class?->getMethods(\ReflectionMethod::IS_PUBLIC | \ReflectionMethod::IS_PROTECTED) ?? []];

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Tests\Fixtures;`
`13`	`13`
`14`		`-readonly class ReadonlyTest`
	`14`	`+readonly class ReadOnlyClass`
`15`	`15`	`{`
`16`	`16`	`public function say(): string`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`use Symfony\Component\DependencyInjection\Definition;`
`17`	`17`	`use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;`
`18`	`18`	`use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\LazyServiceDumper;`
`19`		`-use Symfony\Component\DependencyInjection\Tests\Fixtures\ReadonlyTest;`
	`19`	`+use Symfony\Component\DependencyInjection\Tests\Fixtures\ReadOnlyClass;`
`20`	`20`
`21`	`21`	`class LazyServiceDumperTest extends TestCase`
`22`	`22`	`{`
`@@ -55,15 +55,15 @@ public function testInvalidClass()`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`
`58`		`- * @requires PHP 8.2`
	`58`	`+ * @requires PHP 8.3`
`59`	`59`	`*/`
`60`	`60`	`public function testReadonlyClass()`
`61`	`61`	`{`
`62`	`62`	`$dumper = new LazyServiceDumper();`
`63`		`- $definition = (new Definition(ReadonlyTest::class))->setLazy(true);`
	`63`	`+ $definition = (new Definition(ReadOnlyClass::class))->setLazy(true);`
`64`	`64`
`65`	`65`	`$this->assertTrue($dumper->isProxyCandidate($definition));`
`66`		`- $this->assertStringContainsString('readonly class ReadonlyTestGhost', $dumper->getProxyCode($definition));`
	`66`	`+ $this->assertStringContainsString('readonly class ReadOnlyClassGhost', $dumper->getProxyCode($definition));`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ final class ProxyHelper`
`28`	`28`	`public static function generateLazyGhost(\ReflectionClass $class): string`
`29`	`29`	`{`
`30`	`30`	`if (\PHP_VERSION_ID >= 80200 && \PHP_VERSION_ID < 80300 && $class->isReadOnly()) {`
`31`		`- throw new LogicException(sprintf('Cannot generate lazy ghost: class "%s" is readonly.', $class->name));`
	`31`	`+ throw new LogicException(sprintf('Cannot generate lazy ghost with PHP < 8.3: class "%s" is readonly.', $class->name));`
`32`	`32`	`}`
`33`	`33`	`if ($class->isFinal()) {`
`34`	`34`	`throw new LogicException(sprintf('Cannot generate lazy ghost: class "%s" is final.', $class->name));`
`@@ -92,7 +92,7 @@ public static function generateLazyProxy(?\ReflectionClass $class, array $interf`
`92`	`92`	`throw new LogicException(sprintf('Cannot generate lazy proxy: class "%s" is final.', $class->name));`
`93`	`93`	`}`
`94`	`94`	`if (\PHP_VERSION_ID >= 80200 && \PHP_VERSION_ID < 80300 && $class?->isReadOnly()) {`
`95`		`- throw new LogicException(sprintf('Cannot generate lazy proxy: class "%s" is readonly.', $class->name));`
	`95`	`+ throw new LogicException(sprintf('Cannot generate lazy proxy with PHP < 8.3: class "%s" is readonly.', $class->name));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`$methodReflectors = [$class?->getMethods(\ReflectionMethod::IS_PUBLIC \| \ReflectionMethod::IS_PROTECTED) ?? []];`