From 7dcee82ffa4be6ef101ca714ee72dc88d6031dee Mon Sep 17 00:00:00 2001
From: Mikkel Ricky <rimi@aarhus.dk>
Date: Fri, 2 May 2025 10:19:54 +0200
Subject: [PATCH] Normalized composer.json

---
 .github/workflows/pr.yaml | 32 +++++++++++++++++++
 CHANGELOG.md              |  3 ++
 composer.json             | 66 ++++++++++++++++++++-------------------
 3 files changed, 69 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 8fae0be..0c6303a 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -50,6 +50,38 @@ jobs:
           # Check that dependencies resolve.
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
 
+  test-composer-normalized:
+    name: Check that composer.json is normalized
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: [ '8.3' ]
+        dependency-version: [ prefer-lowest, prefer-stable ]
+    steps:
+      - uses: actions/checkout@master
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: json
+          coverage: none
+          tools: composer:v2
+      # https://github.com/shivammathur/setup-php#cache-composer-dependencies
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Check that composer.json is normalized
+        run: |
+          composer install
+          # Check that dependencies resolve.
+          composer normalize --dry-run
+
   php-check-coding-standards:
     name: PHP - Check Coding Standards
     runs-on: ubuntu-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91547d3..18800f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ about writing changes to this log.
 
 ## [Unreleased]
 
+* [PR-22](https://github.com/OS2Forms/os2forms_get_organized/pull/22)
+  Normalized `composer.json`
+
 ## [1.4.1] 12.03.2025
 
 * Allowed `os2forms/os2forms` 4.0.
diff --git a/composer.json b/composer.json
index ad6b319..2b6832c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,63 +1,65 @@
 {
     "name": "os2forms/os2forms_get_organized",
     "description": "OS2Forms GetOrganized integration",
-    "type": "drupal-module",
     "license": "MIT",
+    "type": "drupal-module",
     "authors": [
         {
             "name": "Jeppe Kuhlmann Andersen",
             "email": "jekua@aarhus.dk"
         }
     ],
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://packages.drupal.org/8"
-        }
-    ],
     "require": {
-        "itk-dev/getorganized-api-client-php": "^1.2.2",
-        "drupal/webform": "^6.2",
         "drupal/advancedqueue": "^1.2",
-        "symfony/options-resolver": "^5.4 || ^6.0",
-        "os2forms/os2forms": "^3.17 || ^4.0"
+        "drupal/webform": "^6.2",
+        "itk-dev/getorganized-api-client-php": "^1.2.2",
+        "os2forms/os2forms": "^3.17 || ^4.0",
+        "symfony/options-resolver": "^5.4 || ^6.0"
     },
     "require-dev": {
-        "drupal/coder": "^8.3",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
+        "drupal/coder": "^8.3",
+        "ergebnis/composer-normalize": "^2.47",
         "mglaman/drupal-check": "^1.4",
         "mglaman/phpstan-drupal": "~1.2.0"
     },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://packages.drupal.org/8"
+        }
+    ],
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "ergebnis/composer-normalize": true,
+            "mglaman/composer-drupal-lenient": true,
+            "simplesamlphp/composer-module-installer": true,
+            "zaporylie/composer-drupal-optimizations": true
+        }
+    },
     "scripts": {
+        "code-analysis": [
+            "@code-analysis/drupal-check"
+        ],
         "code-analysis/drupal-check": [
             "# @see https://github.com/mglaman/drupal-check/issues/261#issuecomment-1030141772 for details on exclude-dir value",
             "drupal-check --deprecations --analysis --exclude-dir='vendor,*/Client/*' *.* src"
         ],
-        "code-analysis": [
-            "@code-analysis/drupal-check"
+        "coding-standards-apply": [
+            "@coding-standards-apply/phpcs"
         ],
-        "coding-standards-check/phpcs": [
-            "vendor/bin/phpcs --standard=phpcs.xml.dist"
+        "coding-standards-apply/phpcs": [
+            "vendor/bin/phpcbf --standard=phpcs.xml.dist"
         ],
         "coding-standards-check": [
             "@coding-standards-check/phpcs"
         ],
-        "coding-standards-apply/phpcs": [
-            "vendor/bin/phpcbf --standard=phpcs.xml.dist"
-        ],
-        "coding-standards-apply": [
-            "@coding-standards-apply/phpcs"
+        "coding-standards-check/phpcs": [
+            "vendor/bin/phpcs --standard=phpcs.xml.dist"
         ]
-    },
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true,
-            "zaporylie/composer-drupal-optimizations": true,
-            "cweagans/composer-patches": true,
-            "simplesamlphp/composer-module-installer": true,
-            "mglaman/composer-drupal-lenient": true
-        }
     }
 }