From 5805a68645596523ff88a900913799ec8aeb9fd5 Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Mon, 3 Jan 2022 14:51:41 +0100
Subject: [PATCH] Fix some todos dropping support for older Symfony releases

---
 phpstan/config.neon                           |  2 --
 src/Composer/Command/BaseCommand.php          | 25 +++------------
 src/Composer/Command/InitCommand.php          |  8 +----
 src/Composer/Command/LicensesCommand.php      |  8 +----
 src/Composer/Compiler.php                     |  8 +----
 src/Composer/Console/Application.php          |  3 +-
 src/Composer/Console/HtmlOutputFormatter.php  | 12 ++++---
 .../EventDispatcher/EventDispatcher.php       | 10 +-----
 src/Composer/Util/Perforce.php                |  8 +----
 src/Composer/Util/ProcessExecutor.php         | 31 +++----------------
 tests/Composer/Test/AllFunctionalTest.php     |  8 +----
 11 files changed, 22 insertions(+), 101 deletions(-)

diff --git a/phpstan/config.neon b/phpstan/config.neon
index b13ba7e09..69d7df43d 100644
--- a/phpstan/config.neon
+++ b/phpstan/config.neon
@@ -13,8 +13,6 @@ parameters:
        - '../tests/Composer/Test/Autoload/Fixtures/*'
        - '../tests/Composer/Test/Plugin/Fixtures/*'
        - '../tests/Composer/Test/PolyfillTestCase.php'
-       # TODO Remove in 2.3
-       - '../src/Composer/Console/HtmlOutputFormatter.php'
 
     reportUnmatchedIgnoredErrors: false
 
diff --git a/src/Composer/Command/BaseCommand.php b/src/Composer/Command/BaseCommand.php
index 59cbbe9ab..38ddc570f 100644
--- a/src/Composer/Command/BaseCommand.php
+++ b/src/Composer/Command/BaseCommand.php
@@ -266,13 +266,7 @@ abstract class BaseCommand extends Command
         $renderer = new Table($output);
         $renderer->setStyle('compact');
         $rendererStyle = $renderer->getStyle();
-        if (method_exists($rendererStyle, 'setVerticalBorderChars')) {
-            $rendererStyle->setVerticalBorderChars('');
-        } else {
-            // TODO remove in composer 2.2
-            // @phpstan-ignore-next-line
-            $rendererStyle->setVerticalBorderChar('');
-        }
+        $rendererStyle->setVerticalBorderChars('');
         $rendererStyle->setCellRowContentFormat('%s  ');
         $renderer->setRows($table)->render();
     }
