Skip to content

Commit

Permalink
Tests on php 7.3 (#575)
Browse files Browse the repository at this point in the history
* Tests on php 7.3
* bumping php-cs-fixer version as per comment from @erayd on #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
  • Loading branch information
SignpostMarv authored and erayd committed Jun 3, 2019
1 parent 775a4f5 commit e0197a6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .php_cs.dist
Original file line number Diff line number Diff line change
Expand Up @@ -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)
;
Expand Down
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down

0 comments on commit e0197a6

Please sign in to comment.