Skip to content

Commit aaad7ac

Browse files
authored
Improve (#3)
1 parent e0d5d84 commit aaad7ac

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

.scrutinizer.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,14 @@ build:
1515
tests:
1616
stop_on_failure: true
1717
override:
18-
- php-scrutinizer-run --enable-security-analysis
19-
-
20-
command: make codestyle
21-
analysis:
22-
file: 'build/reports/cs-data'
23-
format: 'php-cs-checkstyle'
2418
-
2519
command: make coverage
2620
idle_timeout: 1200
2721
coverage:
2822
file: 'build/coverage/clover.xml'
2923
format: 'php-clover'
24+
- php-scrutinizer-run --enable-security-analysis
25+
- make codestyle
3026
cache:
3127
directories:
3228
- ~/.composer
@@ -39,8 +35,6 @@ build:
3935
COMPOSER_OPTIONS: '--optimize-autoloader'
4036
COVERAGE_OUTPUT_STYLE: 'clover'
4137
COVERAGE_CLOVER_FILE_PATH: 'build/coverage/clover.xml'
42-
PHPCS_REPORT_STYLE: 'checkstyle'
43-
PHPCS_REPORT_FILE: 'build/reports/cs-data'
4438
php:
4539
version: "7.1"
4640
timezone: UTC

.travis.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
language: php
22

33
php:
4-
- '7.0'
54
- '7.1'
65
- '7.2'
6+
- '7.3'
77

88
env:
99
global:
1010
CI: 'true'
1111
TEST_OUTPUT_STYLE: 'pretty'
1212
PHPCS_REPORT_STYLE: 'full'
1313
COMPOSER_OPTIONS: '--optimize-autoloader'
14+
matrix:
15+
- SYMFONY_VERSION: '~3.0'
16+
- SYMFONY_VERSION: '~4.0'
1417

1518
sudo: false
1619

@@ -19,9 +22,10 @@ matrix:
1922

2023
before_install:
2124
# remove xdebug to speed up build
22-
- phpenv config-rm xdebug.ini
25+
- phpenv config-rm xdebug.ini || true
2326

2427
install:
28+
- composer require symfony/http-kernel:$SYMFONY_VERSION symfony/dependency-injection:$SYMFONY_VERSION
2529
- make build
2630
script:
2731
- make test-technical

composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"description": "Symfony bundle for easy JSON-RPC server OpenAPI 3.0.0 documentation",
44
"license": "MIT",
55
"type": "library",
6+
"minimum-stability": "dev",
67
"support": {
78
"issues": "https://github.com/yoanm/symfony-jsonrpc-http-server-openapi-doc/issues"
89
},
@@ -25,13 +26,11 @@
2526
}
2627
},
2728
"require": {
28-
"php": ">=5.5",
29-
"yoanm/jsonrpc-server-doc-sdk": "dev-feature/improve",
30-
"yoanm/jsonrpc-http-server-openapi-doc-sdk": "dev-feature/improve",
31-
"yoanm/symfony-jsonrpc-http-server-doc": "dev-feature/improve",
32-
"symfony/http-foundation": "^3.0 || ^4.0",
29+
"php": ">=7.1",
30+
"yoanm/jsonrpc-server-doc-sdk": "dev-release/1.0.0",
31+
"yoanm/jsonrpc-http-server-openapi-doc-sdk": "dev-release/1.0.0",
32+
"yoanm/symfony-jsonrpc-http-server-doc": "dev-release/0.1.0",
3333
"symfony/http-kernel": "^3.0 || ^4.0",
34-
"symfony/config": "^3.0 || ^4.0",
3534
"symfony/dependency-injection": "^3.0 || ^4.0"
3635
},
3736
"require-dev": {

src/Event/OpenAPIDocCreatedEvent.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace Yoanm\SymfonyJsonRpcHttpServerOpenAPIDoc\Event;
33

4-
use Yoanm\JsonRpcServerDoc\Model\HttpServerDoc;
4+
use Yoanm\JsonRpcServerDoc\Domain\Model\HttpServerDoc;
55
use Yoanm\SymfonyJsonRpcHttpServerDoc\Event\DocEvent;
66

77
/**
@@ -17,11 +17,14 @@ class OpenAPIDocCreatedEvent extends DocEvent
1717
private $serverDoc;
1818

1919
/**
20-
* @param array $openAPIDoc
20+
* @param array $openAPIDoc
2121
* @param HttpServerDoc|null $serverDoc
2222
*/
23-
public function __construct(array $openAPIDoc, HttpServerDoc $serverDoc = null)
24-
{
23+
public function __construct(
24+
array $openAPIDoc,
25+
HttpServerDoc $serverDoc = null
26+
) {
27+
2528
$this->openAPIDoc = $openAPIDoc;
2629
$this->serverDoc = $serverDoc;
2730
}

src/Provider/DocProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
55
use Yoanm\JsonRpcHttpServerOpenAPIDoc\Normalizer\DocNormalizer;
6-
use Yoanm\JsonRpcServerDoc\Model\HttpServerDoc;
6+
use Yoanm\JsonRpcServerDoc\Domain\Model\HttpServerDoc;
77
use Yoanm\SymfonyJsonRpcHttpServerDoc\Creator\HttpServerDocCreator;
88
use Yoanm\SymfonyJsonRpcHttpServerDoc\Provider\DocProviderInterface;
99
use Yoanm\SymfonyJsonRpcHttpServerOpenAPIDoc\Event\OpenAPIDocCreatedEvent;

src/Resources/config/services.sdk.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ services:
3131
json_rpc_http_server_open_api_doc_sdk.normalizer.component.error:
3232
class: Yoanm\JsonRpcHttpServerOpenAPIDoc\Normalizer\Component\ErrorDocNormalizer
3333
arguments:
34-
- '@json_rpc_http_server_open_api_doc_sdk.resolver.definition_ref'
3534
- '@json_rpc_http_server_open_api_doc_sdk.normalizer.component.parameter_doc'
3635
- '@json_rpc_http_server_open_api_doc_sdk.normalizer.component.shape'
3736
json_rpc_http_server_open_api_doc_sdk.normalizer.component.external_schema_list:

0 commit comments

Comments
 (0)