From 1105b7dfeaa278af4d31d47e6a600e2d9a49e9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20FIDRY?= <5175937+theofidry@users.noreply.github.com> Date: Wed, 18 Oct 2023 00:43:31 +0200 Subject: [PATCH] test: Fix the CI (#1086) --- .../fixtures/fail-complete/expected-boxmin-stderr.dist | 3 +-- .../fixtures/fail-complete/expected-composermin-stderr.dist | 3 +-- .../fixtures/fail-conflict/expected-boxmin-stderr.dist | 3 +-- .../fixtures/pass-complete/expected-boxmin-stderr.dist | 3 +-- .../fixtures/pass-complete/expected-composermin-stderr.dist | 3 +-- .../fixtures/pass-no-config/expected-boxmin-stderr.dist | 3 +-- .../fixtures/pass-no-config/expected-composermin-stderr.dist | 3 +-- src/Composer/ComposerOrchestrator.php | 2 +- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/requirement-checker/fixtures/fail-complete/expected-boxmin-stderr.dist b/requirement-checker/fixtures/fail-complete/expected-boxmin-stderr.dist index 363a2e7b7..fe4c3e9df 100644 --- a/requirement-checker/fixtures/fail-complete/expected-boxmin-stderr.dist +++ b/requirement-checker/fixtures/fail-complete/expected-boxmin-stderr.dist @@ -3,8 +3,7 @@ Box Requirements Checker ======================== > Using PHP PHP_VERSION -> PHP is using the following php.ini file: - WARNING: No configuration file (php.ini) used by PHP! +> PHP is not using any php.ini file. > Checking Box requirements: ✘ The application requires a version matching "^10". diff --git a/requirement-checker/fixtures/fail-complete/expected-composermin-stderr.dist b/requirement-checker/fixtures/fail-complete/expected-composermin-stderr.dist index 4aaf2886d..93f698f50 100644 --- a/requirement-checker/fixtures/fail-complete/expected-composermin-stderr.dist +++ b/requirement-checker/fixtures/fail-complete/expected-composermin-stderr.dist @@ -3,8 +3,7 @@ Box Requirements Checker ======================== > Using PHP PHP_VERSION -> PHP is using the following php.ini file: - WARNING: No configuration file (php.ini) used by PHP! +> PHP is not using any php.ini file. > Checking Box requirements: ✘ The application requires a version matching "^10". diff --git a/requirement-checker/fixtures/fail-conflict/expected-boxmin-stderr.dist b/requirement-checker/fixtures/fail-conflict/expected-boxmin-stderr.dist index 20565ba4b..5977bdcf8 100644 --- a/requirement-checker/fixtures/fail-conflict/expected-boxmin-stderr.dist +++ b/requirement-checker/fixtures/fail-conflict/expected-boxmin-stderr.dist @@ -3,8 +3,7 @@ Box Requirements Checker ======================== > Using PHP PHP_VERSION -> PHP is using the following php.ini file: - WARNING: No configuration file (php.ini) used by PHP! +> PHP is not using any php.ini file. > Checking Box requirements: ✔ The application requires the extension "phar". diff --git a/requirement-checker/fixtures/pass-complete/expected-boxmin-stderr.dist b/requirement-checker/fixtures/pass-complete/expected-boxmin-stderr.dist index 21899bfd7..0d9258c06 100644 --- a/requirement-checker/fixtures/pass-complete/expected-boxmin-stderr.dist +++ b/requirement-checker/fixtures/pass-complete/expected-boxmin-stderr.dist @@ -3,8 +3,7 @@ Box Requirements Checker ======================== > Using PHP PHP_VERSION -> PHP is using the following php.ini file: - WARNING: No configuration file (php.ini) used by PHP! +> PHP is not using any php.ini file. > Checking Box requirements: ✔ The application requires a version matching ">=5.3". diff --git a/requirement-checker/fixtures/pass-complete/expected-composermin-stderr.dist b/requirement-checker/fixtures/pass-complete/expected-composermin-stderr.dist index 21899bfd7..0d9258c06 100644 --- a/requirement-checker/fixtures/pass-complete/expected-composermin-stderr.dist +++ b/requirement-checker/fixtures/pass-complete/expected-composermin-stderr.dist @@ -3,8 +3,7 @@ Box Requirements Checker ======================== > Using PHP PHP_VERSION -> PHP is using the following php.ini file: - WARNING: No configuration file (php.ini) used by PHP! +> PHP is not using any php.ini file. > Checking Box requirements: ✔ The application requires a version matching ">=5.3". diff --git a/requirement-checker/fixtures/pass-no-config/expected-boxmin-stderr.dist b/requirement-checker/fixtures/pass-no-config/expected-boxmin-stderr.dist index febda8c75..d80ef4fd5 100644 --- a/requirement-checker/fixtures/pass-no-config/expected-boxmin-stderr.dist +++ b/requirement-checker/fixtures/pass-no-config/expected-boxmin-stderr.dist @@ -3,8 +3,7 @@ Box Requirements Checker ======================== > Using PHP PHP_VERSION -> PHP is using the following php.ini file: - WARNING: No configuration file (php.ini) used by PHP! +> PHP is not using any php.ini file. > No requirements found. diff --git a/requirement-checker/fixtures/pass-no-config/expected-composermin-stderr.dist b/requirement-checker/fixtures/pass-no-config/expected-composermin-stderr.dist index febda8c75..d80ef4fd5 100644 --- a/requirement-checker/fixtures/pass-no-config/expected-composermin-stderr.dist +++ b/requirement-checker/fixtures/pass-no-config/expected-composermin-stderr.dist @@ -3,8 +3,7 @@ Box Requirements Checker ======================== > Using PHP PHP_VERSION -> PHP is using the following php.ini file: - WARNING: No configuration file (php.ini) used by PHP! +> PHP is not using any php.ini file. > No requirements found. diff --git a/src/Composer/ComposerOrchestrator.php b/src/Composer/ComposerOrchestrator.php index cb7669318..36677bcbc 100644 --- a/src/Composer/ComposerOrchestrator.php +++ b/src/Composer/ComposerOrchestrator.php @@ -135,7 +135,7 @@ public function getVendorDir(): string $this->logger->info($vendorDirProcess->getCommandLine()); - $vendorDirProcess->run(env: $this->processFactory->getDefaultEnvVars()); + $vendorDirProcess->run(); if (false === $vendorDirProcess->isSuccessful()) { throw new RuntimeException(