Merge branch 'release/0.3.0'

yoanm · Mar 21, 2020 · 8ca0f70 · 8ca0f70
2 parents a347c89 + 6615f2a
commit 8ca0f70
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 24 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1 @@
+*       @yoanm
diff --git 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
@@ -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
@@ -1,32 +1,29 @@
 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'
-
-sudo: false
-
-matrix:
+    - CI: 'true'
+    - TEST_OUTPUT_STYLE: 'pretty'
+    - PHPCS_REPORT_STYLE: 'full'
+    - COMPOSER_OPTIONS: '--optimize-autoloader'
+  jobs:
+    - SYMFONY_VERSION: '~4.0'
+    - SYMFONY_VERSION: '~5.0'
+
+jobs:
   fast_finish: true
 
 before_install:
   # remove xdebug to speed up build
   - 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
@@ -41,3 +38,4 @@ branches:
   except:
   - /.*\-dev$/
   - /.*\-patch(\-\d+)?$/
+  - /^dev-.*$/
diff --git 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) <!-- NOT WORKING WITH travis-ci.com [![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) <!-- NOT WORKING WITH travis-ci.com [![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-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
@@ -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"
+    "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"
   },
   "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"
   }
 }