Merge branch 'release/2.1.0'

yoanm · yoanm · commit 2d99ffdd1018 · 2020-03-21T20:18:55.000+01:00
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*       @yoanm
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,6 @@ composer.lock
 
 # Demo app excluded dirs
 features/demo_app/var/
+
+#Phpunit
+.phpunit.result.cache
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -36,7 +36,7 @@ build:
             COVERAGE_OUTPUT_STYLE: 'clover'
             COVERAGE_CLOVER_FILE_PATH: 'build/coverage/clover.xml'
         php:
-            version: "7.1"
+            version: "7.3"
         timezone: UTC
         postgresql: false
         redis: false
diff --git a/.travis.yml b/.travis.yml
@@ -1,20 +1,19 @@
 language: php
 
 php:
-  - '7.1'
   - '7.2'
   - '7.3'
   - '7.4'
 
 env:
   global:
-    CI: 'true'
-    TEST_OUTPUT_STYLE: 'pretty'
-    PHPCS_REPORT_STYLE: 'full'
-    COMPOSER_OPTIONS: '--optimize-autoloader'
-  matrix:
-  - SYMFONY_VERSION: '~3.0'
-  - SYMFONY_VERSION: '~4.0'
+    - CI: 'true'
+    - TEST_OUTPUT_STYLE: 'pretty'
+    - PHPCS_REPORT_STYLE: 'full'
+    - COMPOSER_OPTIONS: '--optimize-autoloader'
+  jobs:
+    - SYMFONY_VERSION: '~4.0'
+    - SYMFONY_VERSION: '~5.0'
 
 sudo: false
 
@@ -40,4 +39,5 @@ cache:
 branches:
   except:
   - /.*\-dev$/
