fix test on sf5 process package

Author: SpacePossum

composer.json

@@ -19,7 +19,7 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^7.5 || ^8.0",
-        "symfony/process": "^2 || ^3.3 || ^4 || ^5"
+        "symfony/process": "^4 || ^5"
     },
     "autoload": {
         "classmap": [

tests/Output/Integration/StrictUnifiedDiffOutputBuilderIntegrationTest.php

@@ -198,8 +198,15 @@ public function testIntegrationDiffOutputBuilderVersusDiffCommand(string $diff,
         $this->assertNotFalse(\file_put_contents($this->fileFrom, $from));
         $this->assertNotFalse(\file_put_contents($this->fileTo, $to));
 
-        $p = new Process(\sprintf('diff -u %s %s', \escapeshellarg($this->fileFrom), \escapeshellarg($this->fileTo)));
-        $p->run();
+        $p = Process::fromShellCommandline('diff -u $from $to');
+        $p->run(
+            null,
+            [
+                'from' => $this->fileFrom,
+                'to' => $this->fileTo,
+            ]
+        );
+
         $this->assertSame(1, $p->getExitCode()); // note: Process assumes exit code 0 for `isSuccessful`, however `diff` uses the exit code `1` for success with diff
 
         $output = $p->getOutput();
@@ -227,13 +234,14 @@ private function doIntegrationTestGitApply(string $diff, string $from, string $t
         $this->assertNotFalse(\file_put_contents($this->fileFrom, $from));
         $this->assertNotFalse(\file_put_contents($this->filePatch, $diff));
 
-        $p = new Process(\sprintf(
-            'git --git-dir %s apply --check -v --unsafe-paths --ignore-whitespace %s',
-            \escapeshellarg($this->dir),
-            \escapeshellarg($this->filePatch)
-        ));
-
-        $p->run();
+        $p = Process::fromShellCommandline('git --git-dir $dir apply --check -v --unsafe-paths --ignore-whitespace $patch');
+        $p->run(
+            null,
+            [
+                'dir' => $this->dir,
+                'patch' => $this->filePatch,
+            ]
+        );
 
         $this->assertProcessSuccessful($p);
     }
@@ -248,21 +256,21 @@ private function doIntegrationTestPatch(string $diff, string $from, string $to):
         $this->assertNotFalse(\file_put_contents($this->fileFrom, $from));
         $this->assertNotFalse(\file_put_contents($this->filePatch, $diff));
 
-        $command = \sprintf(
-            'patch -u --verbose --posix %s < %s',
-            \escapeshellarg($this->fileFrom),
-            \escapeshellarg($this->filePatch)
+        $p = Process::fromShellCommandline('patch -u --verbose --posix $from < $patch');
+        $p->run(
+            null,
+            [
+                'from' => $this->fileFrom,
+                'patch' => $this->filePatch,
+            ]
         );
 
-        $p = new Process($command);
-        $p->run();
-
         $this->assertProcessSuccessful($p);
 
         $this->assertStringEqualsFile(
             $this->fileFrom,
             $to,
-            \sprintf('Patch command "%s".', $command)
+            \sprintf('Patch command "%s".', $p->getCommandLine())
         );
     }
 

tests/Output/Integration/UnifiedDiffOutputBuilderIntegrationTest.php

@@ -91,21 +91,21 @@ private function doIntegrationTestPatch(string $diff, string $from, string $to):
         $this->assertNotFalse(\file_put_contents($this->fileFrom, $from));
         $this->assertNotFalse(\file_put_contents($this->filePatch, $diff));
 
-        $command = \sprintf(
-            'patch -u --verbose --posix  %s < %s', // --posix
-            \escapeshellarg($this->fileFrom),
-            \escapeshellarg($this->filePatch)
+        $p = Process::fromShellCommandline('patch -u --verbose --posix $from < $patch'); // --posix
+        $p->run(
+            null,
+            [
+                'from' => $this->fileFrom,
+                'patch' => $this->filePatch,
+            ]
         );
 
-        $p = new Process($command);
-        $p->run();
-
         $this->assertProcessSuccessful($p);
 
         $this->assertStringEqualsFile(
             $this->fileFrom,
             $to,
-            \sprintf('Patch command "%s".', $command)
+            \sprintf('Patch command "%s".', $p->getCommandLine())
         );
     }
 
@@ -119,15 +119,15 @@ private function doIntegrationTestGitApply(string $diff, string $from, string $t
         $this->assertNotFalse(\file_put_contents($this->fileFrom, $from));
         $this->assertNotFalse(\file_put_contents($this->filePatch, $diff));
 
-        $command = \sprintf(
-            'git --git-dir %s apply --check -v --unsafe-paths --ignore-whitespace %s',
-            \escapeshellarg($this->dir),
-            \escapeshellarg($this->filePatch)
+        $p = Process::fromShellCommandline('git --git-dir $dir apply --check -v --unsafe-paths --ignore-whitespace $patch');
+        $p->run(
+            null,
+            [
+                'dir' => $this->dir,
+                'patch' => $this->filePatch,
+            ]
         );
 
-        $p = new Process($command);
-        $p->run();
-
         $this->assertProcessSuccessful($p);
     }
 

tests/Utils/UnifiedDiffAssertTraitIntegrationTest.php

@@ -44,16 +44,16 @@ protected function tearDown(): void
      */
     public function testValidPatches(string $fileFrom, string $fileTo): void
     {
-        $command = \sprintf(
-            'diff -u %s %s > %s',
-            \escapeshellarg(\realpath($fileFrom)),
-            \escapeshellarg(\realpath($fileTo)),
-            \escapeshellarg($this->filePatch)
+        $p = Process::fromShellCommandline('diff -u $from $to > $patch');
+        $p->run(
+            null,
+            [
+                'from' => \realpath($fileFrom),
+                'to' => \realpath($fileTo),
+                'patch' => $this->filePatch,
+            ]
         );
 
-        $p = new Process($command);
-        $p->run();
-
         $exitCode = $p->getExitCode();
 
         if (0 === $exitCode) {
@@ -68,7 +68,7 @@ public function testValidPatches(string $fileFrom, string $fileTo): void
             $exitCode,
             \sprintf(
                 "Command exec. was not successful:\n\"%s\"\nOutput:\n\"%s\"\nStdErr:\n\"%s\"\nExit code %d.\n",
-                $command,
+                $p->getCommandLine(),
                 $p->getOutput(),
                 $p->getErrorOutput(),
                 $p->getExitCode()