Merge branch 'release/1.0.0'

yoanm · yoanm · commit 607073c53fd1 · 2020-03-28T17:26:49.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,7 @@ build
 #A library must not provide a composer.lock file
 composer.lock
 
-features/demo_app/var/
+features/demo_app/var/
+
+#Phpunit
+.phpunit.result.cache
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -46,7 +46,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,7 +1,6 @@
 language: php
 
 php:
-  - '7.1'
   - '7.2'
   - '7.3'
   - '7.4'
@@ -13,8 +12,8 @@ env:
     - PHPCS_REPORT_STYLE: 'full'
     - COMPOSER_OPTIONS: '--optimize-autoloader'
   jobs:
-    - SYMFONY_VERSION: '~3.0'
     - SYMFONY_VERSION: '~4.0'
+    - SYMFONY_VERSION: '~5.0'
 
 jobs:
   fast_finish: true
@@ -24,7 +23,7 @@ before_install:
   - phpenv config-rm xdebug.ini || true
 
 install:
-  - composer require symfony/http-kernel:$SYMFONY_VERSION symfony/dependency-injection:$SYMFONY_VERSION symfony/routing:$SYMFONY_VERSION
+  - composer require symfony/http-kernel:$SYMFONY_VERSION symfony/dependency-injection:$SYMFONY_VERSION symfony/config:$SYMFONY_VERSION symfony/routing:$SYMFONY_VERSION symfony/event-dispatcher:$SYMFONY_VERSION
   - make build
 script:
   - make test-technical
