[VarDumper] Fix tests for PHP 8.1

alexandre-daubois · alexandre-daubois · commit 44efb7262ac2 · 2021-06-15T12:23:59.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
@@ -122,17 +122,31 @@ public function testReflectionParameter()
     {
         $var = new \ReflectionParameter(reflectionParameterFixture::class, 0);
 
-        $this->assertDumpMatchesFormat(
-            <<<'EOTXT'
+        if (\PHP_VERSION_ID < 80100) {
+            $this->assertDumpMatchesFormat(
+                <<<'EOTXT'
 ReflectionParameter {
   +name: "arg1"
   position: 0
   typeHint: "Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass"
   default: null
 }
 EOTXT
-            , $var
-        );
+                , $var
+            );
+        } else {
+            $this->assertDumpMatchesFormat(
+                <<<'EOTXT'
+ReflectionParameter {
+  +name: "arg1"
+  position: 0
+  allowsNull: true
+  typeHint: "Symfony\Component\VarDumper\Tests\Fixtures\NotLoadableClass"
+}
+EOTXT
+                , $var
+            );
+        }
     }
 
     public function testReflectionParameterScalar()
@@ -406,7 +420,8 @@ public function testGenerator()
         $generator = new GeneratorDemo();
         $generator = $generator->baz();
 
-        $expectedDump = <<<'EODUMP'
+        if (\PHP_VERSION_ID < 80100) {
+            $expectedDump = <<<'EODUMP'
 Generator {
   this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
   executing: {
@@ -420,14 +435,32 @@ public function testGenerator()
   closed: false
 }
 EODUMP;
+        } else {
+            $expectedDump = <<<'EODUMP'
+Generator {
+  this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
+  trace: {
+    ./src/Symfony/Component/VarDumper/Tests/Fixtures/GeneratorDemo.php:13 {
+      Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz()
+      › public function baz()
+      › {
+      ›     yield from bar();
+    }
+    Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() {}
+  }
+  closed: false
+}
+EODUMP;
+        }
 
         $this->assertDumpMatchesFormat($expectedDump, $generator);
 
         foreach ($generator as $v) {
             break;
         }
 
-        $expectedDump = <<<'EODUMP'
+        if (\PHP_VERSION_ID < 80100) {
+            $expectedDump = <<<'EODUMP'
 array:2 [
   0 => ReflectionGenerator {
     this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
@@ -447,15 +480,48 @@ public function testGenerator()
     executing: {
       %sGeneratorDemo.php:10 {
         Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo()
+        › {
+        ›     yield 1;
+        › }
+      }
+    }
+    closed: false
+  }
+]
+EODUMP;
+        } else {
+            $expectedDump = <<<'EODUMP'
+array:2 [
+  0 => ReflectionGenerator {
+    this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
+    trace: {
+      %s%eTests%eFixtures%eGeneratorDemo.php:9 {
+        Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo()
+        › {
         ›     yield 1;
         › }
-        › 
       }
+      %s%eTests%eFixtures%eGeneratorDemo.php:20 { …}
+      %s%eTests%eFixtures%eGeneratorDemo.php:14 { …}
+      Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz() {}
+    }
+    closed: false
+  }
+  1 => Generator {
+    trace: {
+      ./src/Symfony/Component/VarDumper/Tests/Fixtures/GeneratorDemo.php:9 {
+        Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo()
+        › {
+        ›     yield 1;
+        › }
+      }
+      Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo() {}
     }
     closed: false
   }
 ]
 EODUMP;
+        }
 
         $r = new \ReflectionGenerator($generator);
         $this->assertDumpMatchesFormat($expectedDump, [$r, $r->getExecutingGenerator()]);
