[4.x] Fix missing composer binary (starter kits couldn't install) (#9950

) Co-authored-by: Jason Varga <jason@pixelfear.com>
statamic · Apr 23, 2024 · 08e3c55 · 08e3c55
1 parent e9e84bb
commit 08e3c55
Show file tree

Hide file tree

Showing 11 changed files with 62 additions and 9 deletions.
diff --git a/src/Console/Processes/Composer.php b/src/Console/Processes/Composer.php
@@ -302,11 +302,19 @@ private function prepareProcessArguments($parts)
         return array_merge([
             $this->phpBinary(),
             "-d memory_limit={$this->memoryLimit}",
-            'vendor/bin/composer',
+            $this->composerBinary(),
             $this->colorized ? '--ansi' : '--no-ansi',
         ], $parts);
     }
 
+    /**
+     * Absolute path to the Composer binary.
+     */
+    private function composerBinary(): string
+    {
+        return $this->run(DIRECTORY_SEPARATOR === '\\' ? 'where composer' : 'which composer');
+    }
+
     /**
      * Sometimes composer returns versions with a 'v', sometimes it doesn't.
      *

diff --git a/tests/Console/Commands/Concerns/BacksUpComposerJson.php b/tests/Console/Commands/Concerns/BacksUpComposerJson.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Tests\Console\Commands\Concerns;
+
+use Illuminate\Filesystem\Filesystem;
+
+trait BacksUpComposerJson
+{
+    protected function backupComposerJson()
+    {
+        app(Filesystem::class)->copy(base_path('composer.json'), base_path('composer.json.bak'));
+    }
+
+    protected function restoreComposerJson()
+    {
+        $files = app(Filesystem::class);
+        $files->copy(base_path('composer.json.bak'), base_path('composer.json'));
+        $files->delete(base_path('composer.json.bak'));
+    }
+}
diff --git a/tests/Console/Commands/Concerns/CleansUpGeneratedPaths.php b/tests/Console/Commands/Concerns/CleansUpGeneratedPaths.php
@@ -17,6 +17,7 @@ protected function cleanupPaths()
             base_path('app/Tags'),
             base_path('app/Widgets'),
             resource_path('js/components'),
+            base_path('vendor'),
         ];
 
         foreach ($dirs as $dir) {

diff --git a/tests/Console/Commands/MakeActionTest.php b/tests/Console/Commands/MakeActionTest.php
@@ -8,7 +8,8 @@
 
 class MakeActionTest extends TestCase
 {
-    use Concerns\CleansUpGeneratedPaths;
+    use Concerns\BacksUpComposerJson,
+        Concerns\CleansUpGeneratedPaths;
 
     private $files;
 
@@ -17,11 +18,13 @@ public function setUp(): void
         parent::setUp();
 
         $this->files = app(Filesystem::class);
+        $this->backupComposerJson();
     }
 
     public function tearDown(): void
     {
         $this->cleanupPaths();
+        $this->restoreComposerJson();
 
         parent::tearDown();
     }

diff --git a/tests/Console/Commands/MakeAddonTest.php b/tests/Console/Commands/MakeAddonTest.php
@@ -8,7 +8,8 @@
 
 class MakeAddonTest extends TestCase
 {
-    use Concerns\CleansUpGeneratedPaths;
+    use Concerns\BacksUpComposerJson,
+        Concerns\CleansUpGeneratedPaths;
 
     private $files;
 
@@ -19,11 +20,13 @@ public function setUp(): void
         $this->markTestSkippedInWindows();
 
         $this->files = app(Filesystem::class);
+        $this->backupComposerJson();
     }
 
     public function tearDown(): void
     {
         $this->cleanupPaths();
+        $this->restoreComposerJson();
 
         parent::tearDown();
     }

diff --git a/tests/Console/Commands/MakeFieldtypeTest.php b/tests/Console/Commands/MakeFieldtypeTest.php
@@ -8,7 +8,8 @@
 
 class MakeFieldtypeTest extends TestCase
 {
-    use Concerns\CleansUpGeneratedPaths;
+    use Concerns\BacksUpComposerJson,
+        Concerns\CleansUpGeneratedPaths;
 
     private $files;
 
@@ -17,11 +18,13 @@ public function setUp(): void
         parent::setUp();
 
         $this->files = app(Filesystem::class);
+        $this->backupComposerJson();
     }
 
     public function tearDown(): void
     {
         $this->cleanupPaths();
+        $this->restoreComposerJson();
 
         parent::tearDown();
     }

diff --git a/tests/Console/Commands/MakeFilterTest.php b/tests/Console/Commands/MakeFilterTest.php
@@ -8,7 +8,8 @@
 
 class MakeFilterTest extends TestCase
 {
-    use Concerns\CleansUpGeneratedPaths;
+    use Concerns\BacksUpComposerJson,
+        Concerns\CleansUpGeneratedPaths;
 
     private $files;
 
@@ -17,11 +18,13 @@ public function setUp(): void
         parent::setUp();
 
         $this->files = app(Filesystem::class);
+        $this->backupComposerJson();
     }
 
     public function tearDown(): void
     {
         $this->cleanupPaths();
+        $this->restoreComposerJson();
 
         parent::tearDown();
     }

diff --git a/tests/Console/Commands/MakeModifierTest.php b/tests/Console/Commands/MakeModifierTest.php
@@ -8,7 +8,8 @@
 
 class MakeModifierTest extends TestCase
 {
-    use Concerns\CleansUpGeneratedPaths;
+    use Concerns\BacksUpComposerJson,
+        Concerns\CleansUpGeneratedPaths;
 
     private $files;
 
@@ -17,11 +18,13 @@ public function setUp(): void
         parent::setUp();
 
         $this->files = app(Filesystem::class);
+        $this->backupComposerJson();
     }
 
     public function tearDown(): void
     {
         $this->cleanupPaths();
+        $this->restoreComposerJson();
 
         parent::tearDown();
     }

diff --git a/tests/Console/Commands/MakeScopeTest.php b/tests/Console/Commands/MakeScopeTest.php
@@ -8,7 +8,8 @@
 
 class MakeScopeTest extends TestCase
 {
-    use Concerns\CleansUpGeneratedPaths;
+    use Concerns\BacksUpComposerJson,
+        Concerns\CleansUpGeneratedPaths;
 
     private $files;
 
@@ -17,11 +18,13 @@ public function setUp(): void
         parent::setUp();
 
         $this->files = app(Filesystem::class);
+        $this->backupComposerJson();
     }
 
     public function tearDown(): void
     {
         $this->cleanupPaths();
+        $this->restoreComposerJson();
 
         parent::tearDown();
     }

diff --git a/tests/Console/Commands/MakeTagTest.php b/tests/Console/Commands/MakeTagTest.php
@@ -8,7 +8,8 @@
 
 class MakeTagTest extends TestCase
 {
-    use Concerns\CleansUpGeneratedPaths;
+    use Concerns\BacksUpComposerJson,
+        Concerns\CleansUpGeneratedPaths;
 
     private $files;
 
@@ -17,11 +18,13 @@ public function setUp(): void
         parent::setUp();
 
         $this->files = app(Filesystem::class);
+        $this->backupComposerJson();
     }
 
     public function tearDown(): void
     {
         $this->cleanupPaths();
+        $this->restoreComposerJson();
 
         parent::tearDown();
     }

diff --git a/tests/Console/Commands/MakeWidgetTest.php b/tests/Console/Commands/MakeWidgetTest.php
@@ -8,7 +8,8 @@
 
 class MakeWidgetTest extends TestCase
 {
-    use Concerns\CleansUpGeneratedPaths;
+    use Concerns\BacksUpComposerJson,
+        Concerns\CleansUpGeneratedPaths;
 
     private $files;
 
@@ -17,11 +18,13 @@ public function setUp(): void
         parent::setUp();
 
         $this->files = app(Filesystem::class);
+        $this->backupComposerJson();
     }
 
     public function tearDown(): void
     {
         $this->cleanupPaths();
+        $this->restoreComposerJson();
 
         parent::tearDown();
     }