support utils 4.0

middlewares · Mar 24, 2024 · 3ff7f11 · 3ff7f11
1 parent 82a7906
commit 3ff7f11
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -44,11 +44,9 @@ jobs:
                 - 7.2
                 - 7.3
                 - 7.4
-              composer-args: [ "" ]
-              include:
-                - php: 8.0
-                  composer-args: --ignore-platform-reqs
-            fail-fast: false
+                - 8.0
+                - 8.1
+                - 8.2
 
         steps:
             - name: Checkout
@@ -67,7 +65,7 @@ jobs:
                   restore-keys: ${{ runner.os }}-php-${{ matrix.php }}-composer-
 
             - name: Install dependencies
-              run: composer install --prefer-dist --no-progress ${{ matrix.composer-args }}
+              run: composer install --prefer-dist --no-progress
 
             - name: Tests
               run: composer test

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,10 +1,13 @@
 # Change Log
-
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.1.1] - 2024-03-24
+### Fixed
+- Allow middlewares/utils 4.0
+
 ## [2.1.0] - 2022-01-08
 ### Added
 - New option `attribute()` for `ContentType` middleware, to save the format name in a `ServerRequest` attribute [#10].
@@ -99,6 +102,7 @@ First version
 [#8]: https://github.com/middlewares/negotiation/issues/8
 [#10]: https://github.com/middlewares/negotiation/issues/10
 
+[2.1.1]: https://github.com/middlewares/negotiation/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/middlewares/negotiation/compare/v2.0.2...v2.1.0
 [2.0.2]: https://github.com/middlewares/negotiation/compare/v2.0.1...v2.0.2
 [2.0.1]: https://github.com/middlewares/negotiation/compare/v2.0.0...v2.0.1

diff --git a/composer.json b/composer.json
@@ -21,11 +21,11 @@
     "require": {
         "php": "^7.2 || ^8.0",
         "willdurand/negotiation": "^3.0",
-        "middlewares/utils": "^3.0",
+        "middlewares/utils": "^3.0 || ^4.0",
         "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8|^9",
+        "phpunit/phpunit": "^8|^9|^10|^11",
         "friendsofphp/php-cs-fixer": "^2.0",
         "oscarotero/php-cs-fixer-config": "^1.0",
         "squizlabs/php_codesniffer": "^3.0",