Merge remote-tracking branch 'upstream/main' into feat/composer-cmd

box-project · Oct 17, 2023 · b4b017e · b4b017e
2 parents 09bcc05 + c4a7823
commit b4b017e
Show file tree

Hide file tree

Showing 9 changed files with 40 additions and 27 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -138,7 +138,7 @@ public function dumpAutoload(
             return;
         }
 
-        $autoloadFile = $this->retrieveAutoloadFile();
+        $autoloadFile = $this->getVendorDir().'/autoload.php';
 
         $autoloadContents = AutoloadDumper::generateAutoloadStatements(
             $symbolsRegistry,
@@ -148,6 +148,25 @@ public function dumpAutoload(
         $this->fileSystem->dumpFile($autoloadFile, $autoloadContents);
     }
 
+    public function getVendorDir(): string
+    {
+        $vendorDirProcess = $this->processFactory->getVendorDirProcess();
+
+        $this->logger->info($vendorDirProcess->getCommandLine());
+
+        $vendorDirProcess->run();
+
+        if (false === $vendorDirProcess->isSuccessful()) {
+            throw new RuntimeException(
+                'Could not retrieve the vendor dir.',
+                0,
+                new ProcessFailedException($vendorDirProcess),
+            );
+        }
+
+        return trim($vendorDirProcess->getOutput());
+    }
+
     private function dumpAutoloader(bool $noDev): void
     {
         $dumpAutoloadProcess = $this->processFactory->getDumpAutoloaderProcess($noDev);
@@ -181,9 +200,4 @@ private function dumpAutoloader(bool $noDev): void
             );
         }
     }
-
-    private function retrieveAutoloadFile(): string
-    {
-        return $this->getVendorDir().'/autoload.php';
-    }
 }
diff --git a/src/Composer/ComposerProcessFactory.php b/src/Composer/ComposerProcessFactory.php
@@ -49,11 +49,11 @@ public function __construct(
 
     public function getVersionProcess(): Process
     {
-        // Never use ANSI support here as we want to parse the raw output.
         return $this->createProcess(
             [
                 $this->composerExecutable,
                 '--version',
+                // Never use ANSI support here as we want to parse the raw output.
                 '--no-ansi',
             ],
             // Ensure that even if this command gets executed within the app with --quiet it still
@@ -83,12 +83,18 @@ public function getDumpAutoloaderProcess(bool $noDev): Process
 
     public function getVendorDirProcess(): Process
     {
-        return $this->createProcess([
-            $this->composerExecutable,
-            'config',
-            'vendor-dir',
-            '--no-ansi',
-        ]);
+        return $this->createProcess(
+            [
+                $this->composerExecutable,
+                'config',
+                'vendor-dir',
+                // Never use ANSI support here as we want to parse the raw output.
+                '--no-ansi',
+            ],
+            // Ensure that even if this command gets executed within the app with --quiet it still
+            // works.
+            ['SHELL_VERBOSITY' => 0],
+        );
     }
 
     private function createProcess(array $command, array $environmentVariables = []): Process