Apply patch from cloudflare#275

Author: keesmonk

.github/workflows/lint.yml

@@ -10,30 +10,31 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4']
+    env:
+      LOWEST: '0'
+      PHP_VERSION: '8.3'
 
     steps:
     - uses: actions/checkout@v2
 
     - uses: shivammathur/setup-php@v2
       with:
-        php-version: ${{ matrix.php-versions }}
+        php-version: ${{ env.PHP_VERSION }}
 
     - name: Cache Composer dependencies
       uses: actions/cache@v2
       with:
         path: /tmp/composer-cache
-        key: ${{ runner.os }}-php${{ matrix.php-versions }}-${{ hashFiles('**/composer.lock') }}
+        key: ${{ runner.os }}-php${{ env.PHP_VERSION }}-lowest${{ env.LOWEST }}-{{ hashFiles('**/composer.lock') }}
 
     - name: Install dependencies
       uses: php-actions/composer@v5
+      env:
+        COMPOSER_PREFER_LOWEST: ${{ env.LOWEST }}
       with:
         command: install
-        args: --prefer-dist --no-progress --no-suggest --verbose
-        php_version: ${{ matrix.php-versions }}
+        args: --prefer-dist --no-progress --prefer-stable --no-suggest --verbose
+        php_version: ${{ env.PHP_VERSION }}
         version: 1
 
     - name: Run lint

.github/workflows/test.yml

@@ -13,7 +13,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: ['7.0', '7.1', '7.2', '7.3', '7.4']
+        lowest: ['0', '1']
+        php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
 
     steps:
     - uses: actions/checkout@v2
@@ -26,13 +27,15 @@ jobs:
       uses: actions/cache@v2
       with:
         path: /tmp/composer-cache
-        key: ${{ runner.os }}-php${{ matrix.php-versions }}-${{ hashFiles('**/composer.lock') }}
+        key: ${{ runner.os }}-php${{ matrix.php-versions }}-lowest${{ matrix.lowest }}-${{ hashFiles('**/composer.lock') }}
 
     - name: Install dependencies
       uses: php-actions/composer@v5
+      env:
+        COMPOSER_PREFER_LOWEST: ${{ matrix.lowest }}
       with:
         command: install
-        args: --prefer-dist --no-progress --no-suggest --verbose
+        args: --prefer-dist --no-progress --prefer-stable --no-suggest --verbose
         php_version: ${{ matrix.php-versions }}
         version: 1
 

.gitignore

@@ -1,2 +1,4 @@
 /.idea
-/vendor/
+/composer.lock
+/vendor/
+/.phpunit.result.cache

composer.json

@@ -4,14 +4,14 @@
   "type": "library",
   "require": {
     "guzzlehttp/guzzle": "^7.0.1",
-    "php": ">=7.2.5",
-    "psr/http-message": "~1.0",
+    "php": ">=7.3",
+    "psr/http-message": "^1.0 || ^2.0",
     "ext-json": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5.7",
+    "phpunit/phpunit": "^9.0",
     "phpmd/phpmd" : "@stable",
-    "friendsofphp/php-cs-fixer": "^2.6"
+    "friendsofphp/php-cs-fixer": "^3.0"
   },
   "license": "BSD-3-Clause",
   "authors": [