From 5a3851202c22f62763c8125d29b5720615d83d21 Mon Sep 17 00:00:00 2001
From: Andreas Braun <andreas.braun@mongodb.com>
Date: Mon, 9 Sep 2024 08:20:08 +0200
Subject: [PATCH 1/4] Add workflow to validate composer.json

---
 .github/workflows/composer-validate.yml | 35 +++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/composer-validate.yml

diff --git a/.github/workflows/composer-validate.yml b/.github/workflows/composer-validate.yml
new file mode 100644
index 000000000..3bab3e4a0
--- /dev/null
+++ b/.github/workflows/composer-validate.yml
@@ -0,0 +1,35 @@
+name: "Check validity of composer.json"
+
+on:
+  pull_request:
+    branches:
+      - "v*.*"
+      - "master"
+      - "feature/*"
+  push:
+    branches:
+      - "v*.*"
+      - "master"
+      - "feature/*"
+
+env:
+  PHP_VERSION: "8.2"
+
+jobs:
+  composer-validate:
+    name: "Check validity of composer.json"
+    runs-on: "ubuntu-24.04"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v4"
+        with:
+          submodules: true
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ env.PHP_VERSION }}"
+
+      - name: "Run composer validate"
+        run: "composer validate --strict"

From 2d690a121e03d657245fe18ba1ae3f573d33628d Mon Sep 17 00:00:00 2001
From: Andreas Braun <andreas.braun@mongodb.com>
Date: Mon, 9 Sep 2024 08:20:14 +0200
Subject: [PATCH 2/4] Add missing description to composer.json

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index e1382cdac..b82431b11 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,6 @@
 {
   "name": "mongodb/mongodb-extension",
+  "description": "MongoDB driver extension",
   "type": "php-ext",
   "keywords": ["database", "driver", "mongodb", "persistence"],
   "homepage": "https://jira.mongodb.org/browse/PHPC",

From b0450f1a9d7a84421d3711a302372c91db38f2c5 Mon Sep 17 00:00:00 2001
From: Andreas Braun <andreas.braun@mongodb.com>
Date: Mon, 9 Sep 2024 11:21:11 +0200
Subject: [PATCH 3/4] Add missing newline at EOF

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b82431b11..42c103c1e 100644
--- a/composer.json
+++ b/composer.json
@@ -70,4 +70,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}

From 1ec5974db1634d27d6693fc38b3914aaf8602aab Mon Sep 17 00:00:00 2001
From: Andreas Braun <andreas.braun@mongodb.com>
Date: Mon, 9 Sep 2024 13:05:43 +0200
Subject: [PATCH 4/4] Auto-detect PHP version to use

---
 .github/workflows/composer-validate.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/composer-validate.yml b/.github/workflows/composer-validate.yml
index 3bab3e4a0..5f75b62af 100644
--- a/.github/workflows/composer-validate.yml
+++ b/.github/workflows/composer-validate.yml
@@ -12,9 +12,6 @@ on:
       - "master"
       - "feature/*"
 
-env:
-  PHP_VERSION: "8.2"
-
 jobs:
   composer-validate:
     name: "Check validity of composer.json"
@@ -28,8 +25,6 @@ jobs:
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ env.PHP_VERSION }}"
 
       - name: "Run composer validate"
         run: "composer validate --strict"