+  - /^dev-.*$/
   - /.*\-patch(\-\d+)?$/
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 [![Scrutinizer Build Status](https://img.shields.io/scrutinizer/build/g/yoanm/symfony-jsonrpc-http-server.svg?label=Scrutinizer&logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-http-server/build-status/master) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/yoanm/symfony-jsonrpc-http-server/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-http-server/?branch=master) [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/yoanm/symfony-jsonrpc-http-server/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-http-server/?branch=master)
 
-[![Travis Build Status](https://img.shields.io/travis/yoanm/symfony-jsonrpc-http-server/master.svg?label=Travis&logo=travis)](https://travis-ci.org/yoanm/symfony-jsonrpc-http-server) [![Travis PHP versions](https://img.shields.io/travis/php-v/yoanm/symfony-jsonrpc-http-server.svg?logo=travis)](https://php.net/) [![Travis Symfony Versions](https://img.shields.io/badge/Symfony-v3%20%2F%20v4-8892BF.svg?logo=travis)](https://symfony.com/)
+[![Travis Build Status](https://img.shields.io/travis/com/yoanm/php-jsonrpc-params-symfony-validator-sdk/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/php-jsonrpc-params-symfony-validator-sdk) <!-- NOT WORKING WITH travis-ci.com [![Travis PHP versions](https://img.shields.io/travis/php-v/yoanm/php-jsonrpc-params-symfony-validator-sdk.svg?logo=travis)](https://php.net/) --> [![Travis Symfony Versions](https://img.shields.io/badge/Symfony-v4%20%2F%20v5-8892BF.svg?logo=travis)](https://php.net/)
 
 [![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)
 
diff --git a/composer.json b/composer.json
@@ -31,22 +31,22 @@
     "yoanm/symfony-jsonrpc-http-server-doc": "JSON-RPC documentation Bundle"
   },
   "require": {
-    "php": ">=7.1",
+    "php": ">=7.2",
     "yoanm/jsonrpc-server-sdk": "^3.0",
-    "symfony/http-foundation": "^3.0 || ^4.0",
-    "symfony/http-kernel": "^3.0 || ^4.0",
-    "symfony/config": "^3.0 || ^4.0",
-    "symfony/dependency-injection": "^3.0 || ^4.0"
+    "symfony/http-foundation": "^4.0 || ^5.0",
+    "symfony/http-kernel": "^4.0 || ^5.0",
+    "symfony/config": "^4.0 || ^5.0",
+    "symfony/dependency-injection": "^4.0 || ^5.0"
   },
   "require-dev": {
     "behat/behat": "~3.0",
     "squizlabs/php_codesniffer": "3.*",
     "phpunit/phpunit": "^7.0 || ^8.0",
     "matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0",
     "matthiasnoback/symfony-config-test": "^3.0 || ^4.0",
-    "symfony/framework-bundle": "^3.0 || ^4.0",
-    "symfony/http-kernel": "^3.0 || ^4.0",
-    "symfony/routing": "^3.0 || ^4.0",
+    "symfony/framework-bundle": "^4.0 || ^5.0",
+    "symfony/http-kernel": "^4.0 || ^5.0",
+    "symfony/routing": "^4.0 || ^5.0",
     "yoanm/php-unit-extended": "~1.0"
   }
 }
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -10,9 +10,9 @@ class Configuration implements ConfigurationInterface
 
     public function getConfigTreeBuilder()
     {
-        $treeBuilder = new TreeBuilder();
+        $treeBuilder = new TreeBuilder(JsonRpcHttpServerExtension::EXTENSION_IDENTIFIER);
 
-        $rootNode = $treeBuilder->root(JsonRpcHttpServerExtension::EXTENSION_IDENTIFIER);
+        $rootNode = $treeBuilder->getRootNode();
 
         $rootNode
             ->addDefaultsIfNotSet()
diff --git a/src/Dispatcher/SymfonyJsonRpcServerDispatcher.php b/src/Dispatcher/SymfonyJsonRpcServerDispatcher.php
@@ -23,14 +23,14 @@ public function __construct(EventDispatcherInterface $symfonyEventDispatcher)
     }
 
     /**
-     * @param string $eventName
-     * @param JsonRpcServerEvent|null $event
+     * @param string|null $eventName
+     * @param JsonRpcServerEvent $event
      */
     public function dispatchJsonRpcEvent(string $eventName, JsonRpcServerEvent $event = null) : void
     {
         $this->symfonyEventDispatcher->dispatch(
-            $eventName,
-            $event ? new SymfonyJsonRpcServerEvent($event) : null
+            $event ? new SymfonyJsonRpcServerEvent($event) : new \stdClass(),
+            $eventName
         );
     }
 
diff --git a/src/Endpoint/JsonRpcHttpEndpoint.php b/src/Endpoint/JsonRpcHttpEndpoint.php
@@ -34,8 +34,9 @@ public function httpOptions() : Response
         $response->headers->set('Content-Type', 'application/json');
 
         // Set allowed http methods
-        $response->headers->set('Allow', $this->allowedMethodList);
-        $response->headers->set('Access-Control-Request-Method', $this->allowedMethodList);
+        $allowedMethodListString = implode(', ', $this->allowedMethodList);
+        $response->headers->set('Allow', $allowedMethodListString);
+        $response->headers->set('Access-Control-Request-Method', $allowedMethodListString);
 
         // Set allowed content type
         $response->headers->set('Accept', 'application/json');
diff --git a/src/Event/SymfonyJsonRpcServerEvent.php b/src/Event/SymfonyJsonRpcServerEvent.php
@@ -1,7 +1,7 @@
 <?php
 namespace Yoanm\SymfonyJsonRpcHttpServer\Event;
 
-use Symfony\Component\EventDispatcher\Event;
+use Symfony\Contracts\EventDispatcher\Event;
 use Yoanm\JsonRpcServer\Domain\Event\JsonRpcServerEvent;
 
 /**
diff --git a/tests/Functional/DependencyInjection/JsonRpcMethodDefinitionHelperTest.php b/tests/Functional/DependencyInjection/JsonRpcMethodDefinitionHelperTest.php
@@ -14,7 +14,7 @@ class JsonRpcMethodDefinitionHelperTest extends AbstractTestClass
     /** @var JsonRpcMethodDefinitionHelper */
     private $helper;
 
-    public function setUp(): void
+    protected function setUp(): void
     {
         $this->helper = new JsonRpcMethodDefinitionHelper();
         parent::setUp();
diff --git a/tests/Functional/Dispatcher/SymfonyJsonRpcServerDispatcherTest.php b/tests/Functional/Dispatcher/SymfonyJsonRpcServerDispatcherTest.php
@@ -55,24 +55,14 @@ public function testShouldDispatchEventsWrappedIntoSpecificClass()
 
         $this->sfDispatcher
             ->dispatch(
-                $eventName,
                 Argument::allOf(
                     Argument::type(SymfonyJsonRpcServerEvent::class),
                     Argument::which('getJsonRpcServerEvent', $event->reveal())
-                )
+                ),
+                $eventName
             )
             ->shouldBeCalled();
 
         $this->dispatcher->dispatchJsonRpcEvent($eventName, $event->reveal());
     }
-
-    public function testShouldDispatchEventsWithOnlyName()
-    {
-        $eventName = 'event-name';
-
-        $this->sfDispatcher->dispatch($eventName, null)
-            ->shouldBeCalled();
-
-        $this->dispatcher->dispatchJsonRpcEvent($eventName);
-    }
 }
diff --git a/tests/Functional/Endpoint/JsonRpcHttpEndpointTest.php b/tests/Functional/Endpoint/JsonRpcHttpEndpointTest.php
@@ -53,18 +53,18 @@ public function testHttPostShouldHandleRequestContentAndReturnA200ResponseContai
 
     public function testHttOptionsShouldReturnAllowedMethodsAndContentType()
     {
-        $expectedAllowedMethodList = [Request::METHOD_POST, Request::METHOD_OPTIONS];
+        $expectedAllowedMethodList = implode(', ', [Request::METHOD_POST, Request::METHOD_OPTIONS]);
 
         $response = $this->endpoint->httpOptions();
 
         $this->assertSame(Response::HTTP_OK, $response->getStatusCode());
         $this->assertSame('application/json', $response->headers->get('Content-Type'));
 
         // Check allowed methods
-        $this->assertSame($expectedAllowedMethodList, $response->headers->get('Allow', null, false));
+        $this->assertSame($expectedAllowedMethodList, $response->headers->get('Allow', null));
         $this->assertSame(
             $expectedAllowedMethodList,
-            $response->headers->get('Access-Control-Request-Method', null, false)
+            $response->headers->get('Access-Control-Request-Method', null)
         );
 
         // Check allowed content types

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@ class Configuration implements ConfigurationInterface`
`10`	`10`
`11`	`11`	`public function getConfigTreeBuilder()`
`12`	`12`	`{`
`13`		`- $treeBuilder = new TreeBuilder();`
	`13`	`+ $treeBuilder = new TreeBuilder(JsonRpcHttpServerExtension::EXTENSION_IDENTIFIER);`
`14`	`14`
`15`		`- $rootNode = $treeBuilder->root(JsonRpcHttpServerExtension::EXTENSION_IDENTIFIER);`
	`15`	`+ $rootNode = $treeBuilder->getRootNode();`
`16`	`16`
`17`	`17`	`$rootNode`
`18`	`18`	`->addDefaultsIfNotSet()`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,14 @@ public function __construct(EventDispatcherInterface $symfonyEventDispatcher)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/**`
`26`		`- * @param string $eventName`
`27`		`- * @param JsonRpcServerEvent\|null $event`
	`26`	`+ * @param string\|null $eventName`
	`27`	`+ * @param JsonRpcServerEvent $event`
`28`	`28`	`*/`
`29`	`29`	`public function dispatchJsonRpcEvent(string $eventName, JsonRpcServerEvent $event = null) : void`
`30`	`30`	`{`
`31`	`31`	`$this->symfonyEventDispatcher->dispatch(`
`32`		`- $eventName,`
`33`		`- $event ? new SymfonyJsonRpcServerEvent($event) : null`
	`32`	`+ $event ? new SymfonyJsonRpcServerEvent($event) : new \stdClass(),`
	`33`	`+ $eventName`
`34`	`34`	`);`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class JsonRpcMethodDefinitionHelperTest extends AbstractTestClass`
`14`	`14`	`/** @var JsonRpcMethodDefinitionHelper */`
`15`	`15`	`private $helper;`
`16`	`16`
`17`		`- public function setUp(): void`
	`17`	`+ protected function setUp(): void`
`18`	`18`	`{`
`19`	`19`	`$this->helper = new JsonRpcMethodDefinitionHelper();`
`20`	`20`	`parent::setUp();`