Show package source in very verbose updates, fixes composer#11733 (co…

…mposer#11763)
theoboldalex · Jan 10, 2024 · a2e84f0 · a2e84f0
1 parent 97bca7c
commit a2e84f0
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 2 deletions.
diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php
@@ -605,7 +605,14 @@ protected function doUpdate(InstalledRepositoryInterface $localRepo, bool $doIns
 
             // output op if lock file is enabled, but alias op only in debug verbosity
             if ($this->config->get('lock') && (false === strpos($operation->getOperationType(), 'Alias') || $this->io->isDebug())) {
-                $this->io->writeError('  - ' . $operation->show(true));
+                $sourceRepo = '';
+                if ($this->io->isVeryVerbose() && false === strpos($operation->getOperationType(), 'Alias')) {
+                    $operationPkg = ($operation instanceof UpdateOperation ? $operation->getTargetPackage() : $operation->getPackage());
+                    if ($operationPkg->getRepository() !== null) {
+                        $sourceRepo = ' from ' . $operationPkg->getRepository()->getRepoName();
+                    }
+                }
+                $this->io->writeError('  - ' . $operation->show(true) . $sourceRepo);
             }
         }
 

diff --git a/tests/Composer/Test/Command/UpdateCommandTest.php b/tests/Composer/Test/Command/UpdateCommandTest.php
@@ -29,7 +29,7 @@ public function testUpdate(array $composerJson, array $command, string $expected
         $appTester = $this->getApplicationTester();
         $appTester->run(array_merge(['command' => 'update', '--dry-run' => true, '--no-audit' => true], $command));
 
-        $this->assertSame(trim($expected), trim($appTester->getDisplay(true)));
+        $this->assertStringMatchesFormat(trim($expected), trim($appTester->getDisplay(true)));
     }
 
     public static function provideUpdates(): \Generator
@@ -67,6 +67,29 @@ public static function provideUpdates(): \Generator
 OUTPUT
         ];
 
+        yield 'simple update with very verbose output' => [
+            $rootDepAndTransitiveDep,
+            ['-vv' => true],
+            <<<OUTPUT
+Loading composer repositories with package information
+Pool optimizer completed in %f seconds
+Found %d package versions referenced in your dependency graph. %d (%d%%) were optimized away.
+Updating dependencies
+Dependency resolution completed in %f seconds
+Analyzed %d packages to resolve dependencies
+Analyzed %d rules to resolve dependencies
+Lock file operations: 2 installs, 0 updates, 0 removals
+Installs: dep/pkg:1.0.2, root/req:1.0.0
+  - Locking dep/pkg (1.0.2) from package repo (defining 4 packages)
+  - Locking root/req (1.0.0) from package repo (defining 4 packages)
+Installing dependencies from lock file (including require-dev)
+Package operations: 2 installs, 0 updates, 0 removals
+Installs: dep/pkg:1.0.2, root/req:1.0.0
+  - Installing dep/pkg (1.0.2)
+  - Installing root/req (1.0.0)
+OUTPUT
+        ];
+
         yield 'update with temporary constraint + --no-install' => [
             $rootDepAndTransitiveDep,
             ['--with' => ['dep/pkg:1.0.0'], '--no-install' => true],