Merge branch '9.2'

Author: sebastianbergmann

src/Report/PHP.php

@@ -9,7 +9,6 @@
  */
 namespace SebastianBergmann\CodeCoverage\Report;
 
-use function addcslashes;
 use function dirname;
 use function file_put_contents;
 use function serialize;
@@ -23,9 +22,12 @@ final class PHP
     public function process(CodeCoverage $coverage, ?string $target = null): string
     {
         $buffer = sprintf(
-            '<?php
-return \unserialize(\'%s\');',
-            addcslashes(serialize($coverage), "'")
+            "<?php
+return \unserialize(<<<'END_OF_COVERAGE_SERIALIZATION'%s%s%sEND_OF_COVERAGE_SERIALIZATION%s);",
+            PHP_EOL,
+            serialize($coverage),
+            PHP_EOL,
+            PHP_EOL
         );
 
         if ($target !== null) {

tests/TestCase.php

@@ -1688,6 +1688,42 @@ protected function setUpXdebugStubForFileWithIgnoredLines(): Driver
         return $stub;
     }
 
+    protected function getLineCoverageForFileWithEval(): CodeCoverage
+    {
+        $filter = new Filter;
+        $filter->includeFile(TEST_FILES_PATH . 'source_with_eval.php');
+
+        $coverage = new CodeCoverage(
+            $this->setUpXdebugStubForFileWithEval(),
+            $filter
+        );
+
+        $coverage->start('FileWithEval', true);
+        $coverage->stop();
+
+        return $coverage;
+    }
+
+    protected function setUpXdebugStubForFileWithEval(): Driver
+    {
+        $stub = $this->createStub(Driver::class);
+
+        $stub->method('stop')
+            ->willReturn(RawCodeCoverageData::fromXdebugWithoutPathCoverage(
+                [
+                    TEST_FILES_PATH . 'source_with_eval.php' => [
+                        3 => 1,
+                        5 => 1,
+                    ],
+                    TEST_FILES_PATH . 'source_with_eval.php(5) : eval()\'d code' => [
+                        1 => 1,
+                    ],
+                ]
+            ));
+
+        return $stub;
+    }
+
     protected function getCoverageForClassWithAnonymousFunction(): CodeCoverage
     {
         $filter = new Filter;

tests/_files/source_with_eval.php

@@ -0,0 +1,5 @@
+<?php
+
+$normalResult = 1 + 1;
+
+$evalResult = eval('return 1+1;');

tests/tests/PhpTest.php

@@ -31,4 +31,16 @@ public function testPHPSerialisationProducesValidCode(): void
 
         $this->assertEquals($coverage, $unserialized);
     }
+
+    public function testPHPSerialisationProducesValidCodeWhenOutputIncludesSingleQuote(): void
+    {
+        $coverage = $this->getLineCoverageForFileWithEval();
+
+        /* @noinspection UnusedFunctionResultInspection */
+        (new PHP)->process($coverage, self::$TEST_TMP_PATH . '/serialized.php');
+
+        $unserialized = require self::$TEST_TMP_PATH . '/serialized.php';
+
+        $this->assertEquals($coverage, $unserialized);
+    }
 }