@@ -282,20 +276,9 @@ abstract class BaseCommand extends Command
      */
     protected function getTerminalWidth()
     {
-        if (class_exists('Symfony\Component\Console\Terminal')) {
-            $terminal = new Terminal();
-            $width = $terminal->getWidth();
-        } else {
-            // For versions of Symfony console before 3.2
-            // TODO remove in composer 2.2
-            // @phpstan-ignore-next-line
-            list($width) = $this->getApplication()->getTerminalDimensions();
-        }
-        if (null === $width) {
-            // In case the width is not detected, we're probably running the command
-            // outside of a real terminal, use space without a limit
-            $width = PHP_INT_MAX;
-        }
+        $terminal = new Terminal();
+        $width = $terminal->getWidth();
+
         if (Platform::isWindows()) {
             $width--;
         } else {
diff --git a/src/Composer/Command/InitCommand.php b/src/Composer/Command/InitCommand.php
index a5cf0fee4..099ec2a2e 100644
--- a/src/Composer/Command/InitCommand.php
+++ b/src/Composer/Command/InitCommand.php
@@ -731,13 +731,7 @@ EOT
         $finder = new ExecutableFinder();
         $gitBin = $finder->find('git');
 
-        // TODO in v2.3 always call with an array
-        if (method_exists('Symfony\Component\Process\Process', 'fromShellCommandline')) {
-            $cmd = new Process(array($gitBin, 'config', '-l'));
-        } else {
-            // @phpstan-ignore-next-line
-            $cmd = new Process(sprintf('%s config -l', ProcessExecutor::escape($gitBin)));
-        }
+        $cmd = new Process(array($gitBin, 'config', '-l'));
         $cmd->run();
 
         if ($cmd->isSuccessful()) {
diff --git a/src/Composer/Command/LicensesCommand.php b/src/Composer/Command/LicensesCommand.php
index 5375ab08d..3c7c8265e 100644
--- a/src/Composer/Command/LicensesCommand.php
+++ b/src/Composer/Command/LicensesCommand.php
@@ -85,13 +85,7 @@ EOT
                 $table = new Table($output);
                 $table->setStyle('compact');
                 $tableStyle = $table->getStyle();
-                if (method_exists($tableStyle, 'setVerticalBorderChars')) {
-                    $tableStyle->setVerticalBorderChars('');
-                } else {
-                    // TODO remove in composer 2.2
-                    // @phpstan-ignore-next-line
-                    $tableStyle->setVerticalBorderChar('');
-                }
+                $tableStyle->setVerticalBorderChars('');
                 $tableStyle->setCellRowContentFormat('%s  ');
                 $table->setHeaders(array('Name', 'Version', 'License'));
                 foreach ($packages as $package) {
diff --git a/src/Composer/Compiler.php b/src/Composer/Compiler.php
index b0aafa74c..ab059312f 100644
--- a/src/Composer/Compiler.php
+++ b/src/Composer/Compiler.php
@@ -64,13 +64,7 @@ class Compiler
         $this->versionDate = new \DateTime(trim($process->getOutput()));
         $this->versionDate->setTimezone(new \DateTimeZone('UTC'));
 
-        // TODO in v2.3 always call with an array
-        if (method_exists('Symfony\Component\Process\Process', 'fromShellCommandline')) {
-            $process = new Process(array('git', 'describe', '--tags', '--exact-match', 'HEAD'), __DIR__);
-        } else {
-            // @phpstan-ignore-next-line
-            $process = new Process('git describe --tags --exact-match HEAD');
-        }
+        $process = new Process(array('git', 'describe', '--tags', '--exact-match', 'HEAD'), __DIR__);
         if ($process->run() == 0) {
             $this->version = trim($process->getOutput());
         } else {
diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php
index cc9f08685..c40f6b307 100644
--- a/src/Composer/Console/Application.php
+++ b/src/Composer/Console/Application.php
@@ -440,8 +440,7 @@ class Application extends BaseApplication
             } catch (\InvalidArgumentException $e) {
                 if ($required) {
                     $this->io->writeError($e->getMessage());
-                    // TODO composer 2.3 simplify to $this->areExceptionsCaught()
-                    if (!method_exists($this, 'areExceptionsCaught') || $this->areExceptionsCaught()) {
+                    if ($this->areExceptionsCaught()) {
                         exit(1);
                     }
                     throw $e;
diff --git a/src/Composer/Console/HtmlOutputFormatter.php b/src/Composer/Console/HtmlOutputFormatter.php
index fcb8fab4b..f95933a1b 100644
--- a/src/Composer/Console/HtmlOutputFormatter.php
+++ b/src/Composer/Console/HtmlOutputFormatter.php
@@ -12,6 +12,7 @@
 
 namespace Composer\Console;
 
+use Closure;
 use Composer\Pcre\Preg;
 use Symfony\Component\Console\Formatter\OutputFormatter;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
@@ -64,18 +65,19 @@ class HtmlOutputFormatter extends OutputFormatter
     {
         $formatted = parent::format($message);
 
+        if ($formatted === null) {
+            return null;
+        }
+
         $clearEscapeCodes = '(?:39|49|0|22|24|25|27|28)';
 
-        // TODO in 2.3 replace with Closure::fromCallable and then use Preg::replaceCallback
-        return preg_replace_callback("{\033\[([0-9;]+)m(.*?)\033\[(?:".$clearEscapeCodes.";)*?".$clearEscapeCodes."m}s", array($this, 'formatHtml'), $formatted);
+        return Preg::replaceCallback("{\033\[([0-9;]+)m(.*?)\033\[(?:".$clearEscapeCodes.";)*?".$clearEscapeCodes."m}s", Closure::fromCallable([$this, 'formatHtml']), $formatted);
     }
 
     /**
      * @param string[] $matches
-     *
-     * @return string
      */
-    private function formatHtml($matches)
+    private function formatHtml(array $matches): string
     {
         $out = '<span style="';
         foreach (explode(';', $matches[1]) as $code) {
diff --git a/src/Composer/EventDispatcher/EventDispatcher.php b/src/Composer/EventDispatcher/EventDispatcher.php
index 74ec3459d..bee090c36 100644
--- a/src/Composer/EventDispatcher/EventDispatcher.php
+++ b/src/Composer/EventDispatcher/EventDispatcher.php
@@ -323,18 +323,10 @@ class EventDispatcher
                     break;
                 }
             }
-        } catch (\Exception $e) { // TODO Composer 2.2 turn all this into a finally
+        } finally {
             $this->popEvent();
-
-            throw $e;
-        } catch (\Throwable $e) {
-            $this->popEvent();
-
-            throw $e;
         }
 
-        $this->popEvent();
-
         return $returnMax;
     }
 
diff --git a/src/Composer/Util/Perforce.php b/src/Composer/Util/Perforce.php
index eeca4cc60..559e8c311 100644
--- a/src/Composer/Util/Perforce.php
+++ b/src/Composer/Util/Perforce.php
@@ -518,13 +518,7 @@ class Perforce
     {
         $command = $this->generateP4Command(' login -a');
 
-        // TODO in v3 generate command as an array
-        if (method_exists('Symfony\Component\Process\Process', 'fromShellCommandline')) {
-            $process = Process::fromShellCommandline($command, null, null, $password);
-        } else {
-            // @phpstan-ignore-next-line
-            $process = new Process($command, null, null, $password);
-        }
+        $process = Process::fromShellCommandline($command, null, null, $password);
 
         return $process->run();
     }
diff --git a/src/Composer/Util/ProcessExecutor.php b/src/Composer/Util/ProcessExecutor.php
index afb3a0a07..f7efe23de 100644
--- a/src/Composer/Util/ProcessExecutor.php
+++ b/src/Composer/Util/ProcessExecutor.php
@@ -115,16 +115,6 @@ class ProcessExecutor
             $this->io->writeError('Executing command ('.($cwd ?: 'CWD').'): '.$safeCommand);
         }
 
-        // TODO in 2.2, these two checks can be dropped as Symfony 4+ supports them out of the box
-        // make sure that null translate to the proper directory in case the dir is a symlink
-        // and we call a git command, because msysgit does not handle symlinks properly
-        if (null === $cwd && Platform::isWindows() && false !== strpos($command, 'git') && getcwd()) {
-            $cwd = realpath(getcwd());
-        }
-        if (null !== $cwd && !is_dir($cwd)) {
-            throw new \RuntimeException('The given CWD for the process does not exist: '.$cwd);
-        }
-
         $this->captureOutput = func_num_args() > 3;
         $this->errorOutput = '';
 
@@ -181,8 +171,6 @@ class ProcessExecutor
             $job['reject'] = $reject;
         };
 
-        $self = $this;
-
         $canceler = function () use (&$job) {
             if ($job['status'] === ProcessExecutor::STATUS_QUEUED) {
                 $job['status'] = ProcessExecutor::STATUS_ABORTED;
@@ -204,21 +192,20 @@ class ProcessExecutor
         };
 
         $promise = new Promise($resolver, $canceler);
-        $promise = $promise->then(function () use (&$job, $self) {
+        $promise = $promise->then(function () use (&$job) {
             if ($job['process']->isSuccessful()) {
                 $job['status'] = ProcessExecutor::STATUS_COMPLETED;
             } else {
                 $job['status'] = ProcessExecutor::STATUS_FAILED;
             }
 
-            // TODO 3.0 this should be done directly on $this when PHP 5.3 is dropped
-            $self->markJobDone();
+            $this->markJobDone();
 
             return $job['process'];
-        }, function ($e) use (&$job, $self) {
+        }, function ($e) use (&$job) {
             $job['status'] = ProcessExecutor::STATUS_FAILED;
 
-            $self->markJobDone();
+            $this->markJobDone();
 
             throw $e;
         });
@@ -261,16 +248,6 @@ class ProcessExecutor
             $this->io->writeError('Executing async command ('.($cwd ?: 'CWD').'): '.$safeCommand);
         }
 
-        // TODO in 2.2, these two checks can be dropped as Symfony 4+ supports them out of the box
-        // make sure that null translate to the proper directory in case the dir is a symlink
-        // and we call a git command, because msysgit does not handle symlinks properly
-        if (null === $cwd && Platform::isWindows() && false !== strpos($command, 'git') && getcwd()) {
-            $cwd = realpath(getcwd());
-        }
-        if (null !== $cwd && !is_dir($cwd)) {
-            throw new \RuntimeException('The given CWD for the process does not exist: '.$cwd);
-        }
-
         try {
             // TODO in v3, commands should be passed in as arrays of cmd + args
             if (method_exists('Symfony\Component\Process\Process', 'fromShellCommandline')) {
diff --git a/tests/Composer/Test/AllFunctionalTest.php b/tests/Composer/Test/AllFunctionalTest.php
index b693dc2c6..d1f6394e4 100644
--- a/tests/Composer/Test/AllFunctionalTest.php
+++ b/tests/Composer/Test/AllFunctionalTest.php
@@ -85,13 +85,7 @@ class AllFunctionalTest extends TestCase
             }
         }
 
-        // TODO in v2.3 always call with an array
-        if (method_exists('Symfony\Component\Process\Process', 'fromShellCommandline')) {
-            $proc = new Process(array((defined('PHP_BINARY') ? PHP_BINARY : 'php'), '-dphar.readonly=0', './bin/compile'), $target);
-        } else {
-            // @phpstan-ignore-next-line
-            $proc = new Process((defined('PHP_BINARY') ? escapeshellcmd(PHP_BINARY) : 'php').' -dphar.readonly=0 '.escapeshellarg('./bin/compile'), $target);
-        }
+        $proc = new Process([PHP_BINARY, '-dphar.readonly=0', './bin/compile'], $target);
         $exitcode = $proc->run();
 
         if ($exitcode !== 0 || trim($proc->getOutput())) {