From eabcc0665ad0832f5c2594547753edcb7c3d6481 Mon Sep 17 00:00:00 2001 From: SAMUEL NELA Date: Mon, 4 Feb 2019 23:29:36 +0100 Subject: [PATCH 1/6] Tests on php 7.3 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3b4f5fc1..664aa0ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ matrix: env: WITH_COVERAGE=true WITH_PHPCSFIXER=true - php: 7.1 - php: 7.2 + - php: 7.3 - php: 'nightly' - php: hhvm dist: trusty From 813ab97918c00af9c80b0291ba13e8212d3f6a75 Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Sun, 2 Jun 2019 21:21:52 +0100 Subject: [PATCH 2/6] bumping php-cs-fixer version as per comment from @erayd on justinrainbow/json-schema#563 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5d20e919..3acd46fd 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.15.1", "json-schema/JSON-Schema-Test-Suite": "1.2.0", "phpunit/phpunit": "^4.8.35" }, From 857e6b33c312548a531582924ac951351db3232f Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Sun, 2 Jun 2019 21:32:26 +0100 Subject: [PATCH 3/6] turning yoda style off to preserve previous behaviour --- .php_cs.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/.php_cs.dist b/.php_cs.dist index 0b5e2b2c..405f8cd6 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -23,6 +23,7 @@ $config 'pre_increment' => false, 'simplified_null_return' => false, 'trailing_comma_in_multiline_array' => false, + 'yoda_style' => false, )) ->setFinder($finder) ; From 17e29cee70640cf6a79bf701f949555dcf92d7bd Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Sun, 2 Jun 2019 21:38:45 +0100 Subject: [PATCH 4/6] some EOL versions of php require an older version of php-cs-fixer --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3acd46fd..b2e30be4 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "icecave/parity": "1.0.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "~2.15.1", + "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", "json-schema/JSON-Schema-Test-Suite": "1.2.0", "phpunit/phpunit": "^4.8.35" }, From c2245eaf935792b52b9f84b37bf472cd0380dedf Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Sun, 2 Jun 2019 21:45:34 +0100 Subject: [PATCH 5/6] attempting to normalise behaviour with php-cs-fixer 2.2 --- .php_cs.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.php_cs.dist b/.php_cs.dist index 405f8cd6..5a7a578e 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -21,9 +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) ; From 93d3747b9f7f372e580cb7bb2416e6d402c0134d Mon Sep 17 00:00:00 2001 From: SignpostMarv Date: Sun, 2 Jun 2019 21:58:13 +0100 Subject: [PATCH 6/6] attempt separate run of php 7.0 to avoid having xdebug loaded when running php-cs-fixer --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 664aa0ed..0d869178 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,9 @@ 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