From 25488bc236da108e0f11fbd19f00c3dd4f8ac3de Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Fri, 25 Apr 2025 10:49:38 -0300
Subject: [PATCH 1/4] PSR2/SwitchDeclaration: update doc as case indentation is
 not checked

The sniff no longer checks `case` keyword indentation as of commit
4a39005, but the corresponding XML documentation was not updated. This
commit aligns the documentation with the current sniff behavior by
removing mentions of `case` indentation checks.
---
 .../SwitchDeclarationStandard.xml             | 20 +------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml b/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
index 1d6d053dff..dd954c8e46 100644
--- a/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
+++ b/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
@@ -1,27 +1,9 @@
 <documentation title="Switch Declarations">
     <standard>
     <![CDATA[
-    Case statements should be indented 4 spaces from the switch keyword.  It should also be followed by a space.  Colons in switch declarations should not be preceded by whitespace.  Break statements should be indented 4 more spaces from the case statement.  There must be a comment when falling through from one case into the next.
+    Case statements should be followed by a space.  Colons in switch declarations should not be preceded by whitespace.  Break statements should be indented 4 more spaces from the case statement.  There must be a comment when falling through from one case into the next.
     ]]>
     </standard>
-    <code_comparison>
-        <code title="Valid: Case statement indented correctly.">
-        <![CDATA[
-switch ($foo) {
-<em>    </em>case 'bar':
-        break;
-}
-        ]]>
-        </code>
-        <code title="Invalid: Case statement not indented 4 spaces.">
-        <![CDATA[
-switch ($foo) {
-<em></em>case 'bar':
-    break;
-}
-        ]]>
-        </code>
-    </code_comparison>
     <code_comparison>
         <code title="Valid: Case statement followed by 1 space.">
         <![CDATA[

From 2f3cfcb43f0ddf5bbde03b0817638116044c323d Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Fri, 25 Apr 2025 11:08:51 -0300
Subject: [PATCH 2/4] PSR2/SwitchDeclaration: update doc as `case` body should
 be non-empty

This commit updates the valid and invalid code examples in a
`<code_comparison>` block, as the `There must be a comment when
fall-through is intentional in a non-empty case body` error is only
triggered for non-empty `case` bodies. It also fixes the positioning of
the `<em>` tags in the modified code examples.
---
 .../Docs/ControlStructures/SwitchDeclarationStandard.xml  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml b/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
index dd954c8e46..6b8bc81ce7 100644
--- a/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
+++ b/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
@@ -67,8 +67,9 @@ switch ($foo) {
         <![CDATA[
 switch ($foo) {
     case 'bar':
-    <em>// no break</em>
-    default<em></em>:
+        echo $foo;
+        <em>// no break</em>
+    default:
         break;
 }
         ]]>
@@ -77,7 +78,8 @@ switch ($foo) {
         <![CDATA[
 switch ($foo) {
     case 'bar':
-    default<em></em>:
+        echo $foo;<em></em>
+    default:
         break;
 }
         ]]>

From d85e5b4e8e8bd4730cf0a22a4e7236fc53d0a624 Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Fri, 25 Apr 2025 12:01:57 -0300
Subject: [PATCH 3/4] PSR2/SwitchDeclaration: improve XML documentation

- Documentation title should match the sniff name.
- Use different `<standard>` blocks for each error triggered by the
sniff.
- Minor changes to the text to make it more clear and consistent.
---
 .../SwitchDeclarationStandard.xml             | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml b/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
index 6b8bc81ce7..5d8dae4db6 100644
--- a/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
+++ b/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
@@ -1,11 +1,11 @@
-<documentation title="Switch Declarations">
+<documentation title="Switch Declaration">
     <standard>
     <![CDATA[
-    Case statements should be followed by a space.  Colons in switch declarations should not be preceded by whitespace.  Break statements should be indented 4 more spaces from the case statement.  There must be a comment when falling through from one case into the next.
+    Case statements must be followed by exactly one space.
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: Case statement followed by 1 space.">
+        <code title="Valid: Case statement followed by one space.">
         <![CDATA[
 switch ($foo) {
     case<em> </em>'bar':
@@ -13,7 +13,7 @@ switch ($foo) {
 }
         ]]>
         </code>
-        <code title="Invalid: Case statement not followed by 1 space.">
+        <code title="Invalid: Case statement not followed by one space.">
         <![CDATA[
 switch ($foo) {
     case<em></em>'bar':
@@ -22,8 +22,13 @@ switch ($foo) {
         ]]>
         </code>
     </code_comparison>
+    <standard>
+    <![CDATA[
+    There must be no whitespace between the case value or default keyword and the colon.
+    ]]>
+    </standard>
     <code_comparison>
-        <code title="Valid: Colons not prefixed by whitespace.">
+        <code title="Valid: Colons not preceded by whitespace.">
         <![CDATA[
 switch ($foo) {
     case 'bar'<em></em>:
@@ -33,7 +38,7 @@ switch ($foo) {
 }
         ]]>
         </code>
-        <code title="Invalid: Colons prefixed by whitespace.">
+        <code title="Invalid: Colons preceded by whitespace.">
         <![CDATA[
 switch ($foo) {
     case 'bar'<em> </em>:
@@ -44,6 +49,11 @@ switch ($foo) {
         ]]>
         </code>
     </code_comparison>
+    <standard>
+    <![CDATA[
+    Terminating statements must be indented four more spaces from the case statement.
+    ]]>
+    </standard>
     <code_comparison>
         <code title="Valid: Break statement indented correctly.">
         <![CDATA[
@@ -53,7 +63,7 @@ switch ($foo) {
 }
         ]]>
         </code>
-        <code title="Invalid: Break statement not indented 4 spaces.">
+        <code title="Invalid: Break statement not indented four spaces.">
         <![CDATA[
 switch ($foo) {
     case 'bar':
@@ -62,8 +72,13 @@ switch ($foo) {
         ]]>
         </code>
     </code_comparison>
+    <standard>
+    <![CDATA[
+    There must be a comment when fall-through is intentional in a non-empty case body.
+    ]]>
+    </standard>
     <code_comparison>
-        <code title="Valid: Comment marking intentional fall-through.">
+        <code title="Valid: Comment marking intentional fall-through in a non-empty case body.">
         <![CDATA[
 switch ($foo) {
     case 'bar':
@@ -74,7 +89,7 @@ switch ($foo) {
 }
         ]]>
         </code>
-        <code title="Invalid: No comment marking intentional fall-through.">
+        <code title="Invalid: No comment marking intentional fall-through in a non-empty case body.">
         <![CDATA[
 switch ($foo) {
     case 'bar':

From 0ba74907d058cd1446501b06fc2bbd284bdfba68 Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Fri, 25 Apr 2025 12:39:12 -0300
Subject: [PATCH 4/4] PSR2/SwitchDeclaration: add missing errors to the XML
 documentation

This commit adds four sniff errors not previously documented to the
`PSR2.ControlStructures.SwitchDeclaration` sniff XML documentation.
---
 .../SwitchDeclarationStandard.xml             | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)

diff --git a/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml b/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
index 5d8dae4db6..fe4fe3b712 100644
--- a/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
+++ b/src/Standards/PSR2/Docs/ControlStructures/SwitchDeclarationStandard.xml
@@ -1,4 +1,31 @@
 <documentation title="Switch Declaration">
+    <standard>
+    <![CDATA[
+    Case and default keywords must be lowercase.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Keywords in lowercase.">
+        <![CDATA[
+switch ($foo) {
+    <em>case</em> 'bar':
+        break;
+    <em>default</em>:
+        break;
+}
+        ]]>
+        </code>
+        <code title="Invalid: Keywords not in lowercase.">
+        <![CDATA[
+switch ($foo) {
+    <em>CASE</em> 'bar':
+        break;
+    <em>Default</em>:
+        break;
+}
+        ]]>
+        </code>
+    </code_comparison>
     <standard>
     <![CDATA[
     Case statements must be followed by exactly one space.
@@ -45,6 +72,52 @@ switch ($foo) {
         break;
     default<em> </em>:
         break;
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    The case or default body must start on the line following the statement.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Body starts on the next line.">
+        <![CDATA[
+switch ($foo) {
+    case 'bar':
+<em></em>        break;
+}
+        ]]>
+        </code>
+        <code title="Invalid: Body on the same line as the case statement.">
+        <![CDATA[
+switch ($foo) {
+    case 'bar':<em></em> break;
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    Terminating statements must be on a line by themselves.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Terminating statement on its own line.">
+        <![CDATA[
+switch ($foo) {
+    case 'bar':
+        echo $foo;
+        <em>return;</em>
+}
+        ]]>
+        </code>
+        <code title="Invalid: Terminating statement not on its own line.">
+        <![CDATA[
+switch ($foo) {
+    case 'bar':
+        <em>echo $foo; return;</em>
 }
         ]]>
         </code>
@@ -68,6 +141,34 @@ switch ($foo) {
 switch ($foo) {
     case 'bar':
 <em>    </em>break;
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    Case and default statements must be defined using a colon.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: Using a colon for case and default statements.">
+        <![CDATA[
+switch ($foo) {
+    case 'bar'<em>:</em>
+        break;
+    default<em>:</em>
+        break;
+}
+        ]]>
+        </code>
+        <code title="Invalid: Using a semi-colon or colon followed by braces.">
+        <![CDATA[
+switch ($foo) {
+    case 'bar'<em>;</em>
+        break;
+    default: <em>{</em>
+        break;
+    <em>}</em>
 }
         ]]>
         </code>