refactor: reuse self-update version resolver for app metadata

Author: coisa

src/Console/DevTools.php

@@ -26,8 +26,8 @@
 use FastForward\DevTools\SelfUpdate\SelfUpdateRunnerInterface;
 use FastForward\DevTools\SelfUpdate\SelfUpdateScopeResolverInterface;
 use FastForward\DevTools\SelfUpdate\VersionCheckNotifierInterface;
+use FastForward\DevTools\SelfUpdate\VersionCheckerInterface;
 use FastForward\DevTools\SelfUpdate\WorkingDirectorySwitcherInterface;
-use Composer\InstalledVersions;
 use Override;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
@@ -46,8 +46,6 @@
  */
 final class DevTools extends Application
 {
-    private const string PACKAGE = 'fast-forward/dev-tools';
-
     private const string VERSION_UNKNOWN = '0.0.0';
 
     private const string LOGO = <<<'LOGO'
@@ -78,6 +76,7 @@ final class DevTools extends Application
      * @param VersionCheckNotifierInterface $versionCheckNotifier emits non-blocking version freshness warnings
      * @param SelfUpdateRunnerInterface $selfUpdateRunner runs explicit or automatic self-update flows
      * @param SelfUpdateScopeResolverInterface $selfUpdateScopeResolver resolves whether the active binary is global
+     * @param VersionCheckerInterface $versionChecker resolves the installed DevTools version for metadata output
      * @param EnvironmentInterface $environment reads environment flags for optional auto-update behavior
      * @param RuntimeEnvironmentInterface $runtimeEnvironment resolves runtime environment capabilities
      */
@@ -87,6 +86,7 @@ public function __construct(
         private readonly VersionCheckNotifierInterface $versionCheckNotifier,
         private readonly SelfUpdateRunnerInterface $selfUpdateRunner,
         private readonly SelfUpdateScopeResolverInterface $selfUpdateScopeResolver,
+        private readonly VersionCheckerInterface $versionChecker,
         private readonly EnvironmentInterface $environment,
         private readonly RuntimeEnvironmentInterface $runtimeEnvironment,
     ) {
@@ -103,9 +103,7 @@ public function __construct(
      */
     private function resolveVersion(): string
     {
-        return InstalledVersions::getPrettyVersion(self::PACKAGE)
-            ?? InstalledVersions::getVersion(self::PACKAGE)
-            ?? self::VERSION_UNKNOWN;
+        return $this->versionChecker->resolveCurrentVersion() ?? self::VERSION_UNKNOWN;
     }
 
     /**

src/SelfUpdate/ComposerVersionChecker.php

@@ -52,8 +52,7 @@ public function check(): ?VersionCheckResult
             return null;
         }
 
-        $currentVersion = InstalledVersions::getPrettyVersion(self::PACKAGE)
-            ?? InstalledVersions::getVersion(self::PACKAGE);
+        $currentVersion = $this->resolveCurrentVersion();
 
         if (null === $currentVersion) {
             return null;
@@ -68,6 +67,15 @@ public function check(): ?VersionCheckResult
         return new VersionCheckResult($currentVersion, $latestVersion);
     }
 
+    /**
+     * Returns the installed DevTools version without running external Composer commands.
+     */
+    public function resolveCurrentVersion(): ?string
+    {
+        return InstalledVersions::getPrettyVersion(self::PACKAGE)
+            ?? InstalledVersions::getVersion(self::PACKAGE);
+    }
+
     /**
      * Resolves the latest stable DevTools version available to Composer.
      */

src/SelfUpdate/VersionCheckerInterface.php

@@ -28,4 +28,11 @@ interface VersionCheckerInterface
      * Returns version information when it can be resolved without blocking command execution.
      */
     public function check(): ?VersionCheckResult;
+
+    /**
+     * Returns the currently installed DevTools version when available.
+     *
+     * @return string|null the version string for display and fallback logic
+     */
+    public function resolveCurrentVersion(): ?string;
 }

tests/Console/DevToolsTest.php

@@ -44,6 +44,7 @@
 use FastForward\DevTools\SelfUpdate\ComposerVersionChecker;
 use FastForward\DevTools\SelfUpdate\SelfUpdateRunnerInterface;
 use FastForward\DevTools\SelfUpdate\SelfUpdateScopeResolverInterface;
+use FastForward\DevTools\SelfUpdate\VersionCheckerInterface;
 use FastForward\DevTools\SelfUpdate\VersionCheckNotifier;
 use FastForward\DevTools\SelfUpdate\VersionCheckNotifierInterface;
 use FastForward\DevTools\SelfUpdate\WorkingDirectorySwitcher;
@@ -124,6 +125,11 @@ final class DevToolsTest extends TestCase
      */
     private ObjectProphecy $selfUpdateScopeResolver;
 
+    /**
+     * @var ObjectProphecy<VersionCheckerInterface>
+     */
+    private ObjectProphecy $versionChecker;
+
     /**
      * @var ObjectProphecy<EnvironmentInterface>
      */
@@ -154,8 +160,11 @@ protected function setUp(): void
         $this->versionCheckNotifier = $this->prophesize(VersionCheckNotifierInterface::class);
         $this->selfUpdateRunner = $this->prophesize(SelfUpdateRunnerInterface::class);
         $this->selfUpdateScopeResolver = $this->prophesize(SelfUpdateScopeResolverInterface::class);
+        $this->versionChecker = $this->prophesize(VersionCheckerInterface::class);
         $this->environment = $this->prophesize(EnvironmentInterface::class);
         $this->runtimeEnvironment = $this->prophesize(RuntimeEnvironmentInterface::class);
+        $this->versionChecker->resolveCurrentVersion()
+            ->willReturn('1.2.3');
         $this->runtimeEnvironment->isAgentPresent()
             ->willReturn(false);
         $this->originalWorkspaceDirectoryEnv = getenv(ManagedWorkspace::ENV_WORKSPACE_DIR);
@@ -214,7 +223,7 @@ public function __construct()
             ->willReturn($customCommand);
 
         self::assertSame('Fast Forward Dev Tools', $this->devTools->getName());
-        self::assertMatchesRegularExpression('/\\S+/', $this->devTools->getVersion());
+        self::assertSame('1.2.3', $this->devTools->getVersion());
         self::assertTrue($this->devTools->has('custom'));
         self::assertSame($customCommand, $this->devTools->get('custom'));
     }
@@ -594,6 +603,7 @@ private function createDevTools(): DevTools
             $this->versionCheckNotifier->reveal(),
             $this->selfUpdateRunner->reveal(),
             $this->selfUpdateScopeResolver->reveal(),
+            $this->versionChecker->reveal(),
             $this->environment->reveal(),
             $this->runtimeEnvironment->reveal(),
         );