Normalise function/method spacing

composer.json

@@ -17,7 +17,7 @@
         "php": "^7.2",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.4 || ^0.5",
         "slevomat/coding-standard": "^5.0",
-        "squizlabs/php_codesniffer": "^3.3.2"
+        "squizlabs/php_codesniffer": "^3.4"
     },
     "require-dev": {
         "ext-mbstring": "*",

src/Libero/ruleset.xml

@@ -67,6 +67,14 @@
         <exclude name="Squiz.Strings.DoubleQuoteUsage.ContainsVar"/>
     </rule>
     <rule ref="Squiz.WhiteSpace.CastSpacing"/>
+    <rule ref="Squiz.WhiteSpace.FunctionOpeningBraceSpace"/>
+    <rule ref="Squiz.WhiteSpace.FunctionSpacing">
+        <properties>
+            <property name="spacing" value="1"/>
+            <property name="spacingBeforeFirst" value="0"/>
+            <property name="spacingAfterLast" value="0"/>
+        </properties>
+    </rule>
     <rule ref="Squiz.WhiteSpace.ObjectOperatorSpacing">
         <properties>
             <property name="ignoreNewlines" value="true"/>

tests/cases/classes/method-spacing

@@ -0,0 +1,52 @@
+---DESCRIPTION---
+Methods must not have unnecessary whitespace
+---FILENAME---
+Foo.php
+---CONTENTS---
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor;
+
+abstract class Foo
+{
+
+    public function bar() : void
+    {
+
+        $baz = 'qux';
+
+    }
+
+
+    abstract public function quux() : void;
+    public function quuz() : void
+    {
+
+    }
+
+}
+
+---FIXED---
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor;
+
+abstract class Foo
+{
+    public function bar() : void
+    {
+        $baz = 'qux';
+    }
+
+    abstract public function quux() : void;
+
+    public function quuz() : void
+    {
+    }
+}
+
+---

tests/cases/closures/spacing

@@ -0,0 +1,27 @@
+---DESCRIPTION---
+Closures must not have unnecessary whitespace
+---CONTENTS---
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor;
+
+$foo = function () : void {
+
+    $baz = 'qux';
+
+};
+
+---FIXED---
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor;
+
+$foo = function () : void {
+    $baz = 'qux';
+};
+
+---

tests/cases/functions/nested

@@ -16,4 +16,6 @@ function foo() : void
 
 ---MESSAGES---
 9:5 Squiz.PHP.InnerFunctions.NotAllowed
+---IGNORE-MESSAGES---
+11:5 Squiz.WhiteSpace.FunctionSpacing.After
 ---

tests/cases/functions/spacing

@@ -0,0 +1,48 @@
+---DESCRIPTION---
+Functions must not have unnecessary whitespace
+---CONTENTS---
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor;
+
+function foo() : void
+{
+
+    $bar = 'baz';
+
+}
+
+
+function qux() : void
+{
+
+
+}
+function quux() : void
+{
+
+}
+
+---FIXED---
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor;
+
+function foo() : void
+{
+    $bar = 'baz';
+}
+
+function qux() : void
+{
+}
+
+function quux() : void
+{
+}
+
+---

tests/cases/interfaces/method-spacing

@@ -0,0 +1,39 @@
+---DESCRIPTION---
+Methods must not have unnecessary whitespace
+---FILENAME---
+Foo.php
+---CONTENTS---
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor;
+
+interface Foo
+{
+
+    public function bar() : void;
+
+
+    public function quux() : void;
+    public function quuz() : void;
+
+}
+
+---FIXED---
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor;
+
+interface Foo
+{
+    public function bar() : void;
+
+    public function quux() : void;
+
+    public function quuz() : void;
+}
+
+---

tests/cases/trait/method-spacing

@@ -0,0 +1,52 @@
+---DESCRIPTION---
+Methods must not have unnecessary whitespace
+---FILENAME---
+Foo.php
+---CONTENTS---
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor;
+
+trait Foo
+{
+
+    public function bar() : void
+    {
+
+        $baz = 'qux';
+
+    }
+
+
+    abstract public function quux() : void;
+    public function quuz() : void
+    {
+
+    }
+
+}
+
+---FIXED---
+<?php
+
+declare(strict_types=1);
+
+namespace Vendor;
+
+trait Foo
+{
+    public function bar() : void
+    {
+        $baz = 'qux';
+    }
+
+    abstract public function quux() : void;
+
+    public function quuz() : void
+    {
+    }
+}
+
+---