Merge pull request #60 from gsteel/allow-psr-http-messsage-2

Allow psr/http-message ^2
dflydev · Jul 18, 2023 · ebe6c15 · ebe6c15
2 parents eb5d1d4 + 8e7c4c6
commit ebe6c15
Show file tree

Hide file tree

Showing 6 changed files with 1,212 additions and 1,198 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -33,10 +33,13 @@ jobs:
                 composer-flags: ['']
                 include:
                     - php: '7.2'
-                      coverage: false
+                      coverage: 'none'
                     - php: '8.0'
-                      coverage: false
-                      composer-flags: '--ignore-platform-req=php'
+                      coverage: 'none'
+                    - php: '8.1'
+                      coverage: 'none'
+                    - php: '8.2'
+                      coverage: 'none'
 
         steps:
             - uses: actions/checkout@v2
@@ -52,9 +55,9 @@ jobs:
 
             - run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-            - name: "Use PHPUnit 9.3+ on PHP 8"
+            - name: "Use PHPUnit 9.3+ on PHP 8+"
               run: composer require --no-update --dev phpunit/phpunit:^9.3
-              if: "matrix.php == '8.0'"
+              if: ${{ matrix.php == '8.0' || matrix.php == '8.1' || matrix.php == '8.2' }}
 
             - run: composer update --no-progress ${{ matrix.composer-flags }}
 
@@ -65,7 +68,7 @@ jobs:
               if: ${{ matrix.coverage != 'none' }}
 
             - run: php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
-              if: ${{ matrix.coverage != 'none' }}
+              if: ${{ matrix.coverage != 'none' && github.repository == 'dflydev/dflydev-fig-cookies' }}
 
     phpstan:
         name: PHPStan

diff --git a/composer.json b/composer.json
@@ -9,10 +9,16 @@
             "email": "beau@dflydev.com"
         }
     ],
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "phpstan/extension-installer": true
+        }
+    },
     "require": {
         "php": "^7.2 || ^8.0",
         "ext-pcre": "*",
-        "psr/http-message": "^1"
+        "psr/http-message": "^1.0.1 || ^2"
     },
     "autoload": {
         "psr-4": {