Merge pull request #1243 from PHPCSStandards/phpcs-4.x/feature/155-normalize-some-code-style-rules-5

CS: normalize code style rules [5]

Author: jrfnl

autoload.php

@@ -140,8 +140,7 @@ public static function load(string $className)
             }
 
             return false;
-
-        }//end load()
+        }
 
 
         /**
@@ -183,8 +182,7 @@ public static function loadFile(string $path)
             self::$loadedClasses[$path]    = $className;
             self::$loadedFiles[$className] = $path;
             return self::$loadedClasses[$path];
-
-        }//end loadFile()
+        }
 
 
         /**
@@ -244,8 +242,7 @@ static function ($remaining, $current) {
             }
 
             return $className;
-
-        }//end determineLoadedClass()
+        }
 
 
         /**
@@ -259,8 +256,7 @@ static function ($remaining, $current) {
         public static function addSearchPath(string $path, string $nsPrefix = '')
         {
             self::$searchPaths[$path] = rtrim(trim((string) $nsPrefix), '\\');
-
-        }//end addSearchPath()
+        }
 
 
         /**
@@ -271,8 +267,7 @@ public static function addSearchPath(string $path, string $nsPrefix = '')
         public static function getSearchPaths()
         {
             return self::$searchPaths;
-
-        }//end getSearchPaths()
+        }
 
 
         /**
@@ -290,8 +285,7 @@ public static function getLoadedClassName(string $path)
             }
 
             return self::$loadedClasses[$path];
-
-        }//end getLoadedClassName()
+        }
 
 
         /**
@@ -309,8 +303,7 @@ public static function getLoadedFileName(string $className)
             }
 
             return self::$loadedFiles[$className];
-
-        }//end getLoadedFileName()
+        }
 
 
         /**
@@ -321,8 +314,7 @@ public static function getLoadedFileName(string $className)
         public static function getLoadedClasses()
         {
             return self::$loadedClasses;
-
-        }//end getLoadedClasses()
+        }
 
 
         /**
@@ -333,11 +325,8 @@ public static function getLoadedClasses()
         public static function getLoadedFiles()
         {
             return self::$loadedFiles;
-
-        }//end getLoadedFiles()
-
-
-    }//end class
+        }
+    }
 
     // Register the autoloader before any existing autoloaders to ensure
     // it gets a chance to hear about every autoload request, and record

phpcs.xml.dist

@@ -37,7 +37,7 @@
     <!-- Include some sniffs from other standards that don't conflict with PEAR -->
     <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
     <rule ref="Squiz.Arrays.ArrayDeclaration"/>
-    <rule ref="Squiz.Commenting.ClosingDeclarationComment"/>
+    <rule ref="PSR12.Classes.ClosingBrace"/>
     <rule ref="Squiz.ControlStructures.ControlSignature"/>
     <rule ref="PSR2.ControlStructures.ElseIfDeclaration"/>
     <rule ref="Squiz.Commenting.BlockComment"/>
@@ -64,8 +64,15 @@
     <rule ref="Squiz.Strings.DoubleQuoteUsage.NotRequired"/>
     <rule ref="Generic.Strings.UnnecessaryHeredoc"/>
     <rule ref="Squiz.WhiteSpace.ControlStructureSpacing"/>
-    <rule ref="Squiz.WhiteSpace.FunctionClosingBraceSpace"/>
-    <rule ref="Squiz.WhiteSpace.FunctionSpacing"/>
+    <rule ref="Squiz.WhiteSpace.FunctionClosingBraceSpace">
+        <exclude name="Squiz.WhiteSpace.FunctionClosingBraceSpace.SpacingBeforeClose"/>
+    </rule>
+    <rule ref="PSR2.Methods.FunctionClosingBrace"/>
+    <rule ref="Squiz.WhiteSpace.FunctionSpacing">
+        <properties>
+            <property name="spacingAfterLast" value="0"/>
+        </properties>
+    </rule>
     <rule ref="Squiz.WhiteSpace.MemberVarSpacing"/>
     <rule ref="PSR12.Operators.OperatorSpacing"/>
     <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace"/>

requirements.php

@@ -69,5 +69,4 @@ function checkRequirements()
         fwrite(STDERR, sprintf($error, $required, $missing));
         exit($exitCode);
     }
-
-}//end checkRequirements()
+}

scripts/BuildRequirementsCheckMatrix.php

@@ -71,8 +71,7 @@ public function getBuilds()
         );
 
         return $builds;
-
-    }//end getBuilds()
+    }
 
 
     /**
@@ -105,8 +104,7 @@ private function getValidBuilds()
         }
 
         return $builds;
-
-    }//end getValidBuilds()
+    }
 
 
     /**
@@ -137,8 +135,7 @@ private function getInvalidPHPBuilds()
         }
 
         return $builds;
-
-    }//end getInvalidPHPBuilds()
+    }
 
 
     /**
@@ -181,8 +178,5 @@ private function getMissingExtensionsBuilds()
         }//end foreach
 
         return $builds;
-
-    }//end getMissingExtensionsBuilds()
-
-
-}//end class
+    }
+}

scripts/build-phar.php

@@ -75,8 +75,7 @@ function stripWhitespaceAndComments(string $fullpath, Config $config)
     }
 
     return $stripped;
-
-}//end stripWhitespaceAndComments()
+}
 
 
 Timing::startTiming();