add Symfony 6.x support

Author: klimov-paul

.github/workflows/CI.yml

@@ -38,25 +38,33 @@ jobs:
       max-parallel: 4
       matrix:
         php-version:
-          - '8.1' # Latest supported
+          - '8.2' # Latest supported
+          - '8.1'
           - '8.0' # First php 8 version
           - '7.4' # Latest php 7 version
           - '7.3' # Lowest supported
         symfony-version:
           - '4.4' # Lowest LTS
           - '5.4' # Latest LTS
+          - '6.0' # Latest LTS
         exclude:
           # Run all symfony version only on Lowest and Latest php versions, run it only one time for others
           - php-version: '8.0'
             symfony-version: '4.4'
           - php-version: '7.4'
             symfony-version: '5.4'
+          - php-version: '7.3'
+            symfony-version: '6.0'
+          - php-version: '7.4'
+            symfony-version: '6.0'
+          - php-version: '8.0'
+            symfony-version: '6.0'
     steps:
       - name: Check out code
         uses: actions/checkout@v2
 
       - name: Enable coverage
-        if: ${{ matrix.php-version == '8.1' }}
+        if: ${{ matrix.php-version == '8.2' }}
         run: |
           echo "COVERAGE_OUTPUT_STYLE=clover" >> $GITHUB_ENV
           echo "COVERAGE_TYPE=xdebug" >> $GITHUB_ENV
@@ -135,10 +143,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup PHP 8.1
+      - name: Setup PHP 8.2
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.1 # Latest supported
+          php-version: 8.2 # Latest supported
           tools: composer
           coverage: none
         env:
@@ -203,13 +211,13 @@ jobs:
       #  - next Symfony minor version to manage with latest supported php version
       matrix:
         php-version:
-          - '8.2' # Current php dev version
+          - '8.3' # Current php dev version
         symfony-version:
           - '4.4' # Lowest LTS
           - '5.4' # Latest LTS
         include:
           - symfony-version: '6.0' # Next symfony minor version to manage with latest supported PHP version
-            php-version: '8.1'
+            php-version: '8.2'
 
     steps:
       - name: Check out code

CHANGELOG-3.1.md

@@ -22,7 +22,7 @@
 
 *   ✔️ Symfony 5.4
 
-*   🧪 Set Symfony 6.0 for nightly
+*   ✔️ Symfony 6.0
 
 ### Chore
 

composer.json

@@ -32,12 +32,12 @@
   "require": {
     "php": "^7.3 || ^8.0",
     "psr/container": "^1.0",
-    "symfony/config": "^4.4 || ^5.4",
-    "symfony/dependency-injection": "^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",
-    "symfony/event-dispatcher-contracts": "^1.0 || ^2.0",
-    "symfony/http-foundation": "^4.4 || ^5.4",
-    "symfony/http-kernel": "^4.4 || ^5.4",
+    "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"
   },
   "require-dev": {
@@ -46,8 +46,8 @@
     "phpunit/phpunit": "^8.0 || ^9.0",
     "matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0",
     "matthiasnoback/symfony-config-test": "^3.0 || ^4.0",
-    "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": "~1.0",
     "phpspec/prophecy-phpunit": "^2.0",
     "dvdoug/behat-code-coverage": "^5.0"

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
             ));

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()

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
         ));