Merge pull request #546 from netglue/1.11.x-merge-up-into-2.0.x_lo5L9oGr

Merge release 1.11.0 into 2.0.x
netglue · Oct 31, 2024 · 0bce930 · 0bce930
2 parents 1adb8b5 + a14bc36
commit 0bce930
Show file tree

Hide file tree

Showing 20 changed files with 1,041 additions and 732 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -14,20 +14,20 @@ jobs:
     name: PHPUnit Coverage
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
-      - uses: shivammathur/setup-php@2.28.0
+      - uses: actions/checkout@v4.2.2
+      - uses: shivammathur/setup-php@2.31.1
         with:
           php-version: 8.1
           extensions: pcov
           coverage: pcov
           ini-values: pcov.enabled=1
-      - uses: "ramsey/composer-install@2.2.0"
+      - uses: "ramsey/composer-install@3.0.0"
       - run: php ./vendor/bin/phpunit --coverage-clover=coverage.xml
         env:
           PRISMIC_REPO: ${{ secrets.PRISMIC_REPO }}
           PRISMIC_TOKEN: ${{ secrets.PRISMIC_TOKEN }}
 
-      - uses: codecov/codecov-action@v3
+      - uses: codecov/codecov-action@v4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml
@@ -38,11 +38,11 @@ jobs:
     runs-on: "ubuntu-latest"
 
     steps:
-      - uses: actions/checkout@v4.1.1
-      - uses: shivammathur/setup-php@2.28.0
+      - uses: actions/checkout@v4.2.2
+      - uses: shivammathur/setup-php@2.31.1
         with:
           php-version: 8.1
-      - uses: "ramsey/composer-install@2.2.0"
+      - uses: "ramsey/composer-install@3.0.0"
         with:
           dependency-versions: "highest"
       - run: composer global config bin-dir /usr/local/bin

diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -1,5 +1,7 @@
 {
     "ignore_php_platform_requirements": {
-        "8.3": false
-    }
+        "8.3": false,
+        "8.4": true
+    },
+    "backwardCompatibilityCheck": true
 }
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
         }
     },
     "require": {
-        "php": "~8.1 || ~8.2 || ~8.3",
+        "php": "~8.1 || ~8.2 || ~8.3 || ~8.4",
         "ext-json": "*",
         "laminas/laminas-escaper": "^2.9",
         "php-http/discovery": "^1.18.0",
@@ -48,16 +48,19 @@
     "require-dev": {
         "ext-curl": "*",
         "doctrine/coding-standard": "^12.0",
-        "laminas/laminas-diactoros": "^3.3.0",
-        "php-http/cache-plugin": "^1.8.1",
-        "php-http/curl-client": "^2.3.1",
-        "php-http/mock-client": "^1.6",
-        "phpunit/phpunit": "^10.5.0",
-        "psalm/plugin-phpunit": "^0.18.4",
+        "laminas/laminas-diactoros": "^3.5.0",
+        "php-http/cache-plugin": "^2.0.1",
+        "php-http/curl-client": "^2.3.3",
+        "php-http/mock-client": "^1.6.1",
+        "phpunit/phpunit": "^10.5.38",
+        "psalm/plugin-phpunit": "^0.19.0",
         "roave/security-advisories": "dev-latest",
-        "squizlabs/php_codesniffer": "^3.7.2",
-        "symfony/cache": "^6.4 || ^7.0",
-        "vimeo/psalm": "^5.16.0"
+        "symfony/cache": "^6.4.13 || ^7.0",
+        "vimeo/psalm": "^5.26.1"
+    },
+    "conflict": {
+        "php-http/httplug": "<2.4.1",
+        "php-http/promise": "<1.3.1"
     },
     "scripts": {
         "check": [