Skip to content
This repository was archived by the owner on Aug 16, 2024. It is now read-only.

Commit 0601190

Browse files
committed
Merge branch 'prettyci'
2 parents 4b66fe0 + 737cfea commit 0601190

File tree

4 files changed

+15
-13
lines changed

4 files changed

+15
-13
lines changed

.prettyci.composer.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"require-dev": {
3+
"automattic/vipwpcs": "dev-master",
4+
"wp-coding-standards/wpcs": "^1.0"
5+
}
6+
}

.travis.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ env:
2525
matrix:
2626
allow_failures:
2727
- php: nightly
28-
fast_finish: true
28+
fast_finish: true
2929

3030
before_install:
3131
- phpenv config-rm xdebug.ini || true
@@ -47,6 +47,3 @@ jobs:
4747
php: 7.1
4848
- stage: test
4949
php: nightly
50-
- stage: sniff
51-
php: 7.2
52-
script: composer check-style

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,11 @@
6363
}
6464
},
6565
"scripts": {
66-
"check-style": "phpcs --standard=ruleset.xml --colors -p -s .",
66+
"check-style": "phpcs --colors -p",
6767
"pretag": [
6868
"composer update",
6969
"@test",
70+
"@check-style",
7071
"composer normalize",
7172
"doctoc README.md",
7273
"github_changelog_generator --no-verbose"

ruleset.xml renamed to phpcs.xml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<?xml version="1.0"?>
2-
<ruleset name="PSR 2 plus WordPress Coding Standards">
3-
4-
<description>PSR 2 plus WordPress Coding Standards</description>
5-
6-
<config name="installed_paths" value="vendor/wp-coding-standards/wpcs,vendor/automattic/vipwpcs"/>
7-
<config name="minimum_supported_wp_version" value="4.9"/>
8-
2+
<ruleset name="PSR2PlusWordPress">
93
<file>./</file>
104
<exclude-pattern>/tests/*</exclude-pattern>
115
<exclude-pattern>/vendor/*</exclude-pattern>
126

13-
<rule ref="PSR2"/>
7+
<arg value="s"/>
8+
<config name="installed_paths" value="vendor/wp-coding-standards/wpcs,vendor/automattic/vipwpcs"/>
9+
<config name="minimum_supported_wp_version" value="4.9"/>
1410

11+
<rule ref="PSR2"/>
12+
<rule ref="WordPressVIPMinimum"/>
1513
<rule ref="WordPress">
1614
<exclude name="Generic.Classes.OpeningBraceSameLine.BraceOnNewLine"/>
1715
<exclude name="Generic.Formatting.MultipleStatementAlignment.NotSameWarning"/>

0 commit comments

Comments
 (0)