From 1730b3679fd6be831b6c6d85670644e15c6f8b7a Mon Sep 17 00:00:00 2001
From: Martins Sipenko <martins.sipenko@gmail.com>
Date: Mon, 28 Mar 2022 10:24:58 +0300
Subject: [PATCH 1/7] Test on php 8.1

---
 .github/workflows/php.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 2381227..c0f8c63 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -12,20 +12,15 @@ jobs:
   build:
     strategy:
       matrix:
-        php: ['7.2', '7.3', '7.4']
+        php: ['7.2', '7.3', '7.4', '8.0', '8.1']
         phpunit: ['8.0', '9.0']
         composer-arg: ['']
-        include:
-          - php: '8.0'
-            phpunit: '9.0'
-            composer-arg: 'ignore-platform-req=php'
         exclude:
           - php: '8.0'
             phpunit: '8.0'
           - php: '7.2'
             phpunit: '9.0'
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.php == '8.0' }}
     name: PHP ${{ matrix.php }}, PHPUnit ${{ matrix.phpunit }}
     
     steps:

From 0c2b50bbb8df893aa266f1de427ff3d3b7a7f82f Mon Sep 17 00:00:00 2001
From: Martins Sipenko <martins.sipenko@gmail.com>
Date: Mon, 28 Mar 2022 10:27:08 +0300
Subject: [PATCH 2/7] use shivammathur/setup-php@v2

---
 .github/workflows/php.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index c0f8c63..49ae500 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -27,7 +27,7 @@ jobs:
     - uses: actions/checkout@v1
       
     - name: Setup PHP
-      uses: shivammathur/setup-php@v1
+      uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php }}
         extensions: mbstring, intl, json

From cdc094d7a47474d265f1b61c4b476b53da708801 Mon Sep 17 00:00:00 2001
From: Martins Sipenko <martins.sipenko@gmail.com>
Date: Mon, 28 Mar 2022 10:27:52 +0300
Subject: [PATCH 3/7] use shivammathur/setup-php@v2

---
 .github/workflows/php_coverage.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/php_coverage.yml b/.github/workflows/php_coverage.yml
index a96b27b..c8aab51 100644
--- a/.github/workflows/php_coverage.yml
+++ b/.github/workflows/php_coverage.yml
@@ -12,9 +12,9 @@ jobs:
     - uses: actions/checkout@v1
 
     - name: Setup PHP
-      uses: shivammathur/setup-php@v1
+      uses: shivammathur/setup-php@v2
       with:
-        php-version: 7.4
+        php-version: 8.0
         extensions: mbstring, intl, json
         coverage: pcov
     

From a29f90e6eb28e61541b291146ecc17f011c0c998 Mon Sep 17 00:00:00 2001
From: Martins Sipenko <martins.sipenko@gmail.com>
Date: Mon, 28 Mar 2022 10:30:44 +0300
Subject: [PATCH 4/7] Update codeclimate-action to 3.0.0

---
 .github/workflows/php_coverage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/php_coverage.yml b/.github/workflows/php_coverage.yml
index c8aab51..aa8d8c1 100644
--- a/.github/workflows/php_coverage.yml
+++ b/.github/workflows/php_coverage.yml
@@ -22,7 +22,7 @@ jobs:
       run: composer install --prefer-dist --no-progress --no-suggest
   
     - name: Test & publish code coverage
-      uses: paambaati/codeclimate-action@v2.3.0
+      uses: paambaati/codeclimate-action@v3.0.0
       env:
         CC_TEST_REPORTER_ID: ${{ secrets.codeClimateReporterID }}
       with:

From 3b50e73d9a8775d4c099494dbee9c085b83a242a Mon Sep 17 00:00:00 2001
From: Martins Sipenko <martins.sipenko@gmail.com>
Date: Mon, 28 Mar 2022 10:58:57 +0300
Subject: [PATCH 5/7] Convert deprecations to exceptions

---
 phpunit.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/phpunit.xml b/phpunit.xml
index 5f5d9b6..829a996 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -6,6 +6,7 @@
         convertErrorsToExceptions="true"
         convertNoticesToExceptions="true"
         convertWarningsToExceptions="true"
+        convertDeprecationsToExceptions="true"
         timeoutForSmallTests="1"
         timeoutForMediumTests="10"
         timeoutForLargeTests="60">

From ca2cf5f8bbca15f6f8a022db309d3bb72a598005 Mon Sep 17 00:00:00 2001
From: Martins Sipenko <martins.sipenko@gmail.com>
Date: Mon, 28 Mar 2022 11:10:09 +0300
Subject: [PATCH 6/7] Change error_reporting to E_ALL

---
 .github/workflows/php.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index 49ae500..a774217 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -31,6 +31,7 @@ jobs:
       with:
         php-version: ${{ matrix.php }}
         extensions: mbstring, intl, json
+        ini-values: error_reporting=E_ALL
         coverage: pcov
         tools: composer:v2
     - name: Validate composer.json and composer.lock

From af32943004da21aad359a7408a379419181339ab Mon Sep 17 00:00:00 2001
From: Martins Sipenko <martins.sipenko@gmail.com>
Date: Mon, 28 Mar 2022 11:12:01 +0300
Subject: [PATCH 7/7] Allow softcreatr/jsonpath 0.8

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 306670a..91689da 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "softcreatr/jsonpath": "^0.7.2",
+        "softcreatr/jsonpath": "^0.7.2 || ^0.8",
         "justinrainbow/json-schema": "^5.0"
     },
     "conflict": {