Merge branch 'main' into satalaondrej/main

.github/workflows/unit-tests.yml

@@ -1,51 +1,44 @@
-name: "PHPUnit tests"
+name: Tests
 
 on:
   pull_request:
   push:
 
 jobs:
-  phpunit:
-    name: "PHPUnit tests"
-
-    runs-on: ${{ matrix.operating-system }}
-
+  tests:
+    name: Tests PHP ${{ matrix.php }}
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        php-version:
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          - "8.0"
-          - "8.1"
-        operating-system:
-          - "ubuntu-latest"
+        os: [ubuntu-latest]
+        php: [7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3]
 
     steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
         with:
-          coverage: "pcov"
-          php-version: "${{ matrix.php-version }}"
+          coverage: pcov
+          php-version: ${{ matrix.php }}
           ini-values: memory_limit=-1
           tools: composer:v2, cs2pr
 
-      - name: "Cache dependencies"
-        uses: "actions/cache@v2"
+      - name: Cache dependencies
+        uses: actions/cache@v3
         with:
           path: |
             ~/.composer/cache
             vendor
-          key: "php-${{ matrix.php-version }}"
-          restore-keys: "php-${{ matrix.php-version }}"
+          key: php-${{ matrix.php }}
+          restore-keys: php-${{ matrix.php }}
 
-      - name: "Install highest dependencies"
-        run: "composer update --no-interaction --no-progress --no-suggest"
+      - name: Install highest dependencies
+        run: composer update --no-interaction --no-progress --no-suggest
 
-      - name: "Tests"
-        run: "vendor/bin/phpunit"
+      - name: Tests
+        run: vendor/bin/phpunit

composer.json

@@ -19,11 +19,11 @@
     },
     "require": {
         "php": "^7.2 || ^8.0",
-        "psr/http-message": "^1.0",
+        "psr/http-message": "^1.0 || ^2.0",
         "psr/http-server-middleware": "^1.0"
     },
     "require-dev": {
-        "laminas/laminas-diactoros": "^2.4",
+        "laminas/laminas-diactoros": "^2.4 || ^3.0",
         "phpunit/phpunit": "^8.5.8 || ^9.4",
         "squizlabs/php_codesniffer": "^3.2"
     },