Skip to content

Commit b76c3f5

Browse files
razvanphpsamdark
authored andcommitted
Bump to phpcs v3 (#37)
* replace custom rules with phpcs v3 ones * make sure we use the latest v3
1 parent 1047aae commit b76c3f5

File tree

4 files changed

+19
-72
lines changed

4 files changed

+19
-72
lines changed

Yii2/Sniffs/Files/SpacesAroundConcatSniff.php

-39
This file was deleted.

Yii2/Sniffs/Properties/PrivatePropertiesUnderscoreSniff.php

-29
This file was deleted.

Yii2/ruleset.xml

+18-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,24 @@
3131
<rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
3232

3333
<!-- If string doesn't contain variables or single quotes, use single quotes. -->
34-
<rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
35-
<!-- Not check variable substitution -->
36-
<severity>0</severity>
34+
<rule ref="Squiz.Strings.DoubleQuoteUsage.NotRequired"/>
35+
36+
<!-- Replaces Yii2_Sniffs_Files_SpacesAroundConcatSniff -->
37+
<rule ref="Squiz.Strings.ConcatenationSpacing">
38+
<properties>
39+
<property name="spacing" value="1" />
40+
<property name="ignoreNewlines" value="true" />
41+
</properties>
42+
</rule>
43+
44+
<!-- Replaces Yii2_Sniffs_Properties_PrivatePropertiesUnderscoreSniff -->
45+
<rule ref="Squiz.NamingConventions.ValidVariableName.PrivateNoUnderscore"/>
46+
47+
<!-- https://github.com/squizlabs/PHP_CodeSniffer/issues/1008 -->
48+
<rule ref="Squiz.ControlStructures.ControlSignature">
49+
<properties>
50+
<property name="requiredSpacesBeforeColon" value="0" />
51+
</properties>
3752
</rule>
3853

3954
<!-- Ignore for migrations. -->

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
},
5151
"require": {
5252
"php": ">=5.4.0",
53-
"squizlabs/php_codesniffer": ">=2.3.1 <3.0"
53+
"squizlabs/php_codesniffer": ">=3.2"
5454
}
5555
}

0 commit comments

Comments
 (0)