From a4ccc902851d8dfcccb2fe9165cd6815e5e4163c Mon Sep 17 00:00:00 2001 From: Yoanm Date: Sat, 21 Mar 2020 21:01:56 +0100 Subject: [PATCH 1/3] Symfony 5 compatibility --- .github/CODEOWNERS | 1 + .gitignore | 2 ++ .scrutinizer.yml | 2 +- .travis.yml | 22 +++++++++++----------- README.md | 2 +- composer.json | 11 ++++++----- 6 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 0000000..a88b281 --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @yoanm diff --git a/.gitignore b/.gitignore index 1b0f227..1456c2b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ build composer.lock # Behat demo app var directory features/demo_app/var +#Phpunit +.phpunit.result.cache diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 43423bf..326990e 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -36,7 +36,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 index fa814c1..68a1e00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,19 @@ language: php php: - - '7.1' - - '7.2' - - '7.3' - - '7.4' + - 7.2 + - 7.3 + - 7.4 env: global: - CI: 'true' - TEST_OUTPUT_STYLE: 'pretty' - PHPCS_REPORT_STYLE: 'full' - COMPOSER_OPTIONS: '--optimize-autoloader' - matrix: - - SYMFONY_VERSION: '~3.0' - - SYMFONY_VERSION: '~4.0' + - CI: 'true' + - TEST_OUTPUT_STYLE: 'pretty' + - PHPCS_REPORT_STYLE: 'full' + - COMPOSER_OPTIONS: '--optimize-autoloader' + jobs: + - SYMFONY_VERSION: '~3.0' + - SYMFONY_VERSION: '~4.0' sudo: false @@ -41,3 +40,4 @@ branches: except: - /.*\-dev$/ - /.*\-patch(\-\d+)?$/ + - /^dev-.*$/ diff --git a/README.md b/README.md index 343e72c..c3a6904 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Scrutinizer Build Status](https://img.shields.io/scrutinizer/build/g/yoanm/symfony-jsonrpc-params-validator.svg?label=Scrutinizer&logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-params-validator/build-status/master) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/yoanm/symfony-jsonrpc-params-validator/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-params-validator/?branch=master) [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/yoanm/symfony-jsonrpc-params-validator/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-params-validator/?branch=master) -[![Travis Build Status](https://img.shields.io/travis/com/yoanm/symfony-jsonrpc-params-validator/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/symfony-jsonrpc-params-validator) [![Travis Symfony Versions](https://img.shields.io/badge/Symfony-v3%20%2F%20v4-8892BF.svg?logo=travis)](https://php.net/) +[![Travis Build Status](https://img.shields.io/travis/com/yoanm/symfony-jsonrpc-params-validator/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/symfony-jsonrpc-params-validator) [![Travis PHP versions](https://img.shields.io/travis/php-v/yoanm/symfony-jsonrpc-params-validator.svg?logo=travis)](https://travis-ci.com/yoanm/symfony-jsonrpc-params-validator) [![Travis Symfony Versions](https://img.shields.io/badge/Symfony-v3%20%2F%20v4-8892BF.svg?logo=travis)](https://php.net/) [![Latest Stable Version](https://img.shields.io/packagist/v/yoanm/symfony-jsonrpc-params-validator.svg)](https://packagist.org/packages/yoanm/symfony-jsonrpc-params-validator) [![Packagist PHP version](https://img.shields.io/packagist/php-v/yoanm/symfony-jsonrpc-params-validator.svg)](https://packagist.org/packages/yoanm/symfony-jsonrpc-params-validator) diff --git a/composer.json b/composer.json index d8c1d77..dd0476c 100644 --- a/composer.json +++ b/composer.json @@ -30,12 +30,13 @@ "yoanm/symfony-jsonrpc-params-sf-constraints-doc": "To generate payload documentation from validation constraints" }, "require": { - "php": ">=7.1", + "php": ">=7.2", "yoanm/jsonrpc-server-sdk": "^3.0", "yoanm/symfony-jsonrpc-http-server": "^2.0", "yoanm/jsonrpc-params-symfony-validator-sdk": "^0.2", - "symfony/http-kernel": "^3.0 || ^4.0", - "symfony/dependency-injection": "^3.0 || ^4.0" + "symfony/http-kernel": "^4.0 || ^5.0", + "symfony/dependency-injection": "4.0 || 5.0", + "symfony/config": "4.0 || 5.0" }, "require-dev": { "ext-json": "*", @@ -44,8 +45,8 @@ "phpunit/phpunit": "^7.0 || ^8.0", "matthiasnoback/symfony-dependency-injection-test": "^3.0 || ^4.0", "matthiasnoback/symfony-config-test": "^3.0 || ^4.0", - "symfony/framework-bundle": "^3.0 || ^4.0", - "symfony/routing": "^3.0 || ^4.0", + "symfony/framework-bundle": "^4.0 || ^5.0", + "symfony/routing": "^4.0 || ^5.0", "yoanm/php-unit-extended": "~1.0" } } From 57e5f122c63967d3325d364858165794de416104 Mon Sep 17 00:00:00 2001 From: Yoanm Date: Sat, 21 Mar 2020 21:08:41 +0100 Subject: [PATCH 2/3] Fix travis config --- .travis.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 68a1e00..ab9bf7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,12 +12,10 @@ env: - PHPCS_REPORT_STYLE: 'full' - COMPOSER_OPTIONS: '--optimize-autoloader' jobs: - - SYMFONY_VERSION: '~3.0' - SYMFONY_VERSION: '~4.0' + - SYMFONY_VERSION: '~5.0' -sudo: false - -matrix: +jobs: fast_finish: true before_install: @@ -25,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 - make build script: - make test-technical From b97a226bdeb40407f263e1353d63538dd1f6c92a Mon Sep 17 00:00:00 2001 From: Yoanm Date: Sat, 21 Mar 2020 21:46:12 +0100 Subject: [PATCH 3/3] Fixes --- README.md | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c3a6904..6ffe656 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![Scrutinizer Build Status](https://img.shields.io/scrutinizer/build/g/yoanm/symfony-jsonrpc-params-validator.svg?label=Scrutinizer&logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-params-validator/build-status/master) [![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/yoanm/symfony-jsonrpc-params-validator/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-params-validator/?branch=master) [![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/yoanm/symfony-jsonrpc-params-validator/master.svg?logo=scrutinizer)](https://scrutinizer-ci.com/g/yoanm/symfony-jsonrpc-params-validator/?branch=master) -[![Travis Build Status](https://img.shields.io/travis/com/yoanm/symfony-jsonrpc-params-validator/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/symfony-jsonrpc-params-validator) [![Travis PHP versions](https://img.shields.io/travis/php-v/yoanm/symfony-jsonrpc-params-validator.svg?logo=travis)](https://travis-ci.com/yoanm/symfony-jsonrpc-params-validator) [![Travis Symfony Versions](https://img.shields.io/badge/Symfony-v3%20%2F%20v4-8892BF.svg?logo=travis)](https://php.net/) +[![Travis Build Status](https://img.shields.io/travis/com/yoanm/symfony-jsonrpc-params-validator/master.svg?label=Travis&logo=travis)](https://travis-ci.com/yoanm/symfony-jsonrpc-params-validator) [![Travis Symfony Versions](https://img.shields.io/badge/Symfony-v4%20%2F%20v5-8892BF.svg?logo=travis)](https://php.net/) [![Latest Stable Version](https://img.shields.io/packagist/v/yoanm/symfony-jsonrpc-params-validator.svg)](https://packagist.org/packages/yoanm/symfony-jsonrpc-params-validator) [![Packagist PHP version](https://img.shields.io/packagist/php-v/yoanm/symfony-jsonrpc-params-validator.svg)](https://packagist.org/packages/yoanm/symfony-jsonrpc-params-validator) diff --git a/composer.json b/composer.json index dd0476c..31f658f 100644 --- a/composer.json +++ b/composer.json @@ -33,7 +33,7 @@ "php": ">=7.2", "yoanm/jsonrpc-server-sdk": "^3.0", "yoanm/symfony-jsonrpc-http-server": "^2.0", - "yoanm/jsonrpc-params-symfony-validator-sdk": "^0.2", + "yoanm/jsonrpc-params-symfony-validator-sdk": "^0.3", "symfony/http-kernel": "^4.0 || ^5.0", "symfony/dependency-injection": "4.0 || 5.0", "symfony/config": "4.0 || 5.0"