From d188297b759bd47cbbc2fbd6562a4c4b644397a4 Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Wed, 28 May 2025 12:35:14 -0300
Subject: [PATCH 1/5] Squiz/SelfMemberReference: update XML doc

- Improve sniff description explicitly mentioning where the spaces are
checked and adding context as to when the `self` keyword is verified.
- Fix the code examples for checking `self` case and spaces around the
double colon to ensure they trigger the sniff (the sniff checks if the
call is made within a class).
- Improve the titles of the code examples related to spacing around
double colons.
- Remove unnecessary methods from the code examples related to using
`self` instead of the class name when referencing a static member.
---
 .../Classes/SelfMemberReferenceStandard.xml   | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml b/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
index 4f982fa4ec..4ba1b274ce 100644
--- a/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
+++ b/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
@@ -1,30 +1,56 @@
 <documentation title="Self Member Reference">
     <standard>
     <![CDATA[
-    The self keyword should be used instead of the current class name, should be lowercase, and should not have spaces before or after it.
+    When referencing static members within a class, the self keyword must be used instead of the
+    current class name, it must be lowercase, and there must be no spaces before or after the double
+    colon.
     ]]>
     </standard>
     <code_comparison>
         <code title="Valid: Lowercase self used.">
         <![CDATA[
-<em>self</em>::foo();
+class Bar
+{
+    public function baz()
+    {
+        <em>self</em>::foo();
+    }
+}
         ]]>
         </code>
         <code title="Invalid: Uppercase self used.">
         <![CDATA[
-<em>SELF</em>::foo();
+class Bar
+{
+    public function baz()
+    {
+        <em>SELF</em>::foo();
+    }
+}
         ]]>
         </code>
     </code_comparison>
     <code_comparison>
-        <code title="Valid: Correct spacing used.">
+        <code title="Valid: No spaces around the double colon.">
         <![CDATA[
-self<em></em>::<em></em>foo();
+class Bar
+{
+    public function baz()
+    {
+        self<em></em>::<em></em>foo();
+    }
+}
         ]]>
         </code>
-        <code title="Invalid: Incorrect spacing used.">
+        <code title="Invalid: Spaces around double colon operator.">
         <![CDATA[
-self<em> </em>::<em> </em>foo();
+class Bar
+{
+    public function baz()
+    {
+        self<em> </em>::<em> </em>foo();
+    }
+}
         ]]>
         </code>
     </code_comparison>
