Merge pull request #17 from PHPCSStandards/feature/minor-ruleset-tweak

Ruleset: prevent sniff conflict

Author: jrfnl

PHPCSDev/ruleset.xml

@@ -46,6 +46,10 @@
         <!-- Allow for the first condition of a multi-line control structure to be on the same line
              as the control structure keyword. -->
         <exclude name="PSR12.ControlStructures.ControlStructureSpacing.FirstExpressionLine"/>
+
+        <!-- This standard enforces a blank line before each function, which conflicts with this
+             PHPCS 3.6.2+ PSR12 sniff when a function is the first content of a class. -->
+        <exclude name="PSR12.Classes.OpeningBraceSpace.Found"/>
     </rule>
 
 

composer.json

@@ -21,7 +21,7 @@
     },
     "require" : {
         "php" : ">=5.4",
-        "squizlabs/php_codesniffer" : "^3.5.0",
+        "squizlabs/php_codesniffer" : "^3.6.2",
         "phpcompatibility/php-compatibility" : "^9.0.0 || ^10.0.0",
         "dealerdirect/phpcodesniffer-composer-installer" : "^0.4.1 || ^0.5 || ^0.6.2 || ^0.7"
     },