Allow new and old Symfony Process versions.

Required for us because Composer uses an old one, but Magento uses a new one.

Author: toddbc

composer.json

@@ -2,7 +2,7 @@
     "name": "jamescowie/composer-patcher",
     "description": "Apply patches using composer",
     "license": "MIT",
-    "version": "1.0.6",
+    "version": "1.0.7",
     "authors": [
         {
             "name": "jamescowie",

src/Inviqa/Patch/Patch.php

@@ -57,7 +57,7 @@ final public function apply()
     protected function doApply()
     {
         $patchPath = escapeshellarg($this->fileInfo->getRealPath());
-        $process = Process::fromShellCommandline("patch -p 1 < $patchPath");
+        $process = $this->fromShellCommandline("patch -p 1 < $patchPath");
         $process->mustRun();
         return $process->getExitCode() === 0;
     }
@@ -68,7 +68,7 @@ protected function doApply()
     protected function canApply()
     {
         $patchPath = escapeshellarg($this->fileInfo->getRealPath());
-        $process = Process::fromShellCommandline("patch --dry-run -p 1 < $patchPath");
+        $process = $this->fromShellCommandline("patch --dry-run -p 1 < $patchPath");
         try {
             $process->mustRun();
             return $process->getExitCode() === 0;
@@ -85,7 +85,7 @@ protected function canApply()
     protected function isApplied()
     {
         $patchPath = escapeshellarg($this->fileInfo->getRealPath());
-        $process = Process::fromShellCommandline("patch --dry-run -p 1 -R < $patchPath");
+        $process = $this->fromShellCommandline("patch --dry-run -p 1 -R < $patchPath");
         try {
             $process->mustRun();
             $result = $process->getExitCode() === 0;
@@ -101,6 +101,20 @@ protected function isApplied()
         }
     }
 
+    /**
+     * @process string $cmd Command to execute.
+     * @return Process
+     */
+    protected function fromShellCommandline($cmd)
+    {
+        // Newer Symfony/Process versions use Process::fromShellCommandline().
+        // We have to support both because Composer uses an ancient one bundled in the phar.
+        if (is_callable([Process::class, 'fromShellCommandline'])) {
+            return Process::fromShellCommandline($cmd);
+        }
+        return new Process($cmd);
+    }
+
     /**
      * @return Output
      */

test/Integration/Patch/PatcherTest.php

@@ -31,7 +31,11 @@ protected function tearDown()
         }
 
         $patchPath = escapeshellarg($this->fileInfo->getRealPath());
-        $process = Process::fromShellCommandline("patch -p 1 -R < $patchPath");
+        if (is_callable([Process::class, 'fromShellCommandline'])) {
+            $process = Process::fromShellCommandline("patch -p 1 -R < $patchPath");
+        } else {
+            $process = new Process("patch -p 1 -R < $patchPath");
+        }
         $process->mustRun();
     }