Upgrade http-message (#99)

* Upgrade http-message

* Run composer install with different strategies

* Fix composer cache in CI

* Use composer flag to cache items

* new latest checkout action

* Run rector and code style check on min php version only

Author: funivan

.github/workflows/test.yaml

@@ -9,42 +9,46 @@ on:
   pull_request:
     branches:
       - master
-
+env:
+  PHP_MIN: 8.1
 jobs:
   run:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.1', '8.2', '8.3']
-    name: PHP ${{ matrix.php-versions }}
+        php-version: ['8.1', '8.2', '8.3']
+        composer-flag: ['--prefer-lowest', '']
+    name: PHP ${{ matrix.php-version }} ${{ matrix.composer-flag }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-versions }}
+          php-version: ${{ matrix.php-version }}
 
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ matrix.composer-flag }}
           restore-keys: |
             ${{ runner.os }}-composer-
 
-      - name: Install dependencies
-        run: composer install --prefer-dist --dev
+      - name: Install dependencies ${{ matrix.composer-flag }}
+        run: composer update --prefer-install=dist ${{ matrix.composer-flag }} --dev
 
       - name: Run tests
         run: ./vendor/bin/phpunit
 
       - name: Run rector
+        if: matrix.php-version == env.PHP_MIN && matrix.composer-flag == ''
         run: ./vendor/bin/rector --dry-run
 
       - name: Run code style check
+        if: matrix.php-version == env.PHP_MIN && matrix.composer-flag == ''
         run: ./vendor/bin/ecs

composer.json

@@ -22,7 +22,7 @@
     "ext-mbstring": "*",
     "guzzlehttp/guzzle": "^6.3 || ^7.3",
     "guzzlehttp/psr7": "^2.4.5",
-    "psr/http-message": "^1.0",
+    "psr/http-message": "^1.0 || ^2.0",
     "xparse/element-finder": "^2.0"
   },
   "require-dev": {

src/Helper/ToUtfConverter.php

@@ -44,8 +44,7 @@ private function getSupportedEncodings(): array
                     $this->supportedEncodings[] = $encoding;
                     if ($findAliases) {
                         foreach (mb_encoding_aliases($encoding) as $encodingAlias) {
-                            $encodingAlias = mb_strtolower($encodingAlias);
-                            $this->supportedEncodings[] = $encodingAlias;
+                            $this->supportedEncodings[] = mb_strtolower($encodingAlias);
                         }
                     }
                 }