Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge be62d46 into ffe57bf
Browse files Browse the repository at this point in the history
  • Loading branch information
Koopzington committed Nov 13, 2016
2 parents ffe57bf + be62d46 commit aa8e44c
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 24 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"composer/composer": ">=1.0.0-alpha10",
"phpunit/phpunit": "^4.7",
"roave/security-advisories": "dev-master",
"squizlabs/php_codesniffer": "^2.7",
"mikey179/vfsStream": "^1.6"
"mikey179/vfsStream": "^1.6",
"zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
"psr-4": {
Expand Down
33 changes: 31 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 1 addition & 20 deletions phpcs.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,6 @@
<?xml version="1.0"?>
<ruleset name="Zend Framework coding standard">
<description>Zend Framework coding standard</description>

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

<!-- inherit rules from: -->
<rule ref="PSR2"/>
<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
<rule ref="Generic.Formatting.SpaceAfterNot"/>
<rule ref="Squiz.WhiteSpace.OperatorSpacing">
<properties>
<property name="ignoreNewlines" value="true"/>
</properties>
</rule>
<rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
<properties>
<property name="ignoreBlankLines" value="false"/>
</properties>
</rule>
<rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml"/>

<!-- Paths to check -->
<file>src</file>
Expand Down

0 comments on commit aa8e44c

Please sign in to comment.