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

Switch to zendframework/zend-coding-standard #68

Merged
merged 5 commits into from
Oct 24, 2017
Merged

Switch to zendframework/zend-coding-standard #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d109792
Use outsourced coding standard
Koopzington Nov 9, 2016
650e90e
Remove description
Koopzington Nov 10, 2016
f498012
Remove dependency on php_codesniffer
Koopzington Nov 13, 2016
d859015
--colors options no longer needed
Koopzington Nov 13, 2016
6494cef
Add check script
Koopzington Nov 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"require-dev": {
"athletic/athletic": "~0.1",
"phpunit/PHPUnit": "~4.0",
"squizlabs/php_codesniffer": "^2.6.2"
"zendframework/zend-coding-standard": "~1.0.0"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can remove the dependency on php_codesniffer, as it's included in the zend-coding-standard. 😄

},
"extra": {
"branch-alias": {
Expand All @@ -33,8 +33,12 @@
}
},
"scripts": {
"cs-check": "phpcs --colors",
"cs-fix": "phpcbf --colors",
"check": [
"@cs-check",
"@test"
],
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
"upload-coverage": "coveralls -v"
Expand Down
21 changes: 1 addition & 20 deletions phpcs.xml
View file
Open in desktop
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