Merge branch 'develop' into hotfix/digital-post-commands

Author: rimi-itk

CHANGELOG.md

@@ -14,6 +14,7 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - [PR-166](https://github.com/OS2Forms/os2forms/pull/166)
   - Fix digital post commands
   - Updated versions in GitHub Actions `uses` steps
+- Updating the display of os2forms package on the status page
 
 ## [4.0.0] 2025-03-06
 

os2forms.install

@@ -5,6 +5,7 @@
  * Install file for OS2Forms module.
  */
 
+use Composer\InstalledVersions;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\taxonomy\Entity\Term;
@@ -63,21 +64,17 @@ function os2forms_requirements($phase) {
     'value' => $messages,
   ];
 
-  $commit_sha = exec('git rev-parse HEAD');
-  $tag = exec("git describe --tags --abbrev=0");
-  $remote = exec('git config --get remote.origin.url');
+  $reference = InstalledVersions::getReference("os2forms/os2forms");
+  $version = InstalledVersions::getPrettyVersion("os2forms/os2forms");
 
   $version_messages = [
     '#prefix' => t('OS2Forms version'),
     '#theme' => 'item_list',
     '#items' => [
-      0 => t('tag <strong>@tag</strong> (commit: <strong>@commit</strong>)', [
-        '@tag' => $tag,
-        '@commit' => $commit_sha,
-      ]),
-      1 => t('remote: <strong>@remote</strong>', [
-        '@remote' => $remote,
-      ]),
+      0 => t('version <strong>@version</strong> (commit: <strong>@reference</strong>)', [
+        '@version' => $version,
+        '@reference' => $reference,
+      ])
     ],
   ];