From 4d95aa6f64f03bbf6b2613cf281aee3b8f086c68 Mon Sep 17 00:00:00 2001
From: James Titcumb <james@asgrim.com>
Date: Thu, 19 Sep 2024 09:16:01 +0100
Subject: [PATCH 1/3] Added a composer.json to enable support for PIE

---
 composer.json | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 composer.json

diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..8de3c35
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "php/mcrypt",
+    "type": "php-ext",
+    "license": "PHP-3.01",
+    "description": "Interface to the mcrypt library",
+    "require": {
+        "php": ">= 7.2.0, <= 8.4.0"
+    },
+    "php-ext": {
+        "extension-name": "mcrypt",
+        "configure-options": [
+            {
+                "name": "with-mcrypt",
+                "description": "Include mcrypt support",
+                "needs-value": true
+            }
+        ]
+    }
+}

From a27b5ea8ddf394c4839f8d359f4a1dc4e0474794 Mon Sep 17 00:00:00 2001
From: James Titcumb <james@asgrim.com>
Date: Wed, 9 Oct 2024 10:43:53 +0100
Subject: [PATCH 2/3] Use pecl namespace for Package name

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

diff --git a/composer.json b/composer.json
index 8de3c35..10e51ee 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "php/mcrypt",
+    "name": "pecl/mcrypt",
     "type": "php-ext",
     "license": "PHP-3.01",
     "description": "Interface to the mcrypt library",

From 468cdd0e46201297129c1930b87cd2617145be2b Mon Sep 17 00:00:00 2001
From: James Titcumb <james@asgrim.com>
Date: Wed, 9 Oct 2024 21:27:30 +0100
Subject: [PATCH 3/3] Use appropriate windows machines in CI builds using
 exclude matrix

---
 .github/workflows/build.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f33c232..d0d470c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ on:
 
 jobs:
     windows:
-        runs-on: windows-latest
+        runs-on: ${{matrix.os}}
         name: "Windows: Build and test"
         defaults:
             run:
@@ -18,10 +18,17 @@ jobs:
         strategy:
             fail-fast: false
             matrix:
+                os: [ windows-2019, windows-2022 ]
                 php: ["7.3", "7.4", "8.0", "8.1", "8.2"]
                 arch: [x86, x64]
                 ts: [nts, ts]
                 experimental: [false]
+                exclude:
+                  - { os: windows-2019, php: "8.2" }
+                  - { os: windows-2019, php: "8.1" }
+                  - { os: windows-2019, php: "8.0" }
+                  - { os: windows-2022, php: "7.4" }
+                  - { os: windows-2022, php: "7.3" }
         steps:
                 - name: Checkout Repository
                   uses: actions/checkout@v3
@@ -36,7 +43,7 @@ jobs:
                     echo $extension_version >> $env:GITHUB_ENV
                 - name: Setup PHP
                   id: setup-php
-                  uses: cmb69/setup-php-sdk@v0.7
+                  uses: php/setup-php-sdk@v0.10
                   with:
                       version: ${{matrix.php}}
                       arch: ${{matrix.arch}}