Skip to content

Commit

Permalink
Changed squizlabs/php_codesniffer to zendframework/zend-coding-standard
Browse files Browse the repository at this point in the history
  • Loading branch information
michalbundyra authored and weierophinney committed May 2, 2018
1 parent f290437 commit 1bb4b36
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 24 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"require-dev": {
"phpunit/phpunit": "^4.8 || ^5.0",
"squizlabs/php_codesniffer": "^2.7",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-escaper": "^2.5.2",
"zendframework/zend-http": "^2.5.4",
"zendframework/zend-inputfilter": "^2.7.2",
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.

23 changes: 2 additions & 21 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>
<ruleset name="Zend Framework Coding Standard">
<rule ref="./vendor/zendframework/zend-coding-standard/ruleset.xml"/>

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

0 comments on commit 1bb4b36

Please sign in to comment.