@@ -33,10 +59,6 @@ self<em> </em>::<em> </em>foo();
         <![CDATA[
 class Foo
 {
-    public static function bar()
-    {
-    }
-
     public static function baz()
     {
         <em>self</em>::bar();
@@ -48,10 +70,6 @@ class Foo
         <![CDATA[
 class <em>Foo</em>
 {
-    public static function bar()
-    {
-    }
-
     public static function baz()
     {
         <em>Foo</em>::bar();

From 3775cfc61b3eedd01cb62aa449b4f88ed165429b Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Fri, 13 Jun 2025 10:52:25 -0300
Subject: [PATCH 2/5] Create a separate `<standard>` block for each
 `<code_comparison>` block

---
 .../Docs/Classes/SelfMemberReferenceStandard.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml b/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
index 4ba1b274ce..1703f0d459 100644
--- a/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
+++ b/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
@@ -1,9 +1,7 @@
 <documentation title="Self Member Reference">
     <standard>
     <![CDATA[
-    When referencing static members within a class, the self keyword must be used instead of the
-    current class name, it must be lowercase, and there must be no spaces before or after the double
-    colon.
+    The self keyword must be lowercase.
     ]]>
     </standard>
     <code_comparison>
@@ -30,8 +28,13 @@ class Bar
         ]]>
         </code>
     </code_comparison>
+    <standard>
+    <![CDATA[
+    There must be no spaces before or after the double colon operator.
+    ]]>
+    </standard>
     <code_comparison>
-        <code title="Valid: No spaces around the double colon.">
+        <code title="Valid: No spaces around the double colon operator.">
         <![CDATA[
 class Bar
 {
@@ -54,6 +57,11 @@ class Bar
         ]]>
         </code>
     </code_comparison>
+    <standard>
+    <![CDATA[
+    The self keyword must be used instead of the current class name.
+    ]]>
+    </standard>
     <code_comparison>
         <code title="Valid: Self used as reference.">
         <![CDATA[

From dba701734eb7ad45b680472c83c487480bf9ad28 Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Fri, 13 Jun 2025 11:51:39 -0300
Subject: [PATCH 3/5] Add back the bar() method in the third example

---
 .../Squiz/Docs/Classes/SelfMemberReferenceStandard.xml        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml b/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
index 1703f0d459..211d2a894b 100644
--- a/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
+++ b/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
@@ -67,6 +67,8 @@ class Bar
         <![CDATA[
 class Foo
 {
+    public static function bar() {}
+
     public static function baz()
     {
         <em>self</em>::bar();
@@ -78,6 +80,8 @@ class Foo
         <![CDATA[
 class <em>Foo</em>
 {
+    public static function bar() {}
+
     public static function baz()
     {
         <em>Foo</em>::bar();

From a008fddeed79d308edde26349c6525d899033798 Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Fri, 13 Jun 2025 11:52:35 -0300
Subject: [PATCH 4/5] Remove the static keyword from the third example as it is
 not necessary to trigger the sniff

---
 .../Squiz/Docs/Classes/SelfMemberReferenceStandard.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml b/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
index 211d2a894b..ccc876b587 100644
--- a/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
+++ b/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
@@ -67,9 +67,9 @@ class Bar
         <![CDATA[
 class Foo
 {
-    public static function bar() {}
+    public function bar() {}
 
-    public static function baz()
+    public function baz()
     {
         <em>self</em>::bar();
     }
@@ -80,9 +80,9 @@ class Foo
         <![CDATA[
 class <em>Foo</em>
 {
-    public static function bar() {}
+    public function bar() {}
 
-    public static function baz()
+    public function baz()
     {
         <em>Foo</em>::bar();
     }

From ce5067991606058e3107ce2fc23d8bab3bebc82f Mon Sep 17 00:00:00 2001
From: Rodrigo Primo <rodrigosprimo@gmail.com>
Date: Fri, 13 Jun 2025 11:53:59 -0300
Subject: [PATCH 5/5] Make the code examples shorter by not having the opening
 braces on a separate line

---
 .../Classes/SelfMemberReferenceStandard.xml   | 36 +++++++------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml b/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
index ccc876b587..c4e2e52c99 100644
--- a/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
+++ b/src/Standards/Squiz/Docs/Classes/SelfMemberReferenceStandard.xml
@@ -7,10 +7,8 @@
     <code_comparison>
         <code title="Valid: Lowercase self used.">
         <![CDATA[
-class Bar
-{
-    public function baz()
-    {
+class Bar {
+    public function baz() {
         <em>self</em>::foo();
     }
 }
@@ -18,10 +16,8 @@ class Bar
         </code>
         <code title="Invalid: Uppercase self used.">
         <![CDATA[
-class Bar
-{
-    public function baz()
-    {
+class Bar {
+    public function baz() {
         <em>SELF</em>::foo();
     }
 }
@@ -36,10 +32,8 @@ class Bar
     <code_comparison>
         <code title="Valid: No spaces around the double colon operator.">
         <![CDATA[
-class Bar
-{
-    public function baz()
-    {
+class Bar {
+    public function baz() {
         self<em></em>::<em></em>foo();
     }
 }
@@ -47,10 +41,8 @@ class Bar
         </code>
         <code title="Invalid: Spaces around double colon operator.">
         <![CDATA[
-class Bar
-{
-    public function baz()
-    {
+class Bar {
+    public function baz() {
         self<em> </em>::<em> </em>foo();
     }
 }
@@ -65,12 +57,10 @@ class Bar
     <code_comparison>
         <code title="Valid: Self used as reference.">
         <![CDATA[
-class Foo
-{
+class Foo {
     public function bar() {}
 
-    public function baz()
-    {
+    public function baz() {
         <em>self</em>::bar();
     }
 }
@@ -78,12 +68,10 @@ class Foo
         </code>
         <code title="Invalid: Local class name used as reference.">
         <![CDATA[
-class <em>Foo</em>
-{
+class <em>Foo</em> {
     public function bar() {}
 
-    public function baz()
-    {
+    public function baz() {
         <em>Foo</em>::bar();
     }
 }