From 5a0186f3e4989dc08f48d7bad69501d7e47cdf99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Sat, 23 Dec 2023 11:41:18 +0100
Subject: [PATCH 01/21] Add the documentation for the PSR12 Control Structure
 Spacing sniff

---
 .../ControlStructureSpacingStandard.xml       | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
new file mode 100644
index 0000000000..fe1a24cf7d
--- /dev/null
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -0,0 +1,114 @@
+<documentation title="Control Structure Spacing">
+    <standard>
+    <![CDATA[
+    Control structures MUST have correct spacing.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: No space after the opening parenthesis.">
+        <![CDATA[
+if ($expr) {
+}
+        ]]>
+        </code>
+        <code title="Invalid: Space after the opening parenthesis.">
+        <![CDATA[
+if (<em> </em>$expr) {
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: No space before the closing parenthesis.">
+        <![CDATA[
+if ($expr) {
+}
+        ]]>
+        </code>
+        <code title="Invalid: Space before the closing parenthesis.">
+        <![CDATA[
+if ($expr<em> </em>) {
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: Each line in a multi-line control structure indented at least once. Default indentation is 4 spaces.">
+        <![CDATA[
+while (
+<em>    </em>$expr1
+<em>    </em>&& $expr2
+) {
+}
+        ]]>
+        </code>
+        <code title="Invalid: Some lines in a multi-line control structure not indented correctly.">
+        <![CDATA[
+while (
+<em></em>$expr1
+    && $expr2
+<em>  </em>&& $expr3
+) {
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: First expression of a multi-line control structure is on the line after the opening parenthesis.">
+        <![CDATA[
+while (
+    $expr1
+    && $expr2
+) {
+}
+        ]]>
+        </code>
+        <code title="Invalid: First expression of a multi-line control structure is on the same line as the opening parenthesis.">
+        <![CDATA[
+while (<em></em>$expr1
+    && $expr2
+) {
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: The closing parenthesis of a multi-line control structure is on the line after the last expression.">
+        <![CDATA[
+while (
+    $expr1
+    && $expr2
+<em>)</em> {
+}
+        ]]>
+        </code>
+        <code title="Invalid: The closing parenthesis of a multi-line control structure is on the same line as the last expression.">
+        <![CDATA[
+while (
+    $expr1
+    && $expr2<em>)</em> {
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <code_comparison>
+        <code title="Valid: The closing parenthesis of a multi-line control structure is indented to the same level as start of the control structure.">
+        <![CDATA[
+while (
+    $expr1
+    && $expr2
+) {
+}
+        ]]>
+        </code>
+        <code title="Invalid: The closing parenthesis of a multi-line control structure is not indented to the same level as start of the control structure.">
+        <![CDATA[
+while (
+    $expr1
+    && $expr2
+<em>  </em>) {
+}
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From f4fabf185bf576e02a1bdc99d475d8b459687518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:31:05 +0100
Subject: [PATCH 02/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index fe1a24cf7d..70e3b8481b 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -7,7 +7,7 @@
     <code_comparison>
         <code title="Valid: No space after the opening parenthesis.">
         <![CDATA[
-if ($expr) {
+if <em>(</em>$expr) {
 }
         ]]>
         </code>

From 62cd3765a1606478ae0634cb994e62b55ec29d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:31:20 +0100
Subject: [PATCH 03/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index 70e3b8481b..eb5ab7c61e 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -13,7 +13,7 @@ if <em>(</em>$expr) {
         </code>
         <code title="Invalid: Space after the opening parenthesis.">
         <![CDATA[
-if (<em> </em>$expr) {
+if <em>( </em>$expr) {
 }
         ]]>
         </code>

From baf28e9f790f3eea1f3bee05ad6fd540861bd829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:31:27 +0100
Subject: [PATCH 04/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index eb5ab7c61e..9b4d1ff337 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -5,7 +5,7 @@
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: No space after the opening parenthesis.">
+        <code title="Valid: No space after the opening parenthesis in a single-line condition.">
         <![CDATA[
 if <em>(</em>$expr) {
 }

From 5961ed89c367cf6c80d57fb58ba83db3d2aaaaeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:31:35 +0100
Subject: [PATCH 05/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index 9b4d1ff337..d0d27340e7 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -11,7 +11,7 @@ if <em>(</em>$expr) {
 }
         ]]>
         </code>
-        <code title="Invalid: Space after the opening parenthesis.">
+        <code title="Invalid: Space after the opening parenthesis in a single-line condition.">
         <![CDATA[
 if <em>( </em>$expr) {
 }

From e2f79ab05f2031aaf519564e2656eb2fe48ce980 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:31:41 +0100
Subject: [PATCH 06/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index d0d27340e7..dfdcff6e01 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -92,7 +92,7 @@ while (
         </code>
     </code_comparison>
     <code_comparison>
-        <code title="Valid: The closing parenthesis of a multi-line control structure is indented to the same level as start of the control structure.">
+        <code title="Valid: The closing parenthesis of a multi-line control structure condition block is indented to the same level as start of the control structure.">
         <![CDATA[
 while (
     $expr1

From 4ac58b1f0b4c59e50e80edc24e9f2e72de8471d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:31:52 +0100
Subject: [PATCH 07/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index dfdcff6e01..139f6c6b83 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -19,7 +19,7 @@ if <em>( </em>$expr) {
         </code>
     </code_comparison>
     <code_comparison>
-        <code title="Valid: No space before the closing parenthesis.">
+        <code title="Valid: No space before the closing parenthesis in a single-line condition.">
         <![CDATA[
 if ($expr) {
 }

From c14c5dd16289549b6b3e94486c4867299e0ee257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 14:34:48 +0100
Subject: [PATCH 08/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index 139f6c6b83..b894a68950 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -101,7 +101,7 @@ while (
 }
         ]]>
         </code>
-        <code title="Invalid: The closing parenthesis of a multi-line control structure is not indented to the same level as start of the control structure.">
+        <code title="Invalid: The closing parenthesis of a multi-line control structure condition block is not indented to the same level as start of the control structure.">
         <![CDATA[
 while (
     $expr1

From 8041c8bc510b55094bfa77321ac90197534e2e34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 15:04:11 +0100
Subject: [PATCH 09/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index b894a68950..ea84618180 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -25,7 +25,7 @@ if ($expr) {
 }
         ]]>
         </code>
-        <code title="Invalid: Space before the closing parenthesis.">
+        <code title="Invalid: Space before the closing parenthesis in a single-line condition.">
         <![CDATA[
 if ($expr<em> </em>) {
 }

From a57752b7c1b5d809eeb01589cd9af40016279549 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 15:22:22 +0100
Subject: [PATCH 10/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index ea84618180..24d9f7b883 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -21,7 +21,7 @@ if <em>( </em>$expr) {
     <code_comparison>
         <code title="Valid: No space before the closing parenthesis in a single-line condition.">
         <![CDATA[
-if ($expr) {
+if <em>(</em>$expr) {
 }
         ]]>
         </code>

From 0b63cb0890ddef0e8996e20f1a85c28139688b9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:10:33 +0100
Subject: [PATCH 11/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index 24d9f7b883..3196f6c1cc 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -33,7 +33,7 @@ if ($expr<em> </em>) {
         </code>
     </code_comparison>
     <code_comparison>
-        <code title="Valid: Each line in a multi-line control structure indented at least once. Default indentation is 4 spaces.">
+        <code title="Valid: Each line in a multi-line control structure condition block indented at least once. Default indentation is 4 spaces.">
         <![CDATA[
 while (
 <em>    </em>$expr1

From 1bf2c2796b33ac6a3b68458dc300bf39c39f1645 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:10:59 +0100
Subject: [PATCH 12/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index 3196f6c1cc..5e20c070f3 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -42,7 +42,7 @@ while (
 }
         ]]>
         </code>
-        <code title="Invalid: Some lines in a multi-line control structure not indented correctly.">
+        <code title="Invalid: Some lines in a multi-line control structure condition block not indented correctly.">
         <![CDATA[
 while (
 <em></em>$expr1

From f6ec02bf78b93047f24fc3ae19e34af5e5fd51f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:11:09 +0100
Subject: [PATCH 13/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index 5e20c070f3..0ff34241fe 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -54,7 +54,7 @@ while (
         </code>
     </code_comparison>
     <code_comparison>
-        <code title="Valid: First expression of a multi-line control structure is on the line after the opening parenthesis.">
+        <code title="Valid: First expression of a multi-line control structure condition block is on the line after the opening parenthesis.">
         <![CDATA[
 while (
     $expr1

From 383618b29cc4f7da1e541998ef3b99aef77aff9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:11:19 +0100
Subject: [PATCH 14/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index 0ff34241fe..9907cef671 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -63,7 +63,7 @@ while (
 }
         ]]>
         </code>
-        <code title="Invalid: First expression of a multi-line control structure is on the same line as the opening parenthesis.">
+        <code title="Invalid: First expression of a multi-line control structure condition block is on the same line as the opening parenthesis.">
         <![CDATA[
 while (<em></em>$expr1
     && $expr2

From cdeef4dcf94d0c514a9a88a030201fcf73564de6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:11:39 +0100
Subject: [PATCH 15/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index 9907cef671..860e83d91e 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -73,7 +73,7 @@ while (<em></em>$expr1
         </code>
     </code_comparison>
     <code_comparison>
-        <code title="Valid: The closing parenthesis of a multi-line control structure is on the line after the last expression.">
+        <code title="Valid: The closing parenthesis of a multi-line control structure condition block is on the line after the last expression.">
         <![CDATA[
 while (
     $expr1

From c62e10f4197a74d2e5053df6d692b21ebcd66681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Wed, 17 Jan 2024 18:11:52 +0100
Subject: [PATCH 16/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index 860e83d91e..aabe756f83 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -82,7 +82,7 @@ while (
 }
         ]]>
         </code>
-        <code title="Invalid: The closing parenthesis of a multi-line control structure is on the same line as the last expression.">
+        <code title="Invalid: The closing parenthesis of a multi-line control structure condition block is on the same line as the last expression.">
         <![CDATA[
 while (
     $expr1

From a1795c1eebaf0063f4a70185eba6f2e2b8a31f40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Thu, 18 Jan 2024 10:42:36 +0100
Subject: [PATCH 17/21] Improve readability of the documentation

Added emphasis as per PR review and added additional standards so that the documentation is easier to read (split by logic as suggested in the PR review).
---
 .../ControlStructureSpacingStandard.xml       | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index aabe756f83..6ba3481475 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Control Structure Spacing">
     <standard>
     <![CDATA[
-    Control structures MUST have correct spacing.
+    The control structures must have one space after the control structure keyword, no spaces after the opening parenthesis and before the closing parenthesis, and one space between the closing parenthesis and the opening brace.
     ]]>
     </standard>
     <code_comparison>
@@ -32,46 +32,56 @@ if ($expr<em> </em>) {
         ]]>
         </code>
     </code_comparison>
+    <standard>
+    <![CDATA[
+    The body of the multi-line control structure must be indented once, placing the body on the next line after the opening brace.
+    ]]>
+    </standard>
     <code_comparison>
-        <code title="Valid: Each line in a multi-line control structure condition block indented at least once. Default indentation is 4 spaces.">
+        <code title="Valid: First expression of a multi-line control structure condition block is on the line after the opening parenthesis.">
         <![CDATA[
 while (
-<em>    </em>$expr1
-<em>    </em>&& $expr2
+    <em>$expr1</em>
+    && $expr2
 ) {
 }
         ]]>
         </code>
-        <code title="Invalid: Some lines in a multi-line control structure condition block not indented correctly.">
+        <code title="Invalid: First expression of a multi-line control structure condition block is on the same line as the opening parenthesis.">
         <![CDATA[
-while (
-<em></em>$expr1
+while (<em></em>$expr1
     && $expr2
-<em>  </em>&& $expr3
 ) {
 }
         ]]>
         </code>
     </code_comparison>
     <code_comparison>
-        <code title="Valid: First expression of a multi-line control structure condition block is on the line after the opening parenthesis.">
+        <code title="Valid: Each line in a multi-line control structure condition block indented at least once. Default indentation is 4 spaces.">
         <![CDATA[
 while (
-    $expr1
-    && $expr2
+<em>    </em>$expr1
+<em>    </em>&& $expr2
 ) {
 }
         ]]>
         </code>
-        <code title="Invalid: First expression of a multi-line control structure condition block is on the same line as the opening parenthesis.">
+        <code title="Invalid: Some lines in a multi-line control structure condition block not indented correctly.">
         <![CDATA[
-while (<em></em>$expr1
+while (
+<em></em>$expr1
     && $expr2
+<em>  </em>&& $expr3
 ) {
 }
         ]]>
         </code>
     </code_comparison>
+    <standard>
+    <![CDATA[
+    The closing parenthesis of the multi-line control structure must be on the next line after the body, indented to the same level as the start of the control structure.
+    ]]>
+    </standard>
     <code_comparison>
         <code title="Valid: The closing parenthesis of a multi-line control structure condition block is on the line after the last expression.">
         <![CDATA[
@@ -97,7 +107,7 @@ while (
 while (
     $expr1
     && $expr2
-) {
+<em>)</em> {
 }
         ]]>
         </code>

From b38b4b787156b890da9e570c91a94386e615d4ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Mon, 22 Jan 2024 10:05:54 +0100
Subject: [PATCH 18/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index 6ba3481475..c142f901b5 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Control Structure Spacing">
     <standard>
     <![CDATA[
-    The control structures must have one space after the control structure keyword, no spaces after the opening parenthesis and before the closing parenthesis, and one space between the closing parenthesis and the opening brace.
+    Single line control structures must have one space after the control structure keyword, no spaces after the condition opening parenthesis and before the closing parenthesis, and one space between the closing parenthesis and the opening brace.
     ]]>
     </standard>
     <code_comparison>

From f593a539a51889deaa98a40d21b9d05b219adfce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Thu, 25 Jan 2024 16:55:19 +0100
Subject: [PATCH 19/21] Fix suggestions from the PR

---
 .../ControlStructureSpacingStandard.xml          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index c142f901b5..f3ec717232 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -27,14 +27,14 @@ if <em>(</em>$expr) {
         </code>
         <code title="Invalid: Space before the closing parenthesis in a single-line condition.">
         <![CDATA[
-if ($expr<em> </em>) {
+if ($expr<em> )</em> {
 }
         ]]>
         </code>
     </code_comparison>
     <standard>
     <![CDATA[
-    The body of the multi-line control structure must be indented once, placing the body on the next line after the opening brace.
+    The condition of the multi-line control structure must be indented once, placing the first expression on the next line after the opening brace.
     ]]>
     </standard>
     <code_comparison>
@@ -49,7 +49,7 @@ while (
         </code>
         <code title="Invalid: First expression of a multi-line control structure condition block is on the same line as the opening parenthesis.">
         <![CDATA[
-while (<em></em>$expr1
+while <em>($expr1</em>
     && $expr2
 ) {
 }
@@ -69,9 +69,9 @@ while (
         <code title="Invalid: Some lines in a multi-line control structure condition block not indented correctly.">
         <![CDATA[
 while (
-<em></em>$expr1
+<em>$expr1</em>
     && $expr2
-<em>  </em>&& $expr3
+<em>  && $expr3</em>
 ) {
 }
         ]]>
@@ -79,7 +79,7 @@ while (
     </code_comparison>
     <standard>
     <![CDATA[
-    The closing parenthesis of the multi-line control structure must be on the next line after the body, indented to the same level as the start of the control structure.
+    The closing parenthesis of the multi-line control structure must be on the next line after the last condition, indented to the same level as the start of the control structure.
     ]]>
     </standard>
     <code_comparison>
@@ -96,7 +96,7 @@ while (
         <![CDATA[
 while (
     $expr1
-    && $expr2<em>)</em> {
+    <em>&& $expr2)</em> {
 }
         ]]>
         </code>
@@ -116,7 +116,7 @@ while (
 while (
     $expr1
     && $expr2
-<em>  </em>) {
+<em>  )</em> {
 }
         ]]>
         </code>

From 6a22d052ccca2006fe56969001b367ed4379bfa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Fri, 26 Jan 2024 09:34:40 +0100
Subject: [PATCH 20/21] Update the standard description for single line control
 structures

---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index f3ec717232..e9ef542d24 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Control Structure Spacing">
     <standard>
     <![CDATA[
-    Single line control structures must have one space after the control structure keyword, no spaces after the condition opening parenthesis and before the closing parenthesis, and one space between the closing parenthesis and the opening brace.
+    Single line control structures must have no spaces after the condition opening parenthesis and before the condition closing parenthesis.
     ]]>
     </standard>
     <code_comparison>

From 77366bb788a075eaa3fadfd3fbd1b942bcce7785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20=C5=BDoljom?= <dingo-d@users.noreply.github.com>
Date: Fri, 26 Jan 2024 09:35:03 +0100
Subject: [PATCH 21/21] Update
 src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml

Co-authored-by: Juliette <663378+jrfnl@users.noreply.github.com>
---
 .../Docs/ControlStructures/ControlStructureSpacingStandard.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
index e9ef542d24..db4fe8028d 100644
--- a/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
+++ b/src/Standards/PSR12/Docs/ControlStructures/ControlStructureSpacingStandard.xml
@@ -34,7 +34,7 @@ if ($expr<em> )</em> {
     </code_comparison>
     <standard>
     <![CDATA[
-    The condition of the multi-line control structure must be indented once, placing the first expression on the next line after the opening brace.
+    The condition of the multi-line control structure must be indented once, placing the first expression on the next line after the opening parenthesis.
     ]]>
     </standard>
     <code_comparison>