From b53084cbc7b4fe6ef0d270320ec4d2cc2229fc49 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 acc8698e..70e9aef1 100644
--- a/lib/Doctrine/ruleset.xml
+++ b/lib/Doctrine/ruleset.xml
@@ -619,8 +619,6 @@
     <rule ref="Squiz.Strings.DoubleQuoteUsage"/>
     <!-- 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 32e2b316f613d21296a662c860a1920fc232ab5f Mon Sep 17 00:00:00 2001
From: blue32a <blue32a.jp@gmail.com>
Date: Sat, 3 Oct 2020 20:05:52 +0900
Subject: [PATCH 2/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 70e9aef1..b43d5b51 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 -->
@@ -629,8 +631,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="Generic.WhiteSpace.LanguageConstructSpacing"/>
     <!-- Require space around logical operators -->

From 64a686bf5534d2c3999b6f131c2f6cc35d74cdeb Mon Sep 17 00:00:00 2001
From: Simon Podlipsky <simon@podlipsky.net>
Date: Tue, 21 Jul 2026 22:17:09 +0200
Subject: [PATCH 3/3] style(rules): sort language construct spacing

---
 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 b43d5b51..84204c4d 100644
--- a/lib/Doctrine/ruleset.xml
+++ b/lib/Doctrine/ruleset.xml
@@ -104,6 +104,8 @@
     <rule ref="Generic.PHP.SAPIUsage"/>
     <!-- Require there be no space between increment/decrement operator and its operand -->
     <rule ref="Generic.WhiteSpace.IncrementDecrementSpacing"/>
+    <!-- Require space after language constructs -->
+    <rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
     <!-- Forbid comments starting with # -->
     <rule ref="PEAR.Commenting.InlineComment"/>
     <!-- Disallow else if in favor of elseif -->
@@ -631,8 +633,6 @@
             <property name="spacingAfterLast" value="0"/>
         </properties>
     </rule>
-    <!-- Require space after language constructs -->
-    <rule ref="Generic.WhiteSpace.LanguageConstructSpacing"/>
     <!-- Require space around logical operators -->
     <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
     <!-- Forbid spaces around `->` operator -->