From f2d7f872351c5abb515cf0c8aecc7cacac8333f7 Mon Sep 17 00:00:00 2001
From: blue32a <blue32a.jp@gmail.com>
Date: Sat, 3 Oct 2020 20:05:04 +0900
Subject: [PATCH 1/3] Removed duplicate rule

This is included in PSR-12.
---
 lib/Doctrine/ruleset.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/Doctrine/ruleset.xml b/lib/Doctrine/ruleset.xml
index c0bf70bd..3b66fdf3 100644
--- a/lib/Doctrine/ruleset.xml
+++ b/lib/Doctrine/ruleset.xml
@@ -521,8 +521,6 @@
     </rule>
     <!-- Forbid braces around string in `echo` -->
     <rule ref="Squiz.Strings.EchoedStrings"/>
-    <!-- Forbid spaces in type casts -->
-    <rule ref="Squiz.WhiteSpace.CastSpacing"/>
     <!-- Forbid blank line after function opening brace -->
     <rule ref="Squiz.WhiteSpace.FunctionOpeningBraceSpace"/>
     <!-- Require 1 line before and after function, except at the top and bottom -->

From 18e4ab3a6c877e726e97dbf334bf031578a94006 Mon Sep 17 00:00:00 2001
From: blue32a <blue32a.jp@gmail.com>
Date: Sat, 3 Oct 2020 20:05:19 +0900
Subject: [PATCH 2/3] Remove unnecessary exclusion

This is not included in PSR-12.
---
 lib/Doctrine/ruleset.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/Doctrine/ruleset.xml b/lib/Doctrine/ruleset.xml
index 3b66fdf3..3605ac52 100644
--- a/lib/Doctrine/ruleset.xml
+++ b/lib/Doctrine/ruleset.xml
@@ -21,8 +21,6 @@
         <exclude name="PSR12.Traits.UseDeclaration"/>
         <!-- checked by SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing.WhitespaceAfterNullabilitySymbol -->
         <exclude name="PSR12.Functions.NullableTypeDeclaration.WhitespaceFound"/>
-        <!-- checked by PSR12.ControlStructures.ControlStructureSpacing -->
-        <exclude name="PSR2.ControlStructures.ControlStructureSpacing.SpacingAfterOpenBrace"/>
     </rule>
 
     <!-- Force array element indentation with 4 spaces -->

From b2beffe5cb7ca5c6c3a4d217a6d632c1d91657b7 Mon Sep 17 00:00:00 2001
From: blue32a <blue32a.jp@gmail.com>
Date: Sat, 3 Oct 2020 20:05:52 +0900
Subject: [PATCH 3/3] Sorted the rules

---
 lib/Doctrine/ruleset.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Doctrine/ruleset.xml b/lib/Doctrine/ruleset.xml
index 3605ac52..693cdba6 100644
--- a/lib/Doctrine/ruleset.xml
+++ b/lib/Doctrine/ruleset.xml
@@ -102,6 +102,8 @@
     <rule ref="Generic.PHP.LowerCaseType"/>
     <!-- Forbid `php_sapi_name()` function -->
     <rule ref="Generic.PHP.SAPIUsage"/>
+    <!-- Require there be no space between increment/decrement operator and its operand -->
+    <rule ref="Generic.WhiteSpace.IncrementDecrementSpacing"/>
     <!-- Forbid comments starting with # -->
     <rule ref="PEAR.Commenting.InlineComment"/>
     <!-- Disallow else if in favor of elseif -->
@@ -529,8 +531,6 @@
             <property name="spacingAfterLast" value="0"/>
         </properties>
     </rule>
-    <!-- Require there be no space between increment/decrement operator and its operand -->
-    <rule ref="Generic.WhiteSpace.IncrementDecrementSpacing"/>
     <!-- Require space after language constructs -->
     <rule ref="Squiz.WhiteSpace.LanguageConstructSpacing"/>
     <!-- Require space around logical operators -->