From b9785cd2f0a2634c820a438b83f5e4f5207b4113 Mon Sep 17 00:00:00 2001
From: PopNatanael <natipop1@yahoo.com>
Date: Tue, 22 Aug 2023 12:14:14 +0300
Subject: [PATCH 1/2] composer http-message change, codecov actions

---
 .github/workflows/codecov.yml         | 53 +++++++++++++++++++++++++++
 .github/workflows/cs-tests.yml        |  2 +-
 .github/workflows/static-analysis.yml |  2 +-
 composer.json                         |  2 +-
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/codecov.yml

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
new file mode 100644
index 0000000..c90cf08
--- /dev/null
+++ b/.github/workflows/codecov.yml
@@ -0,0 +1,53 @@
+on:
+  - push
+
+name: Run Codecov checks
+
+jobs:
+  code-coverage:
+    name: Code Coverage
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+
+        php:
+          - "8.1"
+          - "8.2"
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "${{ matrix.php }}"
+          coverage: pcov
+          ini-values: assert.exception=1, zend.assertions=1, error_reporting=-1, log_errors_max_len=0, display_errors=On
+          tools: composer:v2, cs2pr
+
+      - name: Determine composer cache directory
+        run: echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
+
+      - name: Cache dependencies installed with composer
+        uses: actions/cache@v3
+        with:
+          path: ${{ env.COMPOSER_CACHE_DIR }}
+          key: php${{ matrix.php }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            php${{ matrix.php }}-composer-
+
+      - name: Install dependencies with composer
+        run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+
+      - name: Collect code coverage with PHPUnit
+        run: vendor/bin/phpunit --colors=always --coverage-clover clover.xml
+
+      - name: Send code coverage report to Codecov.io
+        uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/cs-tests.yml b/.github/workflows/cs-tests.yml
index 3da9965..e4032b1 100644
--- a/.github/workflows/cs-tests.yml
+++ b/.github/workflows/cs-tests.yml
@@ -40,7 +40,7 @@ jobs:
           restore-keys: |
             php${{ matrix.php }}-composer-
       - name: Install dependencies with composer
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+        run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run phpcs checks
         run: vendor/bin/phpcs
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index 74550fc..134ff5b 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -40,7 +40,7 @@ jobs:
           restore-keys: |
             php${{ matrix.php }}-composer-
       - name: Install dependencies with composer
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
+        run: composer install --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run static analysis
         run: vendor/bin/psalm --no-cache --output-format=github --show-info=false --threads=4
diff --git a/composer.json b/composer.json
index 95b630a..b2e746b 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     "php": "~8.1.0 || ~8.2.0",
     "mezzio/mezzio-router": "^3.16",
     "psr/http-client": "^1.0",
-    "psr/http-message": "^2.0"
+    "psr/http-message": "^1.1 || ^2.0"
   },
   "require-dev": {
     "laminas/laminas-coding-standard": "^2.5",

From 686b964abf5f2aa556e1da2951a3ddbd13c9547e Mon Sep 17 00:00:00 2001
From: PopNatanael <natipop1@yahoo.com>
Date: Tue, 22 Aug 2023 12:37:02 +0300
Subject: [PATCH 2/2] http-message fix, codecov empty line

---
 .github/workflows/codecov.yml | 2 +-
 composer.json                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
index c90cf08..f5980e7 100644
--- a/.github/workflows/codecov.yml
+++ b/.github/workflows/codecov.yml
@@ -50,4 +50,4 @@ jobs:
       - name: Send code coverage report to Codecov.io
         uses: codecov/codecov-action@v3
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
\ No newline at end of file
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/composer.json b/composer.json
index b2e746b..b9d90b7 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,7 @@
     "php": "~8.1.0 || ~8.2.0",
     "mezzio/mezzio-router": "^3.16",
     "psr/http-client": "^1.0",
-    "psr/http-message": "^1.1 || ^2.0"
+    "psr/http-message": "^1.0 || ^2.0"
   },
   "require-dev": {
     "laminas/laminas-coding-standard": "^2.5",