Skip to content

Commit cddb084

Browse files
committed
Merge branch 'feature/fix-missing-deps' into release/0.3.0
2 parents d1420b9 + 9ef415c commit cddb084

File tree

6 files changed

+40
-24
lines changed

6 files changed

+40
-24
lines changed

.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @yoanm

.scrutinizer.yml

+13-3
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,28 @@ build_failure_conditions:
1111
build:
1212
dependencies:
1313
override:
14-
- make build
14+
-
15+
command: make build
16+
title: Build deps
1517
tests:
1618
stop_on_failure: true
1719
override:
1820
-
1921
command: make coverage
22+
title: Coverage
2023
idle_timeout: 1200
2124
coverage:
2225
file: 'build/coverage/clover.xml'
2326
format: 'php-clover'
24-
- php-scrutinizer-run --enable-security-analysis
25-
- make codestyle
27+
-
28+
command: make codestyle
29+
title: Code style
30+
-
31+
command: composer global require maglnet/composer-require-checker && composer-require-checker check composer.json
32+
title: Composer-require-checker
33+
-
34+
command: php-scrutinizer-run --enable-security-analysis
35+
title: Scrutinizer checks
2636
cache:
2737
directories:
2838
- ~/.composer

.travis.yml

+11-12
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,23 @@ php:
88

99
env:
1010
global:
11-
CI: 'true'
12-
TEST_OUTPUT_STYLE: 'pretty'
13-
PHPCS_REPORT_STYLE: 'full'
14-
COMPOSER_OPTIONS: '--optimize-autoloader'
15-
matrix:
16-
- SYMFONY_VERSION: '~3.0'
17-
- SYMFONY_VERSION: '~4.0'
18-
19-
sudo: false
20-
21-
matrix:
11+
- CI: 'true'
12+
- TEST_OUTPUT_STYLE: 'pretty'
13+
- PHPCS_REPORT_STYLE: 'full'
14+
- COMPOSER_OPTIONS: '--optimize-autoloader'
15+
jobs:
16+
- SYMFONY_VERSION: '~3.0'
17+
- SYMFONY_VERSION: '~4.0'
18+
19+
jobs:
2220
fast_finish: true
2321

2422
before_install:
2523
# remove xdebug to speed up build
2624
- phpenv config-rm xdebug.ini || true
2725

2826
install:
29-
- composer require symfony/http-kernel:$SYMFONY_VERSION symfony/dependency-injection:$SYMFONY_VERSION
27+
- composer require symfony/http-kernel:$SYMFONY_VERSION symfony/dependency-injection:$SYMFONY_VERSION symfony/config:$SYMFONY_VERSION symfony/routing:$SYMFONY_VERSION
3028
- make build
3129
script:
3230
- make test-technical
@@ -41,3 +39,4 @@ branches:
4139
except:
4240
- /.*\-dev$/
4341
- /.*\-patch(\-\d+)?$/
42+
- /^dev-.*/

composer.json

+13-7
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"support": {
77
"issues": "https://github.com/yoanm/symfony-jsonrpc-http-server-swagger-doc/issues"
88
},
9+
"config": {
10+
"sort-packages": true
11+
},
912
"authors": [
1013
{
1114
"name": "Yoanm",
@@ -30,19 +33,22 @@
3033
},
3134
"require": {
3235
"php": ">=7.1",
33-
"yoanm/jsonrpc-server-doc-sdk": "^0.2",
34-
"yoanm/jsonrpc-http-server-swagger-doc-sdk": "^0.2",
35-
"yoanm/symfony-jsonrpc-http-server-doc": "^0.2",
36+
"symfony/config": "^3.0 || ^4.0",
37+
"symfony/dependency-injection": "^3.0 || ^4.0",
38+
"symfony/event-dispatcher-contracts": "^1.0",
3639
"symfony/http-kernel": "^3.0 || ^4.0",
37-
"symfony/dependency-injection": "^3.0 || ^4.0"
40+
"yoanm/jsonrpc-http-server-swagger-doc-sdk": "^0.2",
41+
"yoanm/jsonrpc-server-doc-sdk": "^0.2",
42+
"yoanm/symfony-jsonrpc-http-server-doc": "^0.2"
3843
},
3944
"require-dev": {
4045
"behat/behat": "~3.0",
41-
"squizlabs/php_codesniffer": "3.*",
42-
"phpunit/phpunit": "^7.0 || ^8.0",
43-
"matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0",
4446
"matthiasnoback/symfony-config-test": "^3.0 || ^4.0",
47+
"matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0",
48+
"phpunit/phpunit": "^7.0 || ^8.0",
49+
"squizlabs/php_codesniffer": "3.*",
4550
"symfony/framework-bundle": "^3.0 || ^4.0",
51+
"symfony/routing": "^3.0 || ^4.0",
4652
"yoanm/php-unit-extended": "~1.0"
4753
}
4854
}

src/Provider/DocProvider.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
namespace Yoanm\SymfonyJsonRpcHttpServerSwaggerDoc\Provider;
33

4-
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
4+
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
55
use Yoanm\JsonRpcHttpServerSwaggerDoc\Infra\Normalizer\DocNormalizer;
66
use Yoanm\SymfonyJsonRpcHttpServerDoc\Creator\HttpServerDocCreator;
77
use Yoanm\SymfonyJsonRpcHttpServerDoc\Provider\DocProviderInterface;

tests/Functional/Provider/DocProviderTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use PHPUnit\Framework\TestCase;
55
use Prophecy\Argument;
66
use Prophecy\Prophecy\ObjectProphecy;
7-
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
7+
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
88
use Yoanm\JsonRpcHttpServerSwaggerDoc\Infra\Normalizer\DocNormalizer;
99
use Yoanm\JsonRpcServerDoc\Domain\Model\HttpServerDoc;
1010
use Yoanm\SymfonyJsonRpcHttpServerDoc\Creator\HttpServerDocCreator;

0 commit comments

Comments
 (0)