Use PSR12

Author: BafS

Proton/ruleset.xml

@@ -4,21 +4,15 @@
         Proton PHP Coding Standard
     </description>
 
-    <rule ref="PSR2">
+    <rule ref="PSR12">
         <!-- Checked by SlevomatCodingStandard.Namespaces.UseSpacing -->
         <exclude name="PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse"/>
         <!-- Checked by SlevomatCodingStandard.Namespaces.NamespaceSpacing -->
         <exclude name="PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"/>
+        <exclude name="PSR12.Files.FileHeader.SpacingAfterBlock"/>
+        <exclude name="PSR12.ControlStructures.ControlStructureSpacing.FirstExpressionLine"/> <!-- Clashes with PSR2 SpacingAfterOpenBrace -->
     </rule>
 
-    <rule ref="PSR2.Namespaces.UseDeclaration">
-        <!-- Allows compound namespaces -->
-        <exclude-pattern>*</exclude-pattern>
-    </rule>
-
-    <rule ref="PSR12.Namespaces.CompoundNamespaceDepth"/>
-    <rule ref="PSR12.Functions.NullableTypeDeclaration"/>
-
     <rule ref="PEAR.Commenting.InlineComment"/>
 
     <rule ref="Generic.Commenting.Todo"/>
@@ -33,6 +27,7 @@
     <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
     <rule ref="Generic.Classes.DuplicateClassName"/>
     <rule ref="Generic.WhiteSpace.IncrementDecrementSpacing"/>
+    <rule ref="Generic.WhiteSpace.SpreadOperatorSpacingAfter"/>
     <rule ref="Generic.VersionControl.GitMergeConflict"/>
     <rule ref="Generic.Files.OneClassPerFile"/>
     <rule ref="Generic.Files.OneInterfacePerFile"/>
@@ -168,6 +163,15 @@
     <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
     <rule ref="SlevomatCodingStandard.Arrays.TrailingArrayComma"/>
 
+    <!-- Require presence of declare(strict_types=1) -->
+    <rule ref="SlevomatCodingStandard.TypeHints.DeclareStrictTypes">
+        <properties>
+            <property name="newlinesCountBetweenOpenTagAndDeclare" value="2"/>
+            <property name="spacesCountAroundEqualsSign" value="0"/>
+            <property name="newlinesCountAfterDeclare" value="2"/>
+        </properties>
+    </rule>
+
     <!-- <rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit">
         <properties>
             <property name="ignoreStandaloneIfInScope" value="0"/>

composer.json

@@ -1,17 +1,18 @@
 {
     "name": "protonlabs/php-coding-standard",
-    "description": "ProtonMail Coding Standard",
+    "description": "ProtonLabs Coding Standard",
     "type": "phpcodesniffer-standard",
     "keywords": [
-        "php-codesniffer", "coding-standard"
+        "php-codesniffer",
+        "coding-standard"
     ],
     "homepage": "https://github.com/ProtonMail/php-coding-standard",
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
         "php": "^7.1",
         "slevomat/coding-standard": "^5.0",
-        "squizlabs/php_codesniffer": "^3.4"
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "license": "MIT"
 }