From e0197a6571e55d38ab22b883770e9639b8c4d205 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Mon, 3 Jun 2019 12:06:49 +0100 Subject: [PATCH] Tests on php 7.3 (#575) * Tests on php 7.3 * bumping php-cs-fixer version as per comment from @erayd on justinrainbow/json-schema#563 * turning yoda style off to preserve previous behaviour * some EOL versions of php require an older version of php-cs-fixer * attempting to normalise behaviour with php-cs-fixer 2.2 * attempt separate run of php 7.0 to avoid having xdebug loaded when running php-cs-fixer --- .php_cs.dist | 3 +++ .travis.yml | 5 ++++- composer.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.php_cs.dist b/.php_cs.dist index 0b5e2b2c..5a7a578e 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -21,8 +21,11 @@ $config 'phpdoc_order' => true, 'phpdoc_summary' => false, 'pre_increment' => false, + 'increment_style' => false, 'simplified_null_return' => false, 'trailing_comma_in_multiline_array' => false, + 'yoda_style' => false, + 'phpdoc_types_order' => array('null_adjustment' => 'none', 'sort_algorithm' => 'none'), )) ->setFinder($finder) ; diff --git a/.travis.yml b/.travis.yml index 3b4f5fc1..0d869178 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,12 @@ matrix: - php: 5.5 - php: 5.6 - php: 7.0 - env: WITH_COVERAGE=true WITH_PHPCSFIXER=true + env: WITH_COVERAGE=true + - php: 7.0 + env: WITH_PHPCSFIXER=true - php: 7.1 - php: 7.2 + - php: 7.3 - php: 'nightly' - php: hhvm dist: trusty diff --git a/composer.json b/composer.json index 07e57a72..8a2de30e 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "icecave/parity": "1.0.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.2.20", + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", "json-schema/JSON-Schema-Test-Suite": "1.2.0", "phpunit/phpunit": "^4.8.35" },