Merge pull request #571 from wmde/functionSpacing

Add and fix PHPCS FunctionSpacing rule

Author: JeroenDeDauw

phpcs.xml

@@ -10,6 +10,7 @@
 
     <rule ref="Generic.Files.ByteOrderMark" />
     <rule ref="Generic.Files.EndFileNewline" />
+    <rule ref="Generic.Files.InlineHTML" />
     <rule ref="Generic.Files.LineEndings" />
     <rule ref="Generic.Files.LineLength">
         <properties>
@@ -18,6 +19,8 @@
         </properties>
     </rule>
     <rule ref="Generic.Files.OneClassPerFile" />
+    <rule ref="Generic.Files.OneInterfacePerFile" />
+    <rule ref="Generic.Files.OneTraitPerFile" />
 
     <rule ref="Generic.Formatting.DisallowMultipleStatements" />
 
@@ -41,7 +44,8 @@
 
     <rule ref="Generic.NamingConventions" />
     <rule ref="Generic.NamingConventions.CamelCapsFunctionName.ScopeNotCamelCaps">
-        <severity>0</severity>
+        <!-- Exclude test methods like "testGivenInvalidInput_methodThrowsException". -->
+        <exclude-pattern>tests.unit*Test\.php</exclude-pattern>
     </rule>
 
     <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
@@ -57,11 +61,13 @@
 
     <rule ref="PSR1" />
     <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
-        <severity>0</severity>
+        <!-- Exclude test methods like "testGivenInvalidInput_methodThrowsException". -->
+        <exclude-pattern>tests.unit*Test\.php</exclude-pattern>
     </rule>
 
     <rule ref="PSR2.Classes.PropertyDeclaration" />
     <rule ref="PSR2.ControlStructures.ElseIfDeclaration" />
+    <rule ref="PSR2.Files" />
     <rule ref="PSR2.Namespaces" />
 
     <rule ref="Squiz.Arrays.ArrayBracketSpacing" />
@@ -73,7 +79,6 @@
     <rule ref="Squiz.Functions.GlobalFunction" />
     <rule ref="Squiz.Scope" />
 
-
     <rule ref="Squiz.Strings.DoubleQuoteUsage" />
     <rule ref="Squiz.Strings.DoubleQuoteUsage.ContainsVar">
         <severity>0</severity>
@@ -82,13 +87,16 @@
     <rule ref="Squiz.WhiteSpace.CastSpacing" />
     <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing" />
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing" />
-
+    <rule ref="Squiz.WhiteSpace.FunctionSpacing">
+        <properties>
+            <property name="spacing" value="1" />
+        </properties>
+    </rule>
     <rule ref="Squiz.WhiteSpace.OperatorSpacing">
         <properties>
             <property name="ignoreNewlines" value="true" />
         </properties>
     </rule>
-
     <rule ref="Squiz.WhiteSpace.ScopeClosingBrace" />
     <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing" />
     <rule ref="Squiz.WhiteSpace.SemicolonSpacing" />

tests/unit/Entity/EntityTest.php

@@ -398,7 +398,6 @@ public function testSerialize( Entity $entity ) {
 		$this->assertEquals( $entity->getId(), $instance->getId() );
 	}
 
-
 	/**
 	 * @dataProvider instanceProvider
 	 * @param Entity $entity

tests/unit/Entity/ItemTest.php

@@ -233,7 +233,6 @@ public function testSetClaims() {
 		$this->assertTrue( $item->getStatements()->isEmpty(), 'should be empty again' );
 	}
 
-
 	public function testEmptyItemReturnsEmptySiteLinkList() {
 		$item = new Item();
 		$this->assertTrue( $item->getSiteLinkList()->isEmpty() );