From c48da4223005a29c6806e42910cae99dc811fc0d Mon Sep 17 00:00:00 2001
From: Denis Golubovskiy <bukashk0zzz@me.com>
Date: Mon, 27 Dec 2021 09:08:28 +0200
Subject: [PATCH 1/3] Add Symfony 6 support

---
 .github/workflows/test.yaml |  3 +++
 .phpstan/symfony_5.neon     |  2 +-
 .phpstan/symfony_6.neon     |  9 +++++++++
 composer.json               | 12 ++++++------
 4 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 .phpstan/symfony_6.neon

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 4aeade0..41e7c27 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -58,6 +58,9 @@ jobs:
           - php: '8.0'
             symfony: '5.2.*'
             phpstan: .phpstan/symfony_5.neon
+          - php: '8.0'
+            symfony: '6.0.*'
+            phpstan: .phpstan/symfony_6.neon
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/.phpstan/symfony_5.neon b/.phpstan/symfony_5.neon
index 3181b82..8eaa243 100644
--- a/.phpstan/symfony_5.neon
+++ b/.phpstan/symfony_5.neon
@@ -1,4 +1,4 @@
-# config for Symfone 5.0 - 5.2
+# config for Symfony 5.0 - 5.2
 
 includes:
     - default.neon
diff --git a/.phpstan/symfony_6.neon b/.phpstan/symfony_6.neon
new file mode 100644
index 0000000..2d8ad8c
--- /dev/null
+++ b/.phpstan/symfony_6.neon
@@ -0,0 +1,9 @@
+# config for Symfony 6.0
+
+includes:
+    - default.neon
+
+parameters:
+    ignoreErrors:
+        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder::root\(\)\.#'
+        - '#Class Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder constructor invoked with 0 parameters, 1\-3 required\.#'
diff --git a/composer.json b/composer.json
index 54ed0fb..4e9d4a4 100644
--- a/composer.json
+++ b/composer.json
@@ -19,12 +19,12 @@
         "ext-zlib": "*",
         "php": ">=7.1.0",
         "geoip2/geoip2": "~2.0",
-        "symfony/http-kernel": "~2.8|~3.0|~4.0|~5.0",
-        "symfony/dependency-injection": "~2.8|~3.0|~4.0|~5.0",
-        "symfony/expression-language": "~2.8|~3.0|~4.0|~5.0",
-        "symfony/config": "~2.8|~3.0|~4.0|~5.0",
-        "symfony/console": "~2.8|~3.0|~4.0|~5.0",
-        "symfony/filesystem": "~2.8|~3.0|~4.0|~5.0"
+        "symfony/http-kernel": "~2.8|~3.0|~4.0|~5.0|~6.0",
+        "symfony/dependency-injection": "~2.8|~3.0|~4.0|~5.0|~6.0",
+        "symfony/expression-language": "~2.8|~3.0|~4.0|~5.0|~6.0",
+        "symfony/config": "~2.8|~3.0|~4.0|~5.0|~6.0",
+        "symfony/console": "~2.8|~3.0|~4.0|~5.0|~6.0",
+        "symfony/filesystem": "~2.8|~3.0|~4.0|~5.0|~6.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~7.0|~8.0|~9.0",

From 9e1f2a28edb346e88d43ab70f9ea9f402fedcb01 Mon Sep 17 00:00:00 2001
From: Denis Golubovskiy <bukashk0zzz@me.com>
Date: Mon, 27 Dec 2021 13:55:22 +0200
Subject: [PATCH 2/3] Update Symfony 6.0 phpstan config

---
 .phpstan/symfony_6.neon | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.phpstan/symfony_6.neon b/.phpstan/symfony_6.neon
index 2d8ad8c..cbd2b93 100644
--- a/.phpstan/symfony_6.neon
+++ b/.phpstan/symfony_6.neon
@@ -1,9 +1,4 @@
 # config for Symfony 6.0
 
 includes:
-    - default.neon
-
-parameters:
-    ignoreErrors:
-        - '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder::root\(\)\.#'
-        - '#Class Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder constructor invoked with 0 parameters, 1\-3 required\.#'
+    - symfony_5.neon

From f250ba5103179c31f90cba452a38b95c97b39ec3 Mon Sep 17 00:00:00 2001
From: Denis Golubovskiy <bukashk0zzz@me.com>
Date: Mon, 27 Dec 2021 14:00:13 +0200
Subject: [PATCH 3/3] Update PHP CS workflow PHP version

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

diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml
index fbd1397..0b4b81f 100644
--- a/.github/workflows/qa.yaml
+++ b/.github/workflows/qa.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.1
+          php-version: 7.4
           coverage: none
           tools: composer:v2, cs2pr, php-cs-fixer