Skip to content

Commit

Permalink
Updated gitattributes and PHP CS config
Browse files Browse the repository at this point in the history
  • Loading branch information
kocsismate committed Nov 15, 2015
1 parent 760e92f commit 6999f0f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Expand Up @@ -3,8 +3,11 @@
/examples export-ignore
/tests export-ignore
/vendor export-ignore
.coveralls.yml export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.scrutinizer.yml export-ignore
.travis.yml export-ignore
phpcs.xml export-ignore
phpunit.xml.dist export-ignore
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -29,7 +29,7 @@ install:
script:
- if [[ $EXECUTE_COVERAGE == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover coverage.clover ; fi
- if [[ $EXECUTE_COVERAGE != 'true' ]]; then ./vendor/bin/phpunit ; fi
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs; fi
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi

after_script:
- if [[ $EXECUTE_COVERAGE == 'true' ]]; then wget https://scrutinizer-ci.com/ocular.phar ; fi
Expand Down
4 changes: 3 additions & 1 deletion phpcs.xml
Expand Up @@ -2,13 +2,15 @@
<ruleset name="Woohoo Labs. Coding Standard">
<description>Woohoo Labs. Coding Standard</description>

<!-- Options -->
<arg value="p"/>
<arg name="colors"/>

<!-- Rules -->
<rule ref="PSR2"/>
<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>

<!-- Paths to check -->
<!-- Paths -->
<file>src</file>
<file>tests</file>
</ruleset>

0 comments on commit 6999f0f

Please sign in to comment.