From 4e4dc1150cfac2463668c9e326d619202ba06ad6 Mon Sep 17 00:00:00 2001
From: Jon McPartland <jon@bigbite.net>
Date: Fri, 1 Mar 2024 12:10:24 +0000
Subject: [PATCH 1/5] Docs: add documentation for
 Squiz.WhiteSpace.MemberVarSpacing

---
 .../WhiteSpace/MemberVarSpacingStandard.xml   | 142 ++++++++++++++++++
 1 file changed, 142 insertions(+)
 create mode 100644 src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml

diff --git a/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml b/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
new file mode 100644
index 0000000000..00cfbf67a9
--- /dev/null
+++ b/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
@@ -0,0 +1,142 @@
+<documentation title="Member Var Spacing">
+    <standard>
+    <![CDATA[
+    There should be one blank line before the first member var.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: One blank line before the first member var.">
+        <![CDATA[
+class MyClass
+{<em>
+
+</em>    protected $var1 = 'value';
+}
+
+interface MyInterface {<em>
+
+</em>    public $var1;
+}
+
+trait MyTrait {<em>
+
+</em>    public $var1 = 'value';
+}
+        ]]>
+        </code>
+        <code title="Invalid: Incorrect number of blank lines before the first member var.">
+        <![CDATA[
+class MyClass
+{<em>
+</em>    protected $var1 = 'value';
+}
+
+
+interface MyInterface {<em>
+</em>    public $var1;
+}
+
+
+trait MyTrait {<em>
+
+
+</em>    public $var1 = 'value';
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    There should be one blank line between member vars.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: One blank line between each member var.">
+        <![CDATA[
+class MyClass
+{
+
+    protected $var1 = 'value';<em>
+
+</em>    protected $var2 = 'value2';
+}
+
+interface MyInterface {
+
+    public $var1;<em>
+
+</em>    public $var2;
+}
+
+trait MyTrait {
+
+    public $var1 = 'value';<em>
+
+</em>    public $var2 = 'value2';
+}
+        ]]>
+        </code>
+        <code title="Invalid: Incorrect number of blank lines between each member var.">
+        <![CDATA[
+class MyClass
+{
+
+    protected $var1 = 'value';<em>
+</em>    protected $var2 = 'value2';
+}
+
+
+interface MyInterface {
+
+    public $var1;<em>
+</em>    public $var2;
+}
+
+
+trait MyTrait {
+
+    public $var1 = 'value';<em>
+
+
+</em>    public $var2 = 'value2';
+}
+        ]]>
+        </code>
+    </code_comparison>
+    <standard>
+    <![CDATA[
+    There should be no blank line between a member var's comment and the member var.
+    ]]>
+    </standard>
+    <code_comparison>
+        <code title="Valid: No blank lines between comment and member var.">
+        <![CDATA[
+class MyClass
+{
+
+    /**
+     * The actions that this class can perform.
+     *
+     * @var array
+     */<em>
+</em>    public $actions = array();
+}
+        ]]>
+        </code>
+        <code title="Invalid: Blank line(s) between comment and member var.">
+        <![CDATA[
+class MyClass
+{
+
+    /**
+     * The actions that this class can perform.
+     *
+     * @var array
+     */<em>
+
+</em>    public $actions = array();
+}
+        ]]>
+        </code>
+    </code_comparison>
+</documentation>

From aaddb379909183b6e9350b04c8ddef13b9454021 Mon Sep 17 00:00:00 2001
From: Jon McPartland <jon@bigbite.net>
Date: Fri, 1 Mar 2024 17:06:17 +0000
Subject: [PATCH 2/5] Docs: improve code examples and descriptions for
 Squiz.WhiteSpace.MemberVarSpacing

- Remove invalid structures
- Clarify and improve wording (member var => property)
- Remove excessive code examples
- Clarify and improve wording (comment => DocBlock)
---
 .../WhiteSpace/MemberVarSpacingStandard.xml   | 76 +++----------------
 1 file changed, 11 insertions(+), 65 deletions(-)

diff --git a/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml b/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
index 00cfbf67a9..cb307b3ba8 100644
--- a/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
+++ b/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
@@ -1,73 +1,36 @@
 <documentation title="Member Var Spacing">
     <standard>
     <![CDATA[
-    There should be one blank line before the first member var.
+    There should be one blank line before the first property (member variable).
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: One blank line before the first member var.">
+        <code title="Valid: One blank line before the first property.">
         <![CDATA[
 class MyClass
 {<em>
 
 </em>    protected $var1 = 'value';
-}
-
-interface MyInterface {<em>
-
-</em>    public $var1;
-}
-
-trait MyTrait {<em>
-
-</em>    public $var1 = 'value';
 }
         ]]>
         </code>
-        <code title="Invalid: Incorrect number of blank lines before the first member var.">
+        <code title="Invalid: Incorrect number of blank lines before the first property.">
         <![CDATA[
 class MyClass
 {<em>
 </em>    protected $var1 = 'value';
-}
-
-
-interface MyInterface {<em>
-</em>    public $var1;
-}
-
-
-trait MyTrait {<em>
-
-
-</em>    public $var1 = 'value';
 }
         ]]>
         </code>
     </code_comparison>
     <standard>
     <![CDATA[
-    There should be one blank line between member vars.
+    There should be one blank line between properties.
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: One blank line between each member var.">
+        <code title="Valid: One blank line between each property.">
         <![CDATA[
-class MyClass
-{
-
-    protected $var1 = 'value';<em>
-
-</em>    protected $var2 = 'value2';
-}
-
-interface MyInterface {
-
-    public $var1;<em>
-
-</em>    public $var2;
-}
-
 trait MyTrait {
 
     public $var1 = 'value';<em>
@@ -76,23 +39,8 @@ trait MyTrait {
 }
         ]]>
         </code>
-        <code title="Invalid: Incorrect number of blank lines between each member var.">
+        <code title="Invalid: Incorrect number of blank lines between each property.">
         <![CDATA[
-class MyClass
-{
-
-    protected $var1 = 'value';<em>
-</em>    protected $var2 = 'value2';
-}
-
-
-interface MyInterface {
-
-    public $var1;<em>
-</em>    public $var2;
-}
-
-
 trait MyTrait {
 
     public $var1 = 'value';<em>
@@ -105,14 +53,13 @@ trait MyTrait {
     </code_comparison>
     <standard>
     <![CDATA[
-    There should be no blank line between a member var's comment and the member var.
+    There should be no blank lines between a property DocBlock and the property declaration the DocBlock applies to.
     ]]>
     </standard>
     <code_comparison>
-        <code title="Valid: No blank lines between comment and member var.">
+        <code title="Valid: No blank lines between DocBlock and its property.">
         <![CDATA[
-class MyClass
-{
+new class {
 
     /**
      * The actions that this class can perform.
@@ -123,10 +70,9 @@ class MyClass
 }
         ]]>
         </code>
-        <code title="Invalid: Blank line(s) between comment and member var.">
+        <code title="Invalid: Blank line(s) between DocBlock and its property.">
         <![CDATA[
-class MyClass
-{
+new class {
 
     /**
      * The actions that this class can perform.

From 5f8dec696ca7be96c7781ed0e4731eaf71b7d470 Mon Sep 17 00:00:00 2001
From: Jon McPartland <jon@bigbite.net>
Date: Mon, 4 Mar 2024 10:22:22 +0000
Subject: [PATCH 3/5] Docs: add more specific wording to
 Squiz.WhiteSpace.MemberVarSpacing

---
 .../Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml b/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
index cb307b3ba8..4ae142f313 100644
--- a/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
+++ b/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
@@ -1,7 +1,7 @@
 <documentation title="Member Var Spacing">
     <standard>
     <![CDATA[
-    There should be one blank line before the first property (member variable).
+    There should be exactly one blank line before the first property (member variable).
     ]]>
     </standard>
     <code_comparison>
@@ -25,7 +25,7 @@ class MyClass
     </code_comparison>
     <standard>
     <![CDATA[
-    There should be one blank line between properties.
+    There should be exactly one blank line between properties.
     ]]>
     </standard>
     <code_comparison>

From 421ffea94c803ca12e21b3a5666ca51056ba732d Mon Sep 17 00:00:00 2001
From: Jon McPartland <jon@bigbite.net>
Date: Mon, 4 Mar 2024 10:23:51 +0000
Subject: [PATCH 4/5] Docs: update code example for
 Squiz.WhiteSpace.MemberVarSpacing

Show both too much and too little whitespace in one example
---
 .../Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml b/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
index 4ae142f313..6cbd58a831 100644
--- a/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
+++ b/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
@@ -35,7 +35,9 @@ trait MyTrait {
 
     public $var1 = 'value';<em>
 
-</em>    public $var2 = 'value2';
+</em>    public $var2 = 'value2';<em>
+
+</em>    public $var3 = 'value3';
 }
         ]]>
         </code>
@@ -46,7 +48,8 @@ trait MyTrait {
     public $var1 = 'value';<em>
 
 
-</em>    public $var2 = 'value2';
+</em>    public $var2 = 'value2';<em>
+</em>    public $var3 = 'value3';
 }
         ]]>
         </code>

From a2486034f5154bfe4b13236f12223b6314ddbfbd Mon Sep 17 00:00:00 2001
From: Jon McPartland <jon@bigbite.net>
Date: Mon, 4 Mar 2024 10:25:05 +0000
Subject: [PATCH 5/5] Docs: adjust code example for
 Squiz.WhiteSpace.MemberVarSpacing

- Add anonymous class assignment and missing semi-colons
---
 .../Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml b/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
index 6cbd58a831..a551af8a97 100644
--- a/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
+++ b/src/Standards/Squiz/Docs/WhiteSpace/MemberVarSpacingStandard.xml
@@ -62,7 +62,7 @@ trait MyTrait {
     <code_comparison>
         <code title="Valid: No blank lines between DocBlock and its property.">
         <![CDATA[
-new class {
+$anon = new class {
 
     /**
      * The actions that this class can perform.
@@ -70,12 +70,12 @@ new class {
      * @var array
      */<em>
 </em>    public $actions = array();
-}
+};
         ]]>
         </code>
         <code title="Invalid: Blank line(s) between DocBlock and its property.">
         <![CDATA[
-new class {
+$anon = new class {
 
     /**
      * The actions that this class can perform.
@@ -84,7 +84,7 @@ new class {
      */<em>
 
 </em>    public $actions = array();
-}
+};
         ]]>
         </code>
     </code_comparison>