diff --git a/README.md b/README.md
@@ -4,14 +4,18 @@
 
 [![Scrutinizer Build Status](https://img.shields.io/scrutinizer/build/g/yoanm/symfony-jsonrpc-http-server-openapi-doc.svg?label=Scrutinizer&logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-http-server-openapi-doc/build-status/master) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/yoanm/symfony-jsonrpc-http-server-openapi-doc/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-http-server-openapi-doc/?branch=master) [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/yoanm/symfony-jsonrpc-http-server-openapi-doc/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-http-server-openapi-doc/?branch=master)
 
-[![Travis Build Status](https://img.shields.io/travis/com/yoanm/symfony-jsonrpc-http-server-openapi-doc/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/symfony-jsonrpc-http-server-openapi-doc) <!-- NOT WORKING WITH travis-ci.com [![Travis PHP versions](https://img.shields.io/travis/php-v/yoanm/symfony-jsonrpc-http-server-openapi-doc.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/symfony-jsonrpc-http-server-openapi-doc/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/symfony-jsonrpc-http-server-openapi-doc) <!-- NOT WORKING WITH travis-ci.com [![Travis PHP versions](https://img.shields.io/travis/php-v/yoanm/symfony-jsonrpc-http-server-openapi-doc.svg?logo=travis)](https://php.net/) --> [![Travis Symfony Versions](https://img.shields.io/badge/Symfony-v4%20%2F%20v5-8892BF.svg?logo=travis)](https://symfony.com/)
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/yoanm/symfony-jsonrpc-http-server-openapi-doc.svg)](https://packagist.org/packages/yoanm/symfony-jsonrpc-http-server-openapi-doc) [![Packagist PHP version](https://img.shields.io/packagist/php-v/yoanm/symfony-jsonrpc-http-server-openapi-doc.svg)](https://packagist.org/packages/yoanm/symfony-jsonrpc-http-server-openapi-doc)
 
 Symfony bundle for easy JSON-RPC server OpenAPI 3.0.0 documentation
 
 Symfony bundle for [yoanm/jsonrpc-http-server-openapi-doc-sdk](https://github.com/yoanm/php-jsonrpc-http-server-openapi-doc-sdk)
 
+## Versions
+- Symfony v3/4 - PHP >=7.1 : `^v0.X`
+- Symfony v4/5 - PHP >=7.2 : `^v1.0`
+
 ## How to use
 
 Once configured, your project is ready to handle HTTP `GET` request on `/doc/openapi.json` endpoint. Result will be a openapi compatible file.
diff --git a/composer.json b/composer.json
@@ -32,23 +32,24 @@
     "yoanm/symfony-jsonrpc-http-server": "Symfony Bundle to convert an HTTP json-rpc request into HTTP json-rpc response"
   },
   "require": {
-    "php": ">=7.1",
-    "symfony/config": "^3.0 || ^4.0",
-    "symfony/dependency-injection": "^3.0 || ^4.0",
-    "symfony/event-dispatcher-contracts": "^1.0",
-    "symfony/http-kernel": "^3.0 || ^4.0",
+    "php": ">=7.2",
+    "symfony/config": "^4.0 || ^5.0",
+    "symfony/dependency-injection": "^4.0 || ^5.0",
+    "symfony/event-dispatcher-contracts": "^1.0 || ^2.0",
+    "symfony/http-kernel": "^4.0 || ^5.0",
     "yoanm/jsonrpc-http-server-openapi-doc-sdk": "^0.2",
     "yoanm/jsonrpc-server-doc-sdk": "^0.2",
-    "yoanm/symfony-jsonrpc-http-server-doc": "^0.2"
+    "yoanm/symfony-jsonrpc-http-server-doc": "^1.0"
   },
   "require-dev": {
     "behat/behat": "~3.0",
     "matthiasnoback/symfony-config-test": "^3.0 || ^4.0",
     "matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0",
     "phpunit/phpunit": "^7.0 || ^8.0",
     "squizlabs/php_codesniffer": "3.*",
-    "symfony/framework-bundle": "^3.0 || ^4.0",
-    "symfony/routing": "^3.0 || ^4.0",
+    "symfony/event-dispatcher": "^4.0 || ^5.0",
+    "symfony/framework-bundle": "^4.0 || ^5.0",
+    "symfony/routing": "^4.0 || ^5.0",
     "yoanm/php-unit-extended": "~1.0"
   }
 }
diff --git a/src/Provider/DocProvider.php b/src/Provider/DocProvider.php
@@ -48,7 +48,7 @@ public function getDoc($host = null) : array
         $openApiDoc = $this->docNormalizer->normalize($rawDoc);
 
         $event = new OpenAPIDocCreatedEvent($openApiDoc, $rawDoc);
-        $this->dispatcher->dispatch($event::EVENT_NAME, $event);
+        $this->dispatcher->dispatch($event, $event::EVENT_NAME);
 
         return $event->getOpenAPIDoc();
     }
diff --git a/tests/Functional/Provider/DocProviderTest.php b/tests/Functional/Provider/DocProviderTest.php
@@ -10,6 +10,7 @@
 use Yoanm\SymfonyJsonRpcHttpServerDoc\Creator\HttpServerDocCreator;
 use Yoanm\SymfonyJsonRpcHttpServerOpenAPIDoc\Event\OpenAPIDocCreatedEvent;
 use Yoanm\SymfonyJsonRpcHttpServerOpenAPIDoc\Provider\DocProvider;
+use Yoanm\SymfonyJsonRpcHttpServerSwaggerDoc\Event\SwaggerDocCreatedEvent;
 
 /**
  * @covers \Yoanm\SymfonyJsonRpcHttpServerOpenAPIDoc\Provider\DocProvider
@@ -57,6 +58,14 @@ public function testShouldCreateHttpServerDocAndNormalizeIt()
             ->shouldBeCalled()
         ;
 
+        $this->dispatcher
+            ->dispatch(
+                Argument::type(OpenApiDocCreatedEvent::class),
+                OpenApiDocCreatedEvent::EVENT_NAME
+            )
+            ->shouldBeCalled()
+        ;
+
         $this->assertSame(
             $normalizedDoc,
             $this->provider->getDoc($host)
@@ -83,12 +92,12 @@ public function testShouldDispatchAnEvent()
 
         $this->dispatcher
             ->dispatch(
-                OpenAPIDocCreatedEvent::EVENT_NAME,
                 Argument::allOf(
                     Argument::type(OpenAPIDocCreatedEvent::class),
                     Argument::which('getOpenAPIDoc', $normalizedDoc),
                     Argument::which('getServerDoc', $rawDoc->reveal())
-                )
+                ),
+                OpenAPIDocCreatedEvent::EVENT_NAME
             )
             ->shouldBeCalled()
         ;

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public function getDoc($host = null) : array`
`48`	`48`	`$openApiDoc = $this->docNormalizer->normalize($rawDoc);`
`49`	`49`
`50`	`50`	`$event = new OpenAPIDocCreatedEvent($openApiDoc, $rawDoc);`
`51`		`- $this->dispatcher->dispatch($event::EVENT_NAME, $event);`
	`51`	`+ $this->dispatcher->dispatch($event, $event::EVENT_NAME);`
`52`	`52`
`53`	`53`	`return $event->getOpenAPIDoc();`
`54`	`54`	`}`