Update CS rules

Author: JeroenDeDauw

composer.json

@@ -27,7 +27,7 @@
 		"data-values/data-values": "~0.1|~1.0"
 	},
 	"require-dev": {
-		"squizlabs/php_codesniffer": "~2.1",
+		"squizlabs/php_codesniffer": "~2.3",
 		"phpmd/phpmd": "~2.3"
 	},
 	"autoload": {

phpcs.xml

@@ -40,7 +40,6 @@
     </rule>
 
     <rule ref="Generic.NamingConventions" />
-    <!-- TODO: create variation of this sniff that allows underscores in test methods -->
     <rule ref="Generic.NamingConventions.CamelCapsFunctionName.ScopeNotCamelCaps">
         <severity>0</severity>
     </rule>
@@ -73,12 +72,22 @@
     <rule ref="Squiz.Functions.FunctionDuplicateArgument" />
     <rule ref="Squiz.Functions.GlobalFunction" />
     <rule ref="Squiz.Scope" />
+
+
+    <rule ref="Squiz.Strings.DoubleQuoteUsage" />
+    <rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
+        <severity>0</severity>
+    </rule>
+
     <rule ref="Squiz.WhiteSpace.CastSpacing" />
     <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing" />
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing" />
 
-    <!-- https://github.com/squizlabs/PHP_CodeSniffer/issues/348 -->
-    <!--<rule ref="Squiz.WhiteSpace.OperatorSpacing" />-->
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true" />
+        </properties>
+    </rule>
 
     <rule ref="Squiz.WhiteSpace.ScopeClosingBrace" />
     <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing" />

phpmd.xml

@@ -5,18 +5,18 @@
          xsi:noNamespaceSchemaLocation=" http://pmd.sf.net/ruleset_xml_schema.xsd">
 
     <rule ref="rulesets/codesize.xml">
-        <exclude name="TooManyMethods" />
         <exclude name="ExcessiveClassComplexity" />
     </rule>
-    <rule ref="rulesets/codesize.xml/TooManyMethods">
+
+    <rule ref="rulesets/controversial.xml">
+        <exclude name="CamelCaseMethodName" />
+    </rule>
+    <rule ref="rulesets/controversial.xml/CamelCaseMethodName">
         <properties>
-            <property name="maxmethods" value="20" />
+            <property name="allow-underscore-test" value="true" />
         </properties>
     </rule>
 
-    <!-- todo: exclude the camel case method rule for the tests -->
-    <rule ref="rulesets/controversial.xml" />
-
     <rule ref="rulesets/design.xml" />
 
     <rule ref="rulesets/naming.xml">

tests/unit/Entity/ItemTest.php

@@ -221,10 +221,10 @@ public function testSetClaims() {
 		$statements = array( $statement0, $statement1 );
 
 		$item->setClaims( new Claims( $statements ) );
-		$this->assertEquals( count( $statements ), $item->getStatements()->count(), "added some statements" );
+		$this->assertEquals( count( $statements ), $item->getStatements()->count(), 'added some statements' );
 
 		$item->setClaims( new Claims() );
-		$this->assertTrue( $item->getStatements()->isEmpty(), "should be empty again" );
+		$this->assertTrue( $item->getStatements()->isEmpty(), 'should be empty again' );
 	}
 
 

tests/unit/Entity/PropertyTest.php

@@ -244,10 +244,10 @@ public function testSetClaims() {
 		$statements = array( $statement0, $statement1 );
 
 		$property->setClaims( new Claims( $statements ) );
-		$this->assertEquals( count( $statements ), $property->getStatements()->count(), "added some statements" );
+		$this->assertEquals( count( $statements ), $property->getStatements()->count(), 'added some statements' );
 
 		$property->setClaims( new Claims() );
-		$this->assertTrue( $property->getStatements()->isEmpty(), "should be empty again" );
+		$this->assertTrue( $property->getStatements()->isEmpty(), 'should be empty again' );
 	}
 
 }

tests/unit/Statement/StatementTest.php

@@ -279,7 +279,7 @@ public function testGetAllSnaks( Statement $statement ) {
 			$c += count( $reference->getSnaks() );
 		}
 
-		$this->assertGreaterThanOrEqual( $c, count( $snaks ), "At least one snak per Qualifier and Reference" );
+		$this->assertGreaterThanOrEqual( $c, count( $snaks ), 'At least one snak per Qualifier and Reference' );
 	}
 
 	public function testGivenNonStatement_equalsReturnsFalse() {