Skip to content

Commit 9d8e0eb

Browse files
yoanmyoanm
committed
Merge branch 'feature/sf5' of github.com:yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk into release/1.0.0
2 parents a741419 + 17391d9 commit 9d8e0eb

File tree

9 files changed

+39
-25
lines changed

9 files changed

+39
-25
lines changed

‎.github/CODEOWNERS‎

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

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@ vendor
22
build
33
#A library must not provide a composer.lock file
44
composer.lock
5+
6+
#Phpunit
7+
.phpunit.result.cache

‎.scrutinizer.yml‎

Lines changed: 14 additions & 4 deletions
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
@@ -37,7 +47,7 @@ build:
3747
COVERAGE_CLOVER_FILE_PATH: 'build/coverage/clover.xml'
3848
PHPCS_DISABLE_WARNING: "true"
3949
php:
40-
version: "7.1"
50+
version: "7.3"
4151
timezone: UTC
4252
postgresql: false
4353
redis: false

‎.travis.yml‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,29 @@
11
language: php
22

33
php:
4-
- '7.1'
54
- '7.2'
65
- '7.3'
76
- '7.4'
87

98
env:
109
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:
10+
- CI: 'true'
11+
- TEST_OUTPUT_STYLE: 'pretty'
12+
- PHPCS_REPORT_STYLE: 'full'
13+
- COMPOSER_OPTIONS: '--optimize-autoloader'
14+
jobs:
15+
- SYMFONY_VERSION: '~3.0'
16+
- SYMFONY_VERSION: '~4.0'
17+
18+
jobs:
2219
fast_finish: true
2320

2421
before_install:
2522
# remove xdebug to speed up build
2623
- phpenv config-rm xdebug.ini || true
2724

2825
install:
29-
- composer require symfony/validator:$SYMFONY_VERSION
26+
- composer require symfony/validator:$SYMFONY_VERSION symfony/intl:$SYMFONY_VERSION symfony/expression-language:$SYMFONY_VERSION
3027
- make build
3128
script:
3229
- make test-technical
@@ -41,3 +38,4 @@ branches:
4138
except:
4239
- /.*\-dev$/
4340
- /.*\-patch(\-\d+)?$/
41+
- /^dev-.*/

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,18 @@
44

55
[![Scrutinizer Build Status](https://img.shields.io/scrutinizer/build/g/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk.svg?label=Scrutinizer&logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk/build-status/master) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk/?branch=master) [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk/?branch=master)
66

7-
[![Travis Build Status](https://img.shields.io/travis/com/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk) <!-- NOT WORKING WITH travis-ci.com [![Travis PHP versions](https://img.shields.io/travis/php-v/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk.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/)
7+
[![Travis Build Status](https://img.shields.io/travis/com/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/php-jsonrpc-params-symfony-constraint-doc-sdk) <!-- NOT WORKING WITH travis-ci.com [![Travis PHP versions](https://img.shields.io/travis/php-v/yoanm/php-jsonrpc-params-symfony-constraint-doc-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://symfony.com/)
88

99
[![Latest Stable Version](https://img.shields.io/packagist/v/yoanm/jsonrpc-params-symfony-constraint-doc-sdk.svg)](https://packagist.org/packages/yoanm/jsonrpc-params-symfony-constraint-doc-sdk) [![Packagist PHP version](https://img.shields.io/packagist/php-v/yoanm/jsonrpc-params-symfony-constraint-doc-sdk.svg)](https://packagist.org/packages/yoanm/jsonrpc-params-symfony-constraint-doc-sdk)
1010

1111
PHP SDK to generate JSON-RPC documentation from symfony constraint
1212

1313
See [yoanm/symfony-jsonrpc-params-sf-constraints-doc](https://github.com/yoanm/symfony-jsonrpc-params-sf-constraints-doc) for automatic dependency injection.
1414

15+
## Versions
16+
- Symfony v3/4 PHP >=7.1 : `v0.x`
17+
- Symfony v4/5 PHP >=7.2 : `v1.0`
18+
1519
## How to use
1620

1721
Create the transformer :

‎composer.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,16 @@
3030
"yoanm/symfony-jsonrpc-http-server": "Symfony Bundle to convert an HTTP json-rpc request into HTTP json-rpc response"
3131
},
3232
"require": {
33-
"php": ">=7.1",
33+
"php": ">=7.2",
3434
"yoanm/jsonrpc-server-doc-sdk": "^0.2",
35-
"symfony/validator": "^3.0 || ^4.0"
35+
"symfony/validator": "^4.0 || ^5.0"
3636
},
3737
"require-dev": {
3838
"behat/behat": "~3.0",
3939
"squizlabs/php_codesniffer": "3.*",
4040
"phpunit/phpunit": "^7.0 || ^8.0",
41-
"yoanm/php-unit-extended": "^1.0"
41+
"yoanm/php-unit-extended": "^1.0",
42+
"symfony/intl": "^4.0 || ^5.0",
43+
"symfony/expression-language": "^4.0 || ^5.0"
4244
}
4345
}

‎features/02_string-constraints/email-constraint.feature‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ Feature: ConstraintToParamsDocTransformer - Email constraint
2525
"""
2626
use Symfony\Component\Validator\Constraints as ConstraintNS;
2727
return new ConstraintNS\Email([
28-
'checkMX' => false,
29-
'checkHost' => false,
3028
'payload' => [
3129
'documentation' => [
3230
'description' => 'description',

‎features/02_string-constraints/url-constraint.feature‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ Feature: ConstraintToParamsDocTransformer - Url constraint
2525
"""
2626
use Symfony\Component\Validator\Constraints as ConstraintNS;
2727
return new ConstraintNS\Url([
28-
'checkDNS' => true,
2928
'payload' => [
3029
'documentation' => [
3130
'type' => 'string',

‎features/06_file-constraints/url-constraint.feature‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ Feature: ConstraintToParamsDocTransformer - Url constraint
2626
use Symfony\Component\Validator\Constraints as ConstraintNS;
2727
return new ConstraintNS\Url([
2828
'protocols' => ['http'],
29-
'checkDNS' => true,
3029
'payload' => [
3130
'documentation' => [
3231
'description' => 'description',

0 commit comments

Comments
 (0)