Skip to content

Commit 27cc889

Browse files
SignpostMarverayd
authored andcommitted
Tests on php 7.3 (jsonrainbow#575)
* Tests on php 7.3 * bumping php-cs-fixer version as per comment from @erayd on jsonrainbow#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
1 parent a98b698 commit 27cc889

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

.php_cs.dist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,11 @@ $config
2121
'phpdoc_order' => true,
2222
'phpdoc_summary' => false,
2323
'pre_increment' => false,
24+
'increment_style' => false,
2425
'simplified_null_return' => false,
2526
'trailing_comma_in_multiline_array' => false,
27+
'yoda_style' => false,
28+
'phpdoc_types_order' => array('null_adjustment' => 'none', 'sort_algorithm' => 'none'),
2629
))
2730
->setFinder($finder)
2831
;

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@ matrix:
1515
- php: 5.5
1616
- php: 5.6
1717
- php: 7.0
18-
env: WITH_COVERAGE=true WITH_PHPCSFIXER=true
18+
env: WITH_COVERAGE=true
19+
- php: 7.0
20+
env: WITH_PHPCSFIXER=true
1921
- php: 7.1
2022
- php: 7.2
23+
- php: 7.3
2124
- php: 'nightly'
2225
- php: hhvm
2326
dist: trusty

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"php": ">=5.3.3"
3131
},
3232
"require-dev": {
33-
"friendsofphp/php-cs-fixer": "~2.2.20",
33+
"friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1",
3434
"json-schema/JSON-Schema-Test-Suite": "1.2.0",
3535
"phpunit/phpunit": "^4.8.35"
3636
},

0 commit comments

Comments
 (0)