Updated CodeSniffer to 2.6.0

slevomat · Apr 16, 2016 · 5e00f25 · 5e00f25
1 parent 5f35a7f
commit 5e00f25
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git a/SlevomatCodingStandard/ruleset.xml b/SlevomatCodingStandard/ruleset.xml
@@ -1,2 +1,6 @@
 <?xml version="1.0"?>
-<ruleset name="Slevomat Coding Standard" />
+<ruleset name="Slevomat Coding Standard">
+	<rule ref="Squiz.WhiteSpace.ControlStructureSpacing">
+		<exclude name="Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpenBrace"/><!-- errors on multiline ifs-->
+	</rule>
+</ruleset>
diff --git a/composer.json b/composer.json
@@ -7,8 +7,7 @@
 	},
 	"require": {
 		"php": "^5.6|^7.0",
-		"jakub-onderka/php-parallel-lint": "^0.9.2",
-		"squizlabs/php_codesniffer": "^2.6.0"
+		"jakub-onderka/php-parallel-lint": "^0.9.2"
 	},
 	"require-dev": {
 		"consistence/coding-standard": "^0.11.0",
@@ -24,11 +23,5 @@
 		"files": [
 			"vendor/consistence/coding-standard/tests/Sniffs/TestCase.php"
 		]
-	},
-	"repositories": [
-		{
-			"type": "vcs",
-			"url": "git@github.com:slevomat/PHP_CodeSniffer.git"
-		}
-	]
+	}
 }