Update the Wikibase CodeSniffer rule set to version 0.3

wmde · Feb 14, 2018 · d902764 · d902764
1 parent 46d0b09
commit d902764
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/phpcs.xml → .phpcs.xml b/phpcs.xml → .phpcs.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0"?>
-<ruleset name="WikibaseDataModelServices">
+<ruleset>
 	<rule ref="vendor/wikibase/wikibase-codesniffer/Wikibase" />
 
-	<rule ref="Generic.CodeAnalysis" />
-
 	<rule ref="Generic.Files.LineLength">
 		<properties>
 			<property name="lineLimit" value="120" />
@@ -14,7 +12,7 @@
 	<rule ref="Generic.Metrics.CyclomaticComplexity" />
 	<rule ref="Generic.Metrics.NestingLevel" />
 
-	<rule ref="PSR1" />
+	<rule ref="PSR1.Files.SideEffects" />
 	<rule ref="Squiz.Arrays.ArrayBracketSpacing" />
 	<rule ref="Squiz.Strings.DoubleQuoteUsage">
 		<exclude name="Squiz.Strings.DoubleQuoteUsage.ContainsVar" />

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
 	"require-dev": {
 		"phpmd/phpmd": "~2.3",
 		"phpunit/phpunit": "~4.8",
-		"wikibase/wikibase-codesniffer": "^0.1.0"
+		"wikibase/wikibase-codesniffer": "^0.3.0"
 	},
 	"autoload": {
 		"psr-4": {

diff --git a/tests/unit/Diff/Internal/AliasGroupListPatcherTest.php b/tests/unit/Diff/Internal/AliasGroupListPatcherTest.php
@@ -220,7 +220,7 @@ public function providePatchAliasGroupList() {
 				new AliasGroupList( [
 					new AliasGroup( 'en', [ 'foo', 'bar' ] ),
 					new AliasGroup( 'de', [ 'foo', 'baz' ] ),
-				    new AliasGroup( 'nl', [ 'bar', 'baz' ] )
+					new AliasGroup( 'nl', [ 'bar', 'baz' ] ),
 				] ),
 				new Diff( [
 					'en' => new Diff( [ new DiffOpRemove( 'foo' ), new DiffOpAdd( 'baz' ) ] ),

diff --git a/tests/unit/EntityId/EntityIdComposerTest.php b/tests/unit/EntityId/EntityIdComposerTest.php
@@ -12,7 +12,7 @@
 /**
  * @covers Wikibase\DataModel\Services\EntityId\EntityIdComposer
  *
- * @licence GNU GPL v2+
+ * @license GPL-2.0-or-later
  * @author Thiemo Kreuz
  */
 class EntityIdComposerTest extends PHPUnit_Framework_TestCase {