Skip to content

Commit

Permalink
Merge pull request #26 from alongosz/update-php-cs-fixer-2.7.1
Browse files Browse the repository at this point in the history
EZP-28161: Update php-cs-fixer configuration to align with v2.7.1
  • Loading branch information
andrerom authored Jan 16, 2018
2 parents a6c07bb + 9629fb5 commit a5b7bb2
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .php_cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ return PhpCsFixer\Config::create()
'phpdoc_annotation_without_dot' => false,
'phpdoc_no_alias_tag' => false,
'space_after_semicolon' => false,
'yoda_style' => false,
'no_break_comment' => false,
])
->setRiskyAllowed(true)
->setFinder(
Expand Down
26 changes: 26 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
language: php

php:
- 7.1

# test only master and stable branches (+ Pull requests)
branches:
only:
- master
- /^\d.\d+$/

install:
# Disable XDebug for better performance
- phpenv config-rm xdebug.ini
# Avoid memory issues on composer install
- echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
# Get latest composer build
- travis_retry composer selfupdate
# Install packages
- travis_retry composer install --prefer-dist --no-interaction

script:
- vendor/bin/php-cs-fixer fix -v --dry-run --diff --show-progress=estimating

notifications:
email: false
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
},
"require-dev": {
"phpunit/phpunit": "~4.7",
"friendsofphp/php-cs-fixer": "^2.1"
"friendsofphp/php-cs-fixer": "~2.7.1"
},
"scripts": {
"fix-cs": "@php ./vendor/bin/php-cs-fixer fix -v --show-progress=estimating"
},
"extra": {
"branch-alias": {
Expand Down

0 comments on commit a5b7bb2

Please sign in to comment.