From 508ac051eced468dc3a37a9da5e54351bcb1d8f4 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 7 Jan 2022 09:26:22 +0100 Subject: [PATCH] Revert "Remove getCode usage as it is not type safe apparently, see https://github.com/phpstan/phpstan-src/pull/795" This reverts commit 84f8fda0c6e75dbaa19b4333e1956ff8c2c09b8f. And other issues fixed by PHPStan 1.3.2 --- src/Composer/Console/Application.php | 2 +- .../DependencyResolver/SolverProblemsException.php | 8 -------- src/Composer/Installer.php | 6 +++--- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/Composer/Console/Application.php b/src/Composer/Console/Application.php index b5af14af8..e7c3a32a5 100644 --- a/src/Composer/Console/Application.php +++ b/src/Composer/Console/Application.php @@ -348,7 +348,7 @@ class Application extends BaseApplication return $result; } catch (ScriptExecutionException $e) { - return (int) $e->getCode(); + return $e->getCode(); } catch (\Exception $e) { $ghe = new GithubActionError($this->io); $ghe->emit($e->getMessage()); diff --git a/src/Composer/DependencyResolver/SolverProblemsException.php b/src/Composer/DependencyResolver/SolverProblemsException.php index 27deac4b3..128fbe146 100644 --- a/src/Composer/DependencyResolver/SolverProblemsException.php +++ b/src/Composer/DependencyResolver/SolverProblemsException.php @@ -39,14 +39,6 @@ class SolverProblemsException extends \RuntimeException parent::__construct('Failed resolving dependencies with '.count($problems).' problems, call getPrettyString to get formatted details', self::ERROR_DEPENDENCY_RESOLUTION_FAILED); } - /** - * @return self::ERROR_DEPENDENCY_RESOLUTION_FAILED - */ - public function getExitCode() - { - return self::ERROR_DEPENDENCY_RESOLUTION_FAILED; - } - /** * @param bool $isVerbose * @param bool $isDevExtraction diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index 78329042d..c78dc8fd7 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -455,7 +455,7 @@ class Installer $ghe = new GithubActionError($this->io); $ghe->emit($err."\n".$prettyProblem); - return max(self::ERROR_GENERIC_FAILURE, $e->getExitCode()); + return max(self::ERROR_GENERIC_FAILURE, $e->getCode()); } $this->io->writeError("Analyzed ".count($pool)." packages to resolve dependencies", true, IOInterface::VERBOSE); @@ -633,7 +633,7 @@ class Installer $ghe = new GithubActionError($this->io); $ghe->emit($err."\n".$prettyProblem); - return max(self::ERROR_GENERIC_FAILURE, $e->getExitCode()); + return max(self::ERROR_GENERIC_FAILURE, $e->getCode()); } $lockTransaction->setNonDevPackages($nonDevLockTransaction); @@ -703,7 +703,7 @@ class Installer $ghe = new GithubActionError($this->io); $ghe->emit($err."\n".$prettyProblem); - return max(self::ERROR_GENERIC_FAILURE, $e->getExitCode()); + return max(self::ERROR_GENERIC_FAILURE, $e->getCode()); } }