Skip to content

Commit

Permalink
Merge 86a9c40 into f1fc38e
Browse files Browse the repository at this point in the history
  • Loading branch information
jrfnl committed Sep 2, 2019
2 parents f1fc38e + 86a9c40 commit 023431f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ before_script:
- composer install --dev --prefer-dist --no-interaction

script:
- ./vendor/bin/phpcs --standard=ruleset.xml
- ./vendor/bin/phpcs
- ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=coverage.xml

after_success:
Expand Down
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"fzaninotto/faker": "^1.6",
"friendsofphp/php-cs-fixer": "^2.3",
"escapestudios/symfony2-coding-standard": "^3.0",
"wimg/php-compatibility": "^8.0"
"phpcompatibility/php-compatibility": "^9.0",
"dealerdirect/phpcodesniffer-composer-installer": "^0.5"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions ruleset.xml → phpcs.xml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

<exclude-pattern>vendor/</exclude-pattern>

<rule ref="vendor/wimg/php-compatibility/PHPCompatibility" />
<rule ref="./vendor/escapestudios/symfony2-coding-standard/Symfony">
<rule ref="PHPCompatibility" />
<rule ref="Symfony">
<exclude name="Symfony.ControlStructure.YodaConditions.Invalid"/>
</rule>

<config name="testVersion" value="5.5-7.1"/>
<config name="testVersion" value="5.6-"/>

<arg name="colors"/>
<arg name="encoding" value="utf-8"/>
Expand Down

0 comments on commit 023431f

Please sign in to comment.