FIX use composer runtime api

composer.json

@@ -23,6 +23,7 @@
     ],
     "require": {
         "php": "^8.1",
+        "composer-runtime-api": "^2.2",
         "composer/installers": "^2.2",
         "guzzlehttp/guzzle": "^7.5.0",
         "guzzlehttp/psr7": "^2.4.0",

src/Core/Manifest/VersionProvider.php

@@ -8,6 +8,7 @@
 use SilverStripe\Core\Config\Configurable;
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Dev\Deprecation;
 
 /**
  * The version provider will look up configured modules and examine the composer.lock file
@@ -30,7 +31,7 @@ class VersionProvider
     use Injectable;
 
     /**
-     * @var array
+     * @var array<string,string>
      */
     private static $modules = [
         'silverstripe/framework' => 'Framework',
@@ -50,10 +51,10 @@ public function getVersion()
             return $version;
         }
         $modules = $this->getModules();
-        $lockModules = $this->getModuleVersionFromComposer(array_keys($modules ?? []));
+        $lockModules = $this->getModuleVersionFromComposer(array_keys($modules));
         $moduleVersions = [];
         foreach ($modules as $module => $title) {
-            if (!array_key_exists($module, $lockModules ?? [])) {
+            if (!array_key_exists($module, $lockModules)) {
                 continue;
             }
             $version = $lockModules[$module];
@@ -145,14 +146,14 @@ private function setCacheValue(string $key, string $value): void
      *   cwp/cwp-core => ['CWP', '4.4.4']
      * ]
      *
-     * @param array $modules
-     * @return array
+     * @param array<string,mixed> $modules
+     * @return array<string,mixed>
      */
     private function filterModules(array $modules)
     {
         $accountModule = [];
         foreach ($modules as $module => $value) {
-            if (!preg_match('#^([a-z0-9\-]+)/([a-z0-9\-]+)$#', $module ?? '', $m)) {
+            if (!preg_match('#^([a-z0-9\-]+)/([a-z0-9\-]+)$#', $module, $m)) {
                 continue;
             }
             $account = $m[1];
@@ -169,7 +170,7 @@ private function filterModules(array $modules)
     /**
      * Gets the configured core modules to use for the SilverStripe application version
      *
-     * @return array
+     * @return array<string,string>
      */
     public function getModules()
     {
@@ -180,55 +181,55 @@ public function getModules()
     /**
      * Tries to obtain version number from composer.lock if it exists
      *
-     * @param array $modules
-     * @return array
+     * @param array<string> $modules
+     * @return array<string|string>
      */
     public function getModuleVersionFromComposer($modules = [])
     {
         $versions = [];
-        $lockData = $this->getComposerLock();
-        if ($lockData && !empty($lockData['packages'])) {
-            foreach ($lockData['packages'] as $package) {
-                if (in_array($package['name'], $modules ?? []) && isset($package['version'])) {
-                    $versions[$package['name']] = $package['version'];
-                }
-            }
+        foreach ($modules as $module) {
+            $versions[$module] = \Composer\InstalledVersions::getPrettyVersion($module);
         }
         return $versions;
     }
 
     /**
      * Load composer.lock's contents and return it
      *
+     * @deprecated 5.1 Has been replaced by composer-runtime-api
      * @param bool $cache
      * @return array
      */
     protected function getComposerLock($cache = true)
     {
+        Deprecation::notice("5.1", "Has been replaced by composer-runtime-api", Deprecation::SCOPE_METHOD);
         $composerLockPath = $this->getComposerLockPath();
-        if (!file_exists($composerLockPath ?? '')) {
+        if (!file_exists($composerLockPath)) {
             return [];
         }
 
         $lockData = [];
-        $jsonData = file_get_contents($composerLockPath ?? '');
+        $jsonData = file_get_contents($composerLockPath);
+        $jsonData = $jsonData ? $jsonData : '';
+        $cacheKey = md5($jsonData);
 
         if ($cache) {
             $cache = Injector::inst()->get(CacheInterface::class . '.VersionProvider_composerlock');
-            $cacheKey = md5($jsonData ?? '');
             if ($versions = $cache->get($cacheKey)) {
-                $lockData = json_decode($versions ?? '', true);
+                $lockData = json_decode($versions, true);
             }
         }
 
         if (empty($lockData) && $jsonData) {
-            $lockData = json_decode($jsonData ?? '', true);
+            $lockData = json_decode($jsonData, true);
 
             if ($cache) {
                 $cache->set($cacheKey, $jsonData);
             }
         }
 
+        $lockData = $lockData ? $lockData : [];
+
         return $lockData;
     }