Merge pull request #492 from Roave/dependabot/composer/composer/compo…

…ser-2.3.2 Bump composer/composer from 2.2.10 to 2.3.2
Roave · Mar 31, 2022 · b65c095 · b65c095
2 parents 9062968 + 6462a1f
commit b65c095
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 38 deletions.
diff --git a/bin/roave-backward-compatibility-check.php b/bin/roave-backward-compatibility-check.php
@@ -4,10 +4,12 @@
 
 namespace Roave\ApiCompareCli;
 
+use Composer\Composer;
 use Composer\Factory;
 use Composer\Installer;
 use Composer\IO\ConsoleIO;
 use PackageVersions\Versions;
+use Psl\Type;
 use Roave\BackwardCompatibility\Command;
 use Roave\BackwardCompatibility\CompareClasses;
 use Roave\BackwardCompatibility\DetectChanges\BCBreak\ClassBased;
@@ -69,12 +71,15 @@
             static function (string $installationPath) use ($composerIo): Installer {
                 return Installer::create(
                     $composerIo,
-                    (new Factory())->createComposer(
-                        $composerIo,
-                        null,
-                        true,
-                        $installationPath
-                    )
+                    Type\object(Composer::class)
+                        ->assert(
+                            (new Factory())->createComposer(
+                                $composerIo,
+                                null,
+                                true,
+                                $installationPath
+                            )
+                        )
                 );
             },
             $astLocator

diff --git a/composer.json b/composer.json
@@ -5,7 +5,7 @@
         "php": "~8.0.0 || ~8.1.0",
         "ext-json": "*",
         "azjezz/psl": "^1.9.3",
-        "composer/composer": "^2.2.10",
+        "composer/composer": "^2.3.2",
         "nikolaposa/version": "^4.1.0",
         "ocramius/package-versions": "^2.5.1",
         "roave/better-reflection": "^5.3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/test/unit/LocateDependencies/LocateDependenciesViaComposerTest.php b/test/unit/LocateDependencies/LocateDependenciesViaComposerTest.php
@@ -99,8 +99,10 @@ public function testWillLocateDependencies(): void
             ->composerInstaller
             ->expects(self::once())
             ->method('run')
-            ->willReturnCallback(function (): void {
+            ->willReturnCallback(function (): int {
                 self::assertSame($this->expectedInstallationPath, Env\current_dir());
+
+                return 0;
             });
 
         $locator = ($this->locateDependencies)($this->expectedInstallationPath, false);
@@ -162,8 +164,10 @@ public function testDevelopmentDependenciesCanBeOptionallyInstalled(): void
             ->composerInstaller
             ->expects(self::once())
             ->method('run')
-            ->willReturnCallback(function (): void {
+            ->willReturnCallback(function (): int {
                 self::assertSame($this->expectedInstallationPath, Env\current_dir());
+
+                return 0;
             });
 
         $locator = ($this->locateDependencies)($this->expectedInstallationPath, true);