Fix deprecations on PHP 8.2

nicolas-grekas · nicolas-grekas · commit ca566204d34d · 2022-02-25T11:38:15.000+01:00
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -26,7 +26,7 @@ jobs:
           - php: '8.1'
             mode: low-deps
           - php: '8.2'
-            mode: experimental
+            #mode: experimental
       fail-fast: false
 
     runs-on: ubuntu-20.04
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -13,9 +13,9 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\Persistence\ManagerRegistry;
-use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Persistence\ObjectManager;
 use Doctrine\Persistence\ObjectRepository;
 use Symfony\Bridge\Doctrine\Test\DoctrineTestHelper;
@@ -111,7 +111,7 @@ protected function createEntityManagerMock($repositoryMock)
             ->willReturn($repositoryMock)
         ;
 
-        $classMetadata = $this->createMock(ClassMetadata::class);
+        $classMetadata = $this->createMock(ClassMetadataInfo::class);
         $classMetadata
             ->expects($this->any())
             ->method('hasField')
diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -194,6 +194,7 @@ function ($definition) {
     }
 }
 
+#[\AllowDynamicProperties]
 final class DummyClass implements DummyInterface, SunnyInterface
 {
     private $ref;
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddAnnotationsCachedReaderPass.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler;
 
+use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 
@@ -28,14 +29,18 @@ public function process(ContainerBuilder $container)
         // "annotation_reader" at build time don't get any cache
         foreach ($container->findTaggedServiceIds('annotations.cached_reader') as $id => $tags) {
             $reader = $container->getDefinition($id);
+            $reader->setPublic(false);
             $properties = $reader->getProperties();
 
             if (isset($properties['cacheProviderBackup'])) {
                 $provider = $properties['cacheProviderBackup']->getValues()[0];
                 unset($properties['cacheProviderBackup']);
                 $reader->setProperties($properties);
-                $container->set($id, null);
-                $container->setDefinition($id, $reader->replaceArgument(1, $provider));
+                $reader->replaceArgument(1, $provider);
+            } elseif (4 <= \count($arguments = $reader->getArguments()) && $arguments[3] instanceof ServiceClosureArgument) {
+                $arguments[1] = $arguments[3]->getValues()[0];
+                unset($arguments[3]);
+                $reader->setArguments($arguments);
             }
         }
     }
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -1463,9 +1463,10 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
 
             $container
                 ->getDefinition('annotations.cached_reader')
+                ->setPublic(true) // set to false in AddAnnotationsCachedReaderPass
                 ->replaceArgument(2, $config['debug'])
