Fix build

composer · Apr 13, 2022 · 72fa13d · 72fa13d
1 parent 75e5ef0
commit 72fa13d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 17 deletions.
diff --git a/tests/Composer/Installers/Test/BitrixInstallerTest.php b/tests/Composer/Installers/Test/BitrixInstallerTest.php
@@ -5,6 +5,7 @@
 use Composer\Installers\BitrixInstaller;
 use Composer\Package\Package;
 use Composer\Composer;
+use Composer\Package\RootPackage;
 
 /**
  * Tests for the BitrixInstaller Class
@@ -22,6 +23,7 @@ class BitrixInstallerTest extends TestCase
     public function setUp(): void
     {
         $this->composer = new Composer();
+        $this->composer->setPackage(new RootPackage('foo/bar', '1.0.0', '1.0.0'));
     }
 
     /**

diff --git a/tests/Composer/Installers/Test/CakePHPInstallerTest.php b/tests/Composer/Installers/Test/CakePHPInstallerTest.php
@@ -27,8 +27,7 @@ class CakePHPInstallerTest extends TestCase
     public function setUp(): void
     {
         $this->package = new Package('CamelCased', '1.0', '1.0');
-        $this->composer = new Composer();
-        $this->composer->setConfig(new Config(false));
+        $this->composer = $this->getComposer();
     }
 
     public function testInflectPackageVars(): void

diff --git a/tests/Composer/Installers/Test/InstallerTest.php b/tests/Composer/Installers/Test/InstallerTest.php
@@ -8,7 +8,6 @@
 use Composer\Package\Package;
 use Composer\Package\RootPackage;
 use Composer\Util\Filesystem;
-use Composer\Downloader\DownloadManager;
 use Composer\Repository\InstalledRepositoryInterface;
 use Composer\IO\IOInterface;
 
@@ -22,8 +21,6 @@ class InstallerTest extends TestCase
     private $vendorDir;
     /** @var string */
     private $binDir;
-    /** @var DownloadManager */
-    private $dm;
     /** @var InstalledRepositoryInterface */
     private $repository;
     /** @var IOInterface */
@@ -35,9 +32,8 @@ public function setUp(): void
     {
         $this->fs = new Filesystem;
 
-        $this->composer = new Composer();
-        $this->config = new Config();
-        $this->composer->setConfig($this->config);
+        $this->composer = $this->getComposer();
+        $this->config = $this->composer->getConfig();
 
         $this->vendorDir = realpath(sys_get_temp_dir()) . DIRECTORY_SEPARATOR . 'baton-test-vendor';
         $this->ensureDirectoryExistsAndClear($this->vendorDir);
@@ -52,16 +48,8 @@ public function setUp(): void
             ),
         ));
 
-        $this->dm = $this->getMockBuilder(DownloadManager::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->composer->setDownloadManager($this->dm);
-
         $this->repository = $this->getMockBuilder(InstalledRepositoryInterface::class)->getMock();
         $this->io = $this->getMockIO();
-
-        $consumerPackage = new RootPackage('foo/bar', '1.0.0', '1.0.0');
-        $this->composer->setPackage($consumerPackage);
     }
 
     public function tearDown(): void
@@ -564,10 +552,11 @@ public function testUninstallAndDeletePackageFromLocalRepo(): void
         $package = new Package('foo', '1.0.0', '1.0.0');
 
         $installer = $this->getMockBuilder(Installer::class)
-            ->setMethods(array('getInstallPath'))
+            ->setMethods(array('getInstallPath', 'removeCode'))
             ->setConstructorArgs(array($this->io, $this->composer))
             ->getMock();
         $installer->expects($this->atLeastOnce())->method('getInstallPath')->with($package)->will($this->returnValue(sys_get_temp_dir().'/foo'));
+        $installer->expects($this->atLeastOnce())->method('removeCode')->with($package)->will($this->returnValue(null));
 
         $repo = $this->getMockBuilder(InstalledRepositoryInterface::class)->getMock();
         $repo->expects($this->once())->method('hasPackage')->with($package)->will($this->returnValue(true));

diff --git a/tests/Composer/Installers/Test/TestCase.php b/tests/Composer/Installers/Test/TestCase.php
@@ -13,6 +13,7 @@
 namespace Composer\Installers\Test;
 
 use Composer\Composer;
+use Composer\Config;
 use Composer\IO\IOInterface;
 use Composer\IO\NullIO;
 use Composer\Package\Version\VersionParser;
@@ -21,6 +22,9 @@
 use Composer\Package\RootPackage;
 use Composer\Semver\Constraint\Constraint;
 use Composer\Util\Filesystem;
+use Composer\Installer\InstallationManager;
+use Composer\Repository\RepositoryManager;
+use Composer\Downloader\DownloadManager;
 
 abstract class TestCase extends \PHPUnit\Framework\TestCase
 {
@@ -75,6 +79,23 @@ protected function getComposer(): Composer
         $composer = new Composer;
         $composer->setPackage($pkg = new RootPackage('root/pkg', '1.0.0.0', '1.0.0'));
 
+        $composer->setConfig(new Config(false));
+
+        $dm = $this->getMockBuilder(DownloadManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $composer->setDownloadManager($dm);
+
+        $im = $this->getMockBuilder(InstallationManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $composer->setInstallationManager($im);
+
+        $rm = $this->getMockBuilder(RepositoryManager::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $composer->setRepositoryManager($rm);
+
         return $composer;
     }