Bump to phpcs v3 (#37)

* replace custom rules with phpcs v3 ones * make sure we use the latest v3
yiisoft · Sep 4, 2018 · b76c3f5 · b76c3f5
1 parent 1047aae
commit b76c3f5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 72 deletions.
diff --git a/Yii2/Sniffs/Files/SpacesAroundConcatSniff.php b/Yii2/Sniffs/Files/SpacesAroundConcatSniff.php
diff --git a/Yii2/Sniffs/Properties/PrivatePropertiesUnderscoreSniff.php b/Yii2/Sniffs/Properties/PrivatePropertiesUnderscoreSniff.php
diff --git a/Yii2/ruleset.xml b/Yii2/ruleset.xml
@@ -31,9 +31,24 @@
     <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
 
     <!-- If string doesn't contain variables or single quotes, use single quotes. -->
-    <rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
-        <!-- Not check variable substitution -->
-        <severity>0</severity>
+    <rule ref="Squiz.Strings.DoubleQuoteUsage.NotRequired"/>
+
+    <!-- Replaces Yii2_Sniffs_Files_SpacesAroundConcatSniff -->
+    <rule ref="Squiz.Strings.ConcatenationSpacing">
+        <properties>
+            <property name="spacing" value="1" />
+            <property name="ignoreNewlines" value="true" />
+        </properties>
+    </rule>
+
+    <!-- Replaces Yii2_Sniffs_Properties_PrivatePropertiesUnderscoreSniff -->
+    <rule ref="Squiz.NamingConventions.ValidVariableName.PrivateNoUnderscore"/>
+
+    <!-- https://github.com/squizlabs/PHP_CodeSniffer/issues/1008 -->
+    <rule ref="Squiz.ControlStructures.ControlSignature">
+        <properties>
+            <property name="requiredSpacesBeforeColon" value="0" />
+        </properties>
     </rule>
 
     <!-- Ignore for migrations. -->

diff --git a/composer.json b/composer.json
@@ -50,6 +50,6 @@
 	},
 	"require": {
 		"php": ">=5.4.0",
-		"squizlabs/php_codesniffer": ">=2.3.1 <3.0"
+		"squizlabs/php_codesniffer": ">=3.2"
 	}
 }