Merge branch '2.x' into 3.x

tests/Visual/Collision.php

@@ -10,7 +10,7 @@ test('collision', function (array $arguments) {
 
         $process->run();
 
-        return preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
+        return removeAnsiEscapeSequences($process->getOutput());
     };
 
     $outputContent = explode("\n", $output());

tests/Visual/Help.php

@@ -6,7 +6,7 @@ test('visual snapshot of help command output', function () {
 
         $process->run();
 
-        return preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
+        return removeAnsiEscapeSequences($process->getOutput());
     };
 
     expect($output())->toMatchSnapshot();

tests/Visual/JUnit.php

@@ -0,0 +1,79 @@
+<?php
+
+use Symfony\Component\Process\Process;
+
+$run = function () {
+    $junitLogFile = tempnam(sys_get_temp_dir(), 'junit');
+
+    $process = new Process(
+        array_merge(['php', 'bin/pest', '--log-junit', $junitLogFile], func_get_args()),
+        dirname(__DIR__, 2),
+        ['COLLISION_PRINTER' => 'DefaultPrinter', 'COLLISION_IGNORE_DURATION' => 'true'],
+    );
+
+    $process->run();
+
+    $rawXmlContent = file_get_contents($junitLogFile);
+    unlink($junitLogFile);
+
+    // convert xml to array
+    try {
+        $xml = new SimpleXMLElement(preg_replace("/(<\/?)(\w+):([^>]*>)/", '$1$2$3', $rawXmlContent));
+
+        return json_decode(json_encode((array) $xml), true);
+    } catch (Exception $exception) {
+        throw new XmlParseException($exception->getMessage(), $exception->getCode(), $exception->getPrevious());
+    }
+};
+
+$normalizedPath = function (string $path) {
+    return str_replace('/', DIRECTORY_SEPARATOR, $path);
+};
+
+test('junit output', function () use ($normalizedPath, $run) {
+    $result = $run('tests/.tests/SuccessOnly.php');
+
+    expect($result['testsuite']['@attributes'])
+        ->name->toBe('Tests\tests\SuccessOnly')
+        ->file->toBe($normalizedPath('tests/.tests/SuccessOnly.php'))
+        ->tests->toBe('2')
+        ->assertions->toBe('2')
+        ->errors->toBe('0')
+        ->failures->toBe('0')
+        ->skipped->toBe('0');
+
+    expect($result['testsuite']['testcase'])
+        ->toHaveCount(2);
+
+    expect($result['testsuite']['testcase'][0]['@attributes'])
+        ->name->toBe('it can pass with comparison')
+        ->file->toBe($normalizedPath('tests/.tests/SuccessOnly.php::it can pass with comparison'))
+        ->class->toBe('Tests\tests\SuccessOnly')
+        ->classname->toBe('Tests.tests.SuccessOnly')
+        ->assertions->toBe('1')
+        ->time->toStartWith('0.0');
+});
+
+test('junit with parallel', function () use ($normalizedPath, $run) {
+    $result = $run('tests/.tests/SuccessOnly.php', '--parallel', '--processes=1', '--filter', 'can pass with comparison');
+
+    expect($result['testsuite']['@attributes'])
+        ->name->toBe('Tests\tests\SuccessOnly')
+        ->file->toBe($normalizedPath('tests/.tests/SuccessOnly.php'))
+        ->tests->toBe('1')
+        ->assertions->toBe('1')
+        ->errors->toBe('0')
+        ->failures->toBe('0')
+        ->skipped->toBe('0');
+
+    expect($result['testsuite']['testcase'])
+        ->toHaveCount(1);
+
+    expect($result['testsuite']['testcase']['@attributes'])
+        ->name->toBe('it can pass with comparison')
+        ->file->toBe($normalizedPath('tests/.tests/SuccessOnly.php::it can pass with comparison'))
+        ->class->toBe('Tests\tests\SuccessOnly')
+        ->classname->toBe('Tests.tests.SuccessOnly')
+        ->assertions->toBe('1')
+        ->time->toStartWith('0.0');
+});

tests/Visual/Parallel.php

@@ -13,12 +13,12 @@ $run = function () {
 
     $process->run();
 
-    return preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
+    return removeAnsiEscapeSequences($process->getOutput());
 };
 
 test('parallel', function () use ($run) {
     expect($run('--exclude-group=integration'))
-        ->toContain('Tests:    1 deprecated, 4 warnings, 5 incomplete, 2 notices, 13 todos, 16 skipped, 965 passed (2285 assertions)')
+        ->toContain('Tests:    1 deprecated, 4 warnings, 5 incomplete, 2 notices, 13 todos, 16 skipped, 994 passed (2348 assertions)')
         ->toContain('Parallel: 3 processes');
 })->skipOnWindows();
 

tests/Visual/SingleTestOrDirectory.php

@@ -9,7 +9,7 @@ $run = function (string $target, $decorated = false) {
 
     $process->run();
 
-    return $decorated ? $process->getOutput() : preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
+    return $decorated ? $process->getOutput() : removeAnsiEscapeSequences($process->getOutput());
 };
 
 $snapshot = function ($name) {

tests/Visual/Todo.php

@@ -11,9 +11,7 @@ $run = function (string $target, bool $parallel) {
 
     expect($process->getExitCode())->toBe(0);
 
-    $outputContent = preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
-
-    return $outputContent;
+    return removeAnsiEscapeSequences($process->getOutput());
 };
 
 $snapshot = function ($name) {

tests/Visual/Version.php

@@ -6,7 +6,7 @@ test('visual snapshot of help command output', function () {
 
         $process->run();
 
-        return preg_replace('#\\x1b[[][^A-Za-z]*[A-Za-z]#', '', $process->getOutput());
+        return removeAnsiEscapeSequences($process->getOutput());
     };
 
     expect($output())->toMatchSnapshot();