[VarExporter] fix for change in PHP 7.4.6

symfony · May 16, 2020 · 1e9486d · 1e9486d
1 parent cc519aa
commit 1e9486d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-iterator.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-iterator.php
@@ -14,6 +14,7 @@
                 123,
             ],
             [],
+            null,
         ],
     ]
 );
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object-custom.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object-custom.php
@@ -16,6 +16,7 @@
             [
                 "\0".'Symfony\\Component\\VarExporter\\Tests\\MyArrayObject'."\0".'unused' => 123,
             ],
+            null,
         ],
     ]
 );
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/array-object.php
@@ -18,11 +18,13 @@
             [
                 'foo' => $o[1],
             ],
+            null,
         ],
         -1 => [
             0,
             [],
             [],
+            null,
         ],
     ]
 );
diff --git a/src/Symfony/Component/VarExporter/Tests/Fixtures/final-array-iterator.php b/src/Symfony/Component/VarExporter/Tests/Fixtures/final-array-iterator.php
@@ -12,6 +12,7 @@
             0,
             [],
             [],
+            null,
         ],
     ]
 );
diff --git a/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php b/src/Symfony/Component/VarExporter/Tests/VarExporterTest.php
@@ -87,10 +87,12 @@ public function testExport(string $testName, $value, bool $staticValueExpected =
         $dump = "<?php\n\nreturn ".$marshalledValue.";\n";
         $dump = str_replace(var_export(__FILE__, true), "\\dirname(__DIR__).\\DIRECTORY_SEPARATOR.'VarExporterTest.php'", $dump);
 
-        if (\PHP_VERSION_ID < 70400 && \in_array($testName, ['array-object', 'array-iterator', 'array-object-custom', 'spl-object-storage', 'final-array-iterator', 'final-error'], true)) {
+        if (\PHP_VERSION_ID >= 70406 || !\in_array($testName, ['array-object', 'array-iterator', 'array-object-custom', 'spl-object-storage', 'final-array-iterator', 'final-error'], true)) {
+            $fixtureFile = __DIR__.'/Fixtures/'.$testName.'.php';
+        } elseif (\PHP_VERSION_ID < 70400) {
             $fixtureFile = __DIR__.'/Fixtures/'.$testName.'-legacy.php';
         } else {
-            $fixtureFile = __DIR__.'/Fixtures/'.$testName.'.php';
+            $this->markAsSkipped('PHP >= 7.4.6 required.');
         }
         $this->assertStringEqualsFile($fixtureFile, $dump);
 

diff --git a/src/Symfony/Component/VarExporter/composer.json b/src/Symfony/Component/VarExporter/composer.json
@@ -19,7 +19,7 @@
         "php": "^7.1.3"
     },
     "require-dev": {
-        "symfony/var-dumper": "^4.1.1|^5.0"
+        "symfony/var-dumper": "^4.4.9|^5.0.9"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\VarExporter\\": "" },