-                // temporary property to lazy-reference the cache provider without using it until AddAnnotationsCachedReaderPass runs
-                ->setProperty('cacheProviderBackup', new ServiceClosureArgument(new Reference($cacheService)))
+                // reference the cache provider without using it until AddAnnotationsCachedReaderPass runs
+                ->addArgument(new ServiceClosureArgument(new Reference($cacheService)))
                 ->addTag('annotations.cached_reader')
             ;
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
@@ -56,6 +56,7 @@ public static function configureStatic1()
 
 class BarUserClass
 {
+    public $foo;
     public $bar;
 
     public function __construct(BarClass $bar)
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/foo.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/foo.php
@@ -4,6 +4,7 @@
 
 class FooClass
 {
+    public $qux;
     public $foo;
     public $moo;
 
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -1214,11 +1214,11 @@ private function convertToHtmlEntities(string $htmlContent, string $charset = 'U
         set_error_handler(function () { throw new \Exception(); });
 
         try {
-            return mb_convert_encoding($htmlContent, 'HTML-ENTITIES', $charset);
+            return mb_encode_numericentity($htmlContent, [0x80, 0xFFFF, 0, 0xFFFF], $charset);
         } catch (\Exception|\ValueError $e) {
             try {
                 $htmlContent = iconv($charset, 'UTF-8', $htmlContent);
-                $htmlContent = mb_convert_encoding($htmlContent, 'HTML-ENTITIES', 'UTF-8');
+                $htmlContent = mb_encode_numericentity($htmlContent, [0x80, 0xFFFF, 0, 0xFFFF], 'UTF-8');
             } catch (\Exception|\ValueError $e) {
             }
 
diff --git a/src/Symfony/Component/Filesystem/Tests/Fixtures/MockStream/MockStream.php b/src/Symfony/Component/Filesystem/Tests/Fixtures/MockStream/MockStream.php
@@ -17,6 +17,8 @@
  */
 class MockStream
 {
+    public $context;
+
     /**
      * Opens file or URL.
      *
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ObjectDummy.php b/src/Symfony/Component/Serializer/Tests/Normalizer/Features/ObjectDummy.php
@@ -2,6 +2,7 @@
 
 namespace Symfony\Component\Serializer\Tests\Normalizer\Features;
 
+#[\AllowDynamicProperties]
 class ObjectDummy
 {
     protected $foo;
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/ImageValidatorTest.php
@@ -33,6 +33,7 @@ class ImageValidatorTest extends ConstraintValidatorTestCase
     protected $imageLandscape;
     protected $imagePortrait;
     protected $image4By3;
+    protected $image16By9;
     protected $imageCorrupted;
 
     protected function createValidator()
diff --git a/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php b/src/Symfony/Component/VarDumper/Dumper/HtmlDumper.php
@@ -978,7 +978,7 @@ protected function dumpLine($depth, $endOfValue = false)
         }
         $this->lastDepth = $depth;
 
-        $this->line = mb_convert_encoding($this->line, 'HTML-ENTITIES', 'UTF-8');
+        $this->line = mb_encode_numericentity($this->line, [0x80, 0xFFFF, 0, 0xFFFF], 'UTF-8');
 
         if (-1 === $depth) {
             AbstractDumper::dumpLine(0);
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
@@ -175,7 +175,7 @@ public function testHtmlDump()
   <span class=sf-dump-meta>trace</span>: {<samp>
     <span class=sf-dump-meta title="%sExceptionCasterTest.php
 Stack level %d."><span class="sf-dump-ellipsis sf-dump-ellipsis-path">%s%eVarDumper</span><span class="sf-dump-ellipsis sf-dump-ellipsis-path">%e</span>Tests%eCaster%eExceptionCasterTest.php</span>:<span class=sf-dump-num>%d</span>
-     &hellip;%d
+     &#8230;%d
   </samp>}
 </samp>}
 </bar>
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/SplCasterTest.php
@@ -166,11 +166,13 @@ public function testCastObjectStorageDumpsInfo()
 
     public function testCastArrayObject()
     {
-        $var = new \ArrayObject([123]);
+        $var = new
+            #[\AllowDynamicProperties]
+            class([123]) extends \ArrayObject {};
         $var->foo = 234;
 
         $expected = <<<EOTXT
-ArrayObject {
+ArrayObject@anonymous {
   +"foo": 234
   -storage: array:1 [
     0 => 123
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/HtmlDumperTest.php
@@ -66,7 +66,7 @@ public function testGet()
   <span class=sf-dump-key>6</span> => <span class=sf-dump-num>{$intMax}</span>
   "<span class=sf-dump-key>str</span>" => "<span class=sf-dump-str title="5 characters">d&%s;j&%s;<span class="sf-dump-default sf-dump-ns">\\n</span></span>"
   <span class=sf-dump-key>7</span> => b"""
-    <span class=sf-dump-str title="11 binary or non-UTF-8 characters">&eacute;<span class="sf-dump-default">\\x00</span>test<span class="sf-dump-default">\\t</span><span class="sf-dump-default sf-dump-ns">\\n</span></span>
+    <span class=sf-dump-str title="11 binary or non-UTF-8 characters">&#233;<span class="sf-dump-default">\\x00</span>test<span class="sf-dump-default">\\t</span><span class="sf-dump-default sf-dump-ns">\\n</span></span>
     <span class=sf-dump-str title="11 binary or non-UTF-8 characters">ing</span>
     """
   "<span class=sf-dump-key>[]</span>" => []
diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/dumb-var.php
@@ -3,6 +3,7 @@
 namespace Symfony\Component\VarDumper\Tests\Fixture;
 
 if (!class_exists(\Symfony\Component\VarDumper\Tests\Fixture\DumbFoo::class)) {
+    #[\AllowDynamicProperties]
     class DumbFoo
     {
         public $foo = 'foo';
diff --git a/src/Symfony/Component/VarExporter/Internal/Exporter.php b/src/Symfony/Component/VarExporter/Internal/Exporter.php
@@ -108,7 +108,15 @@ public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount
                 }
                 $properties = ['SplObjectStorage' => ["\0" => $properties]];
                 $arrayValue = (array) $value;
-            } elseif ($value instanceof \Serializable || $value instanceof \__PHP_Incomplete_Class) {
+            } elseif ($value instanceof \Serializable
+                || $value instanceof \__PHP_Incomplete_Class
+                || $value instanceof \DatePeriod
+                || (\PHP_VERSION_ID >= 80200 && (
+                    $value instanceof \DateTimeInterface
+                    || $value instanceof \DateTimeZone
+                    || $value instanceof \DateInterval
+                ))
+            ) {
                 ++$objectsCount;
                 $objectsPool[$value] = [$id = \count($objectsPool), serialize($value), [], 0];
                 $value = new Reference($id);
diff --git a/src/Symfony/Component/VarExporter/Internal/Hydrator.php b/src/Symfony/Component/VarExporter/Internal/Hydrator.php
@@ -55,45 +55,14 @@ public static function hydrate($objects, $values, $properties, $value, $wakeups)
 
     public static function getHydrator($class)
     {
-        if ('stdClass' === $class) {
-            return self::$hydrators[$class] = static function ($properties, $objects) {
-                foreach ($properties as $name => $values) {
-                    foreach ($values as $i => $v) {
-                        $objects[$i]->$name = $v;
-                    }
-                }
-            };
-        }
-
-        if (!class_exists($class) && !interface_exists($class, false) && !trait_exists($class, false)) {
-            throw new ClassNotFoundException($class);
-        }
-        $classReflector = new \ReflectionClass($class);
-
-        if (!$classReflector->isInternal()) {
-            return self::$hydrators[$class] = (self::$hydrators['stdClass'] ?? self::getHydrator('stdClass'))->bindTo(null, $class);
-        }
-
-        if ($classReflector->name !== $class) {
-            return self::$hydrators[$classReflector->name] ?? self::getHydrator($classReflector->name);
-        }
-
         switch ($class) {
-            case 'ArrayIterator':
-            case 'ArrayObject':
-                $constructor = \Closure::fromCallable([$classReflector->getConstructor(), 'invokeArgs']);
-
-                return self::$hydrators[$class] = static function ($properties, $objects) use ($constructor) {
+            case 'stdClass':
+                return self::$hydrators[$class] = static function ($properties, $objects) {
                     foreach ($properties as $name => $values) {
-                        if ("\0" !== $name) {
-                            foreach ($values as $i => $v) {
-                                $objects[$i]->$name = $v;
-                            }
+                        foreach ($values as $i => $v) {
+                            $objects[$i]->$name = $v;
                         }
                     }
-                    foreach ($properties["\0"] ?? [] as $i => $v) {
-                        $constructor($objects[$i], $v);
-                    }
                 };
 
             case 'ErrorException':
@@ -122,6 +91,38 @@ public static function getHydrator($class)
                 };
         }
 
+        if (!class_exists($class) && !interface_exists($class, false) && !trait_exists($class, false)) {
+            throw new ClassNotFoundException($class);
+        }
+        $classReflector = new \ReflectionClass($class);
+
+        switch ($class) {
+            case 'ArrayIterator':
+            case 'ArrayObject':
+                $constructor = \Closure::fromCallable([$classReflector->getConstructor(), 'invokeArgs']);
+
+                return self::$hydrators[$class] = static function ($properties, $objects) use ($constructor) {
+                    foreach ($properties as $name => $values) {
+                        if ("\0" !== $name) {
+                            foreach ($values as $i => $v) {
+                                $objects[$i]->$name = $v;
+                            }
+                        }
+                    }
+                    foreach ($properties["\0"] ?? [] as $i => $v) {
+                        $constructor($objects[$i], $v);
+                    }
+                };
+        }
+
+        if (!$classReflector->isInternal()) {
+            return self::$hydrators[$class] = (self::$hydrators['stdClass'] ?? self::getHydrator('stdClass'))->bindTo(null, $class);
+        }
+
+        if ($classReflector->name !== $class) {
+            return self::$hydrators[$classReflector->name] ?? self::getHydrator($classReflector->name);
+        }
+
         $propertySetters = [];
         foreach ($classReflector->getProperties() as $propertyReflector) {
             if (!$propertyReflector->isStatic()) {
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object.php
@@ -2,8 +2,8 @@
 
 return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
     $o = [
-        clone (($p = &\Symfony\Component\VarExporter\Internal\Registry::$prototypes)['ArrayObject'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('ArrayObject')),
-        clone $p['ArrayObject'],
+        clone (($p = &\Symfony\Component\VarExporter\Internal\Registry::$prototypes)['Symfony\\Component\\VarExporter\\Tests\\ArrayObject'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('Symfony\\Component\\VarExporter\\Tests\\ArrayObject')),
+        clone ($p['ArrayObject'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('ArrayObject')),
     ],
     null,
     [],
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime-legacy.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime-legacy.php
@@ -0,0 +1,92 @@
+<?php
+
+return \Symfony\Component\VarExporter\Internal\Hydrator::hydrate(
+    $o = \Symfony\Component\VarExporter\Internal\Registry::unserialize([
+        clone (($p = &\Symfony\Component\VarExporter\Internal\Registry::$prototypes)['DateTime'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('DateTime')),
+        clone ($p['DateTimeImmutable'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('DateTimeImmutable')),
+        clone ($p['DateTimeZone'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('DateTimeZone')),
+        clone ($p['DateInterval'] ?? \Symfony\Component\VarExporter\Internal\Registry::p('DateInterval')),
+    ], [
+        4 => 'O:10:"DatePeriod":6:{s:5:"start";O:8:"DateTime":3:{s:4:"date";s:26:"2012-07-01 00:00:00.000000";s:13:"timezone_type";i:1;s:8:"timezone";s:6:"+00:00";}s:7:"current";N;s:3:"end";N;s:8:"interval";O:12:"DateInterval":16:{s:1:"y";i:0;s:1:"m";i:0;s:1:"d";i:7;s:1:"h";i:0;s:1:"i";i:0;s:1:"s";i:0;s:1:"f";d:0;s:7:"weekday";i:0;s:16:"weekday_behavior";i:0;s:17:"first_last_day_of";i:0;s:6:"invert";i:0;s:4:"days";b:0;s:12:"special_type";i:0;s:14:"special_amount";i:0;s:21:"have_weekday_relative";i:0;s:21:"have_special_relative";i:0;}s:11:"recurrences";i:5;s:18:"include_start_date";b:1;}',
+    ]),
+    null,
+    [
+        'stdClass' => [
+            'date' => [
+                '1970-01-01 00:00:00.000000',
+                '1970-01-01 00:00:00.000000',
+            ],
+            'timezone_type' => [
+                1,
+                1,
+                3,
+            ],
+            'timezone' => [
+                '+00:00',
+                '+00:00',
+                'Europe/Paris',
+            ],
+            'y' => [
+                3 => 0,
+            ],
+            'm' => [
+                3 => 0,
+            ],
+            'd' => [
+                3 => 7,
+            ],
+            'h' => [
+                3 => 0,
+            ],
+            'i' => [
+                3 => 0,
+            ],
+            's' => [
+                3 => 0,
+            ],
+            'f' => [
+                3 => 0.0,
+            ],
+            'weekday' => [
+                3 => 0,
+            ],
+            'weekday_behavior' => [
+                3 => 0,
+            ],
+            'first_last_day_of' => [
+                3 => 0,
+            ],
+            'invert' => [
+                3 => 0,
+            ],
+            'days' => [
+                3 => false,
+            ],
+            'special_type' => [
+                3 => 0,
+            ],
+            'special_amount' => [
+                3 => 0,
+            ],
+            'have_weekday_relative' => [
+                3 => 0,
+            ],
+            'have_special_relative' => [
+                3 => 0,
+            ],
+        ],
+    ],
+    [
+        $o[0],
+        $o[1],
+        $o[2],
+        $o[3],
+        $o[4],
+    ],
+    [
+        1 => 0,
+        1,
+        2,
+        3,
+    ]
+);
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/datetime.php
diff --git a/src/Symfony/Component/VarExporter/Tests/InstantiatorTest.php b/src/Symfony/Component/VarExporter/Tests/InstantiatorTest.php
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php

Original file line number	Diff line number	Diff line change
`@@ -194,6 +194,7 @@ function ($definition) {`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
	`197`	`+#[\AllowDynamicProperties]`
`197`	`198`	`final class DummyClass implements DummyInterface, SunnyInterface`
`198`	`199`	`{`
`199`	`200`	`private $ref;`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ public static function configureStatic1()`
`56`	`56`
`57`	`57`	`class BarUserClass`
`58`	`58`	`{`
	`59`	`+ public $foo;`
`59`	`60`	`public $bar;`
`60`	`61`
`61`	`62`	`public function __construct(BarClass $bar)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`class FooClass`
`6`	`6`	`{`
	`7`	`+ public $qux;`
`7`	`8`	`public $foo;`
`8`	`9`	`public $moo;`
`9`	`10`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,8 @@`
`17`	`17`	`*/`
`18`	`18`	`class MockStream`
`19`	`19`	`{`
	`20`	`+ public $context;`
	`21`	`+`
`20`	`22`	`/**`
`21`	`23`	`* Opens file or URL.`
`22`	`24`	`*`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Symfony\Component\Serializer\Tests\Normalizer\Features;`
`4`	`4`
	`5`	`+#[\AllowDynamicProperties]`
`5`	`6`	`class ObjectDummy`
`6`	`7`	`{`
`7`	`8`	`protected $foo;`