From 7510c46d88800ae9c358c1e049802c10c0b7c234 Mon Sep 17 00:00:00 2001
From: lzp <25803471@qq.com>
Date: Sat, 2 Jul 2022 19:16:13 +0800
Subject: [PATCH 01/13] Allow Symfony 6

---
 composer.json                                          | 10 +++++-----
 tests/Common/DependencyInjection/AbstractTestClass.php |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index f3dab11..6fc4567 100644
--- a/composer.json
+++ b/composer.json
@@ -32,12 +32,12 @@
   "require": {
     "php": "^8.0",
     "psr/container": "^1.0",
-    "symfony/config": "^4.4 || ^5.4",
-    "symfony/dependency-injection": "^4.4 || ^5.4",
-    "symfony/event-dispatcher": "^4.4 || ^5.4",
+    "symfony/config": "^4.4 || ^5.4 || ^6.0",
+    "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
+    "symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.0",
     "symfony/event-dispatcher-contracts": "^1.0 || ^2.0",
-    "symfony/http-foundation": "^4.4 || ^5.4",
-    "symfony/http-kernel": "^4.4 || ^5.4",
+    "symfony/http-foundation": "^4.4 || ^5.4 || ^6.0",
+    "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
     "yoanm/jsonrpc-server-sdk": "^3.0"
   },
   "require-dev": {
diff --git a/tests/Common/DependencyInjection/AbstractTestClass.php b/tests/Common/DependencyInjection/AbstractTestClass.php
index 7ae993f..c4f9693 100644
--- a/tests/Common/DependencyInjection/AbstractTestClass.php
+++ b/tests/Common/DependencyInjection/AbstractTestClass.php
@@ -84,7 +84,7 @@ protected function addJsonRpcMethodTag(Definition $definition, $methodName)
     protected function createJsonRpcMethodDefinition($class = ConcreteJsonRpcMethod::class)
     {
         return (new Definition($class))
-            ->setPrivate(false);
+            ->setPublic(true);
     }
 
     protected function mockResolver()

From 4b43b5542d74a6f1fca68d52cbc422eb01904b7c Mon Sep 17 00:00:00 2001
From: oleg-zinchenko <oleg.zinchenko@finsight.com>
Date: Wed, 15 Jun 2022 15:43:33 +0300
Subject: [PATCH 02/13] Upgrade dependencies


From 23685e7f628c88fd43ced69ea020419268dbc234 Mon Sep 17 00:00:00 2001
From: oleg-zinchenko <oleg.zinchenko@finsight.com>
Date: Wed, 15 Jun 2022 16:02:23 +0300
Subject: [PATCH 03/13] Upgrade dependencies

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 6fc4567..9b3363e 100644
--- a/composer.json
+++ b/composer.json
@@ -49,8 +49,8 @@
     "phpunit/php-code-coverage": "^9.2.4",
     "phpunit/phpunit": "^9.0",
     "squizlabs/php_codesniffer": "^3.5",
-    "symfony/framework-bundle": "^4.4 || ^5.4",
-    "symfony/routing": "^4.4 || ^5.4",
+    "symfony/framework-bundle": "^4.4 || ^5.4 || ^6.0",
+    "symfony/routing": "^4.4 || ^5.4 || ^6.0",
     "yoanm/php-unit-extended": "^2.0"
   },
   "config": {

From 562655f96e5a0a14d23e88583a69420504184790 Mon Sep 17 00:00:00 2001
From: Paul Klimov <klimov.paul@gmail.com>
Date: Tue, 21 Mar 2023 10:44:44 +0200
Subject: [PATCH 04/13] add Symfony 6.x support

---
 .github/workflows/CI.yml                               | 10 +++++++++-
 CHANGELOG-3.1.md                                       |  2 +-
 composer.json                                          |  2 +-
 src/DependencyInjection/JsonRpcHttpServerExtension.php |  2 +-
 .../JsonRpcHttpServerExtensionTest.php                 |  2 +-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index da78f14..e8fef92 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -46,6 +46,13 @@ jobs:
           # Late php migration => Latest symfony version with lowest minor php version allowed by composer config
           - symfony-version: '5.4'
             php-version: '8.0'
+          # Symfony 6.0 latest
+          - symfony-version: '6.0'
+            php-version: '8.2'
+          # Symfony 6.0 lowest
+          - symfony-version: '6.0'
+            php-version: '8.0'
+            composer-flag: --prefer-lowest
     steps:
       - name: Check out code
         uses: actions/checkout@v3
@@ -209,8 +216,9 @@ jobs:
         symfony-version:
           - '4.4' # Lowest LTS
           - '5.4' # Latest LTS
+          - '6.0' # Latest LTS
         include:
-          - symfony-version: '6.0' # Next symfony minor version to manage with latest supported PHP version
+          - symfony-version: '6.3' # Next symfony minor version to manage with latest supported PHP version
             php-version: '8.2'
 
     steps:
diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
index 5028bfc..a2dbbcd 100644
--- a/CHANGELOG-3.1.md
+++ b/CHANGELOG-3.1.md
@@ -22,7 +22,7 @@
 
 *   ✔️ Symfony 5.4
 
-*   🧪 Set Symfony 6.0 for nightly
+*   ✔️ Symfony 6.0
 
 ### Chore
 
diff --git a/composer.json b/composer.json
index 9b3363e..cce82cc 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
     "symfony/config": "^4.4 || ^5.4 || ^6.0",
     "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
     "symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.0",
-    "symfony/event-dispatcher-contracts": "^1.0 || ^2.0",
+    "symfony/event-dispatcher-contracts": "^2.0 || ^3.0",
     "symfony/http-foundation": "^4.4 || ^5.4 || ^6.0",
     "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
     "yoanm/jsonrpc-server-sdk": "^3.0"
diff --git a/src/DependencyInjection/JsonRpcHttpServerExtension.php b/src/DependencyInjection/JsonRpcHttpServerExtension.php
index d71bfaf..9922002 100644
--- a/src/DependencyInjection/JsonRpcHttpServerExtension.php
+++ b/src/DependencyInjection/JsonRpcHttpServerExtension.php
@@ -217,7 +217,7 @@ private function checkMethodAwareServiceIdList(
 
         if (null !== $class && !$class->implementsInterface(JsonRpcMethodAwareInterface::class)) {
             throw new LogicException(sprintf(
-                'Service "%s" is taggued as JSON-RPC method aware but does not implement %s',
+                'Service "%s" is tagged as JSON-RPC method aware but does not implement %s',
                 $serviceId,
                 JsonRpcMethodAwareInterface::class
             ));
diff --git a/tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionTest.php b/tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionTest.php
index 0d04c79..2aac4c7 100644
--- a/tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionTest.php
+++ b/tests/Functional/DependencyInjection/JsonRpcHttpServerExtensionTest.php
@@ -178,7 +178,7 @@ public function testShouldThowAnExceptionIfMethodAwareServiceDoesNotImplementRig
 
         $this->expectException(LogicException::class);
         $this->expectExceptionMessage(sprintf(
-            'Service "%s" is taggued as JSON-RPC method aware but does not implement %s',
+            'Service "%s" is tagged as JSON-RPC method aware but does not implement %s',
             $methodAwareServiceServiceId,
             JsonRpcMethodAwareInterface::class
         ));

From c933992eb788646f5867ae0995e85c324dca0f43 Mon Sep 17 00:00:00 2001
From: Paul Klimov <klimov.paul@gmail.com>
Date: Mon, 27 Mar 2023 10:58:22 +0300
Subject: [PATCH 05/13] #85: fix Symfony kernel for Behat

---
 features/demo_app/src/AbstractKernel.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/features/demo_app/src/AbstractKernel.php b/features/demo_app/src/AbstractKernel.php
index 01af49c..62897dc 100644
--- a/features/demo_app/src/AbstractKernel.php
+++ b/features/demo_app/src/AbstractKernel.php
@@ -31,7 +31,7 @@ public function registerBundles(): iterable
     /**
      * {@inheritdoc}
      */
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         // Use a specific cache for each kernels
         if (null === $this->customCacheDir) {
@@ -44,7 +44,7 @@ public function getCacheDir()
     /**
      * {@inheritdoc}
      */
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return $this->getProjectDir().'/var/log';
     }
@@ -52,7 +52,7 @@ public function getLogDir()
     /**
      * {@inheritdoc}
      */
-    public function getProjectDir()
+    public function getProjectDir(): string
     {
         return realpath(__DIR__.'/../');
     }
@@ -86,7 +86,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
      *
      * @return string The container class
      */
-    protected function getContainerClass()
+    protected function getContainerClass(): string
     {
         // In order to avoid collisions between kernels use a dedicated name
         return parent::getContainerClass().Container::camelize($this->getConfigDirectoryName());

From d69fd7b8958ca6212f529e921f0a736405e252e6 Mon Sep 17 00:00:00 2001
From: lzp <25803471@qq.com>
Date: Sat, 2 Jul 2022 19:16:13 +0800
Subject: [PATCH 06/13] Allow Symfony 6

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

diff --git a/composer.json b/composer.json
index cce82cc..0c13e53 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
     "symfony/config": "^4.4 || ^5.4 || ^6.0",
     "symfony/dependency-injection": "^4.4 || ^5.4 || ^6.0",
     "symfony/event-dispatcher": "^4.4 || ^5.4 || ^6.0",
-    "symfony/event-dispatcher-contracts": "^2.0 || ^3.0",
+    "symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0",
     "symfony/http-foundation": "^4.4 || ^5.4 || ^6.0",
     "symfony/http-kernel": "^4.4 || ^5.4 || ^6.0",
     "yoanm/jsonrpc-server-sdk": "^3.0"

From dce2f9fafdb9ccd8ad106c85bec76b6867534dae Mon Sep 17 00:00:00 2001
From: Yoanm <yoanm@users.noreply.github.com>
Date: Sat, 1 Apr 2023 23:49:21 +0200
Subject: [PATCH 07/13] Fix prophecy version

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

diff --git a/composer.json b/composer.json
index 0c13e53..cf17ee9 100644
--- a/composer.json
+++ b/composer.json
@@ -45,6 +45,7 @@
     "dvdoug/behat-code-coverage": "^5.0",
     "matthiasnoback/symfony-config-test": "^4.0",
     "matthiasnoback/symfony-dependency-injection-test": "^4.0",
+    "phpspec/prophecy": "^1.15",
     "phpspec/prophecy-phpunit": "^2.0",
     "phpunit/php-code-coverage": "^9.2.4",
     "phpunit/phpunit": "^9.0",

From ba36aea238930912f0ccb56861381e27ea389a0c Mon Sep 17 00:00:00 2001
From: Yoanm <yoanm@users.noreply.github.com>
Date: Sat, 1 Apr 2023 23:57:01 +0200
Subject: [PATCH 08/13] Revert changelog

Co-authored-by: lzp <25803471@qq.com>
---
 CHANGELOG-3.1.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
index a2dbbcd..5028bfc 100644
--- a/CHANGELOG-3.1.md
+++ b/CHANGELOG-3.1.md
@@ -22,7 +22,7 @@
 
 *   ✔️ Symfony 5.4
 
-*   ✔️ Symfony 6.0
+*   🧪 Set Symfony 6.0 for nightly
 
 ### Chore
 

From 3b85e5ec5c71f4fe9dad0b7c2dfef70fb259052b Mon Sep 17 00:00:00 2001
From: Yoanm <yoanm@users.noreply.github.com>
Date: Sun, 2 Apr 2023 00:00:11 +0200
Subject: [PATCH 09/13] Fix composer-require-checker version

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

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index e8fef92..b3a4565 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -169,7 +169,7 @@ jobs:
         run: make build
 
       - name: ComposerRequireChecker
-        uses: docker://webfactory/composer-require-checker:3.2.0
+        uses: docker://webfactory/composer-require-checker:4.5.0
 
       - name: Dependencies check
         if: ${{ github.event_name == 'pull_request' }}

From d540219e42bd40145556351d47c1fe34dfa93bf1 Mon Sep 17 00:00:00 2001
From: Yoanm <yoanm@users.noreply.github.com>
Date: Sun, 2 Apr 2023 00:11:00 +0200
Subject: [PATCH 10/13] Update README

---
 README.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7646402..eb6a46f 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
 
 [![CI](https://github.com/yoanm/symfony-jsonrpc-http-server/actions/workflows/CI.yml/badge.svg?branch=master)](https://github.com/yoanm/symfony-jsonrpc-http-server/actions/workflows/CI.yml)
 [![codecov](https://codecov.io/gh/yoanm/symfony-jsonrpc-http-server/branch/master/graph/badge.svg?token=NHdwEBUFK5)](https://codecov.io/gh/yoanm/symfony-jsonrpc-http-server)
-[![Symfony Versions](https://img.shields.io/badge/Symfony-v4%20%2F%20v5%20-8892BF.svg?logo=github)](https://symfony.com/)
+[![Symfony Versions](https://img.shields.io/badge/Symfony-v4.4%20%2F%20v5.4%2F%20v6.x-8892BF.svg?logo=github)](https://symfony.com/)
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/yoanm/symfony-jsonrpc-http-server.svg)](https://packagist.org/packages/yoanm/symfony-jsonrpc-http-server)
 [![Packagist PHP version](https://img.shields.io/packagist/php-v/yoanm/symfony-jsonrpc-http-server.svg)](https://packagist.org/packages/yoanm/symfony-jsonrpc-http-server)
@@ -25,13 +25,17 @@ See [yoanm/symfony-jsonrpc-http-server-doc](https://github.com/yoanm/symfony-jso
 
 ## Versions
 
-*   Symfony v3/4 - PHP >=7.1 : `^2.0`
+* Symfony v3/4 - PHP >=7.1 : `^2.0`
 
     ⚠️⚠️ `v2.1.0` and `v2.1.1` were badly taggued, used `v3.0.0` instead ! ⚠️⚠️
 
-*   Symfony v4/5 - PHP >=7.2 : `~3.0.0`
+* Symfony v4/5 - PHP >=7.2 : `~3.0.0`
 
-*   Symfony v4/5 - PHP >=7.3 : `^3.1`
+* Symfony v4/5 - PHP >=7.3 : `^3.1`
+
+* Symfony v4.4/5.4 - PHP ^8.0 : `^3.2`
+
+* Symfony v4.4/5.4/6.x - PHP ^8.0 : `^3.3`
 
 ## How to use
 

From 0bc9ab6ef3a7f96869305a6998ad86bcb9c5b851 Mon Sep 17 00:00:00 2001
From: Yoanm <yoanm@users.noreply.github.com>
Date: Sun, 2 Apr 2023 00:11:20 +0200
Subject: [PATCH 11/13] Fix nightly

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

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index b3a4565..5b81724 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -216,9 +216,9 @@ jobs:
         symfony-version:
           - '4.4' # Lowest LTS
           - '5.4' # Latest LTS
-          - '6.0' # Latest LTS
+          - '6.0' # Current major version
         include:
-          - symfony-version: '6.3' # Next symfony minor version to manage with latest supported PHP version
+          - symfony-version: '6.3@dev' # Next symfony minor version to manage with latest supported PHP version
             php-version: '8.2'
 
     steps:

From 367075cf5032dad7923596d813e0cbe0c6bfd756 Mon Sep 17 00:00:00 2001
From: Yoanm <yoanm@users.noreply.github.com>
Date: Sun, 2 Apr 2023 00:15:02 +0200
Subject: [PATCH 12/13] Fix Readme

---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index eb6a46f..6c61d13 100644
--- a/README.md
+++ b/README.md
@@ -25,17 +25,17 @@ See [yoanm/symfony-jsonrpc-http-server-doc](https://github.com/yoanm/symfony-jso
 
 ## Versions
 
-* Symfony v3/4 - PHP >=7.1 : `^2.0`
+*   Symfony v3/4 - PHP >=7.1 : `^2.0`
 
     ⚠️⚠️ `v2.1.0` and `v2.1.1` were badly taggued, used `v3.0.0` instead ! ⚠️⚠️
 
-* Symfony v4/5 - PHP >=7.2 : `~3.0.0`
+*   Symfony v4/5 - PHP >=7.2 : `~3.0.0`
 
-* Symfony v4/5 - PHP >=7.3 : `^3.1`
+*   Symfony v4/5 - PHP >=7.3 : `^3.1`
 
-* Symfony v4.4/5.4 - PHP ^8.0 : `^3.2`
+*   Symfony v4.4/5.4 - PHP ^8.0 : `^3.2`
 
-* Symfony v4.4/5.4/6.x - PHP ^8.0 : `^3.3`
+*   Symfony v4.4/5.4/6.x - PHP ^8.0 : `^3.3`
 
 ## How to use
 

From dbb25e61f6c619be6f7d797f241598c73da3946c Mon Sep 17 00:00:00 2001
From: Yoanm <yoanm@users.noreply.github.com>
Date: Sun, 2 Apr 2023 00:33:10 +0200
Subject: [PATCH 13/13] Fix SF 6.3

---
 .github/workflows/CI.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 5b81724..0f3152f 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -218,7 +218,7 @@ jobs:
           - '5.4' # Latest LTS
           - '6.0' # Current major version
         include:
-          - symfony-version: '6.3@dev' # Next symfony minor version to manage with latest supported PHP version
+          - symfony-version: '6.3' # Next symfony minor version to manage with latest supported PHP version
             php-version: '8.2'
 
     steps:
@@ -247,7 +247,8 @@ jobs:
 
       - name: Build
         run: |
-          composer require -W ${{ env.COMPOSER_OPTIONS }} \
+          composer config minimum-stability dev \
+          && composer require -W ${{ env.COMPOSER_OPTIONS }} \
             symfony/http-foundation:^${{ matrix.symfony-version }} \
             symfony/http-kernel:^${{ matrix.symfony-version }} \
             symfony/config:^${{ matrix.symfony-version }} \