Skip to content

Commit 6534db6

Browse files
committed
Merge branch 'release/0.3.0'
2 parents f7ebdea + a904d0a commit 6534db6

File tree

4 files changed

+38
-23
lines changed

4 files changed

+38
-23
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @yoanm

.scrutinizer.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,27 @@ build_failure_conditions:
1111
build:
1212
dependencies:
1313
override:
14-
- make build
14+
- command: make build
15+
title: Build deps
1516
tests:
1617
stop_on_failure: true
1718
override:
1819
-
1920
command: make coverage
21+
title: Coverage
2022
idle_timeout: 1200
2123
coverage:
2224
file: 'build/coverage/clover.xml'
2325
format: 'php-clover'
24-
- php-scrutinizer-run --enable-security-analysis
25-
- make codestyle
26+
-
27+
command: make codestyle
28+
title: Code style
29+
-
30+
command: composer global require maglnet/composer-require-checker && composer-require-checker check composer.json
31+
title: Composer-require-checker
32+
-
33+
command: php-scrutinizer-run --enable-security-analysis
34+
title: Scrutinizer checks
2635
cache:
2736
directories:
2837
- ~/.composer

.travis.yml

Lines changed: 11 additions & 12 deletions
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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
"support": {
77
"issues": "https://github.com/yoanm/symfony-jsonrpc-params-sf-constraints-doc/issues"
88
},
9+
"config": {
10+
"sort-packages": true
11+
},
912
"authors": [
1013
{
1114
"name": "Yoanm",
@@ -30,21 +33,24 @@
3033
},
3134
"require": {
3235
"php": ">=7.1",
33-
"yoanm/jsonrpc-server-sdk": "^3.0",
34-
"yoanm/jsonrpc-params-symfony-validator-sdk": "^0.2",
35-
"yoanm/jsonrpc-params-symfony-constraint-doc-sdk": "^0.2",
36-
"yoanm/symfony-jsonrpc-http-server-doc": "^0.2",
36+
"symfony/config": "^3.0 || ^4.0",
37+
"symfony/dependency-injection": "^3.0 || ^4.0",
3738
"symfony/http-kernel": "^3.0 || ^4.0",
38-
"symfony/dependency-injection": "^3.0 || ^4.0"
39+
"yoanm/jsonrpc-params-symfony-constraint-doc-sdk": "^0.2",
40+
"yoanm/jsonrpc-params-symfony-validator-sdk": "^1.0",
41+
"yoanm/jsonrpc-server-doc-sdk": "^0.2",
42+
"yoanm/jsonrpc-server-sdk": "^3.0",
43+
"yoanm/symfony-jsonrpc-http-server-doc": "^0.2"
3944
},
4045
"require-dev": {
4146
"ext-json": "*",
4247
"behat/behat": "~3.0",
43-
"squizlabs/php_codesniffer": "3.*",
44-
"phpunit/phpunit": "^7.0 || ^8.0",
45-
"matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0",
4648
"matthiasnoback/symfony-config-test": "^3.0 || ^4.0",
49+
"matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0",
50+
"phpunit/phpunit": "^7.0 || ^8.0",
51+
"squizlabs/php_codesniffer": "3.*",
4752
"symfony/framework-bundle": "^3.0 || ^4.0",
53+
"symfony/routing": "^3.0 || ^4.0",
4854
"yoanm/php-unit-extended": "~1.0"
4955
}
5056
}

0 commit comments

Comments
 (0)