Merge commit 'eecb47a101ea651f749c7f1bce1ea7313ae3cdce' into f/OS-110

* commit 'eecb47a101ea651f749c7f1bce1ea7313ae3cdce':
  OS-175 package version on status page
  Releasing 4.0.0
  Updated CHANGELOG
  Update os2web_audit
  OS-115 Skipping address with empty matrikelnummer phpcs fix
  OS-115 Skipping address with empty matrikelnummer

Author: stankut

CHANGELOG.md

@@ -11,6 +11,18 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- Updating the display of os2forms package on the status page
+
+## [4.0.0] 2025-03-06
+
+- This is an alias for for 3.22.2. Major change is the module removal, which can lead to lack of backward support.
+See full release note here:
+https://github.com/OS2Forms/os2forms_docs/blob/master/docs/releases/2024-Q4-Release-notes.md
+
+## [3.22.2] 2025-02-28
+
+- Updated `os2web_audit`.
+
 ## [3.22.1] 2025-02-10
 
 - Updated `os2forms_fbs_handler` to include and correct set phone number [#161](https://github.com/OS2Forms/os2forms/pull/161)
@@ -77,6 +89,13 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [3.16.0-beta1] 2024-08-27
 
+## [3.16.0] 2024-08-27
+
+f/OS-115_dawa_address
+- [OS-115] Skipping empty maktrikula objects
+
+
+
 [#110](https://github.com/OS2Forms/os2forms/pull/110)
 
 - Obsolete module removing - os2forms_consent
@@ -342,7 +361,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - Security in case of vulnerabilities.
 ```
 
-[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.22.1...HEAD
+[Unreleased]: https://github.com/OS2Forms/os2forms/compare/3.22.2...HEAD
+[3.22.2]: https://github.com/OS2Forms/os2forms/compare/3.22.1...3.22.2
 [3.22.1]: https://github.com/OS2Forms/os2forms/compare/3.22.0...3.22.1
 [3.22.0]: https://github.com/OS2Forms/os2forms/compare/3.21.2...3.22.0
 [3.21.2]: https://github.com/OS2Forms/os2forms/compare/3.21.1...3.21.2

composer.json

@@ -68,7 +68,7 @@
         "http-interop/http-factory-guzzle": "^1.0.0",
         "itk-dev/beskedfordeler-drupal": "^1.0",
         "itk-dev/serviceplatformen": "^1.5",
-        "os2web/os2web_audit": "^0.1.6",
+        "os2web/os2web_audit": "^1.0",
         "os2web/os2web_datalookup": "^2.0",
         "os2web/os2web_nemlogin": "^1.0",
         "os2web/os2web_simplesaml": "dev-master",

modules/os2forms_dawa/src/Plugin/os2web/DataLookup/DatafordelerDataLookup.php

@@ -99,7 +99,12 @@ public function getMatrikulaEntries(string $matrikulaId) : array {
       if (NestedArray::keyExists($jsonDecoded, ['features', 0, 'properties', 'jordstykke'])) {
         $jordstykker = NestedArray::getValue($jsonDecoded, ['features', 0, 'properties', 'jordstykke']);
         foreach ($jordstykker as $jordstyk) {
-          $matrikulaEntries[] = new DatafordelerMatrikula($jordstyk);
+          try {
+            $matrikulaEntries[] = new DatafordelerMatrikula($jordstyk);
+          }
+          catch (\TypeError $e) {
+            // Could not create matrikula object.
+          }
         }
       }
     }

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,
+      ])
     ],
   ];