From a16e88ff217eb517393e46667949902bc24f8a55 Mon Sep 17 00:00:00 2001
From: Greg Sherwood <gsherwood@squiz.net>
Date: Mon, 2 Nov 2020 16:33:25 +1100
Subject: [PATCH] Renamed new sniff property

---
 .../MultipleStatementAlignmentSniff.php          | 16 +++-------------
 .../MultipleStatementAlignmentUnitTest.inc       |  4 ++--
 .../MultipleStatementAlignmentUnitTest.inc.fixed |  4 ++--
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php b/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
index ddf6f3771e..f7f3f0656e 100644
--- a/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
+++ b/src/Standards/Generic/Sniffs/Formatting/MultipleStatementAlignmentSniff.php
@@ -48,21 +48,11 @@ class MultipleStatementAlignmentSniff implements Sniff
     public $maxPadding = 1000;
 
     /**
-     * Controls which side of the assignment token is used for alignment
-     *
-     * The default is to use the end of the assignemnt token:
-     *
-     * $test  = 'Hello';
-     * $test .= ' World';
-     *
-     * Setting to false reverses the alignment:
-     *
-     * $test = 'Hello';
-     * $test .= 'World';
+     * Controls which side of the assignment token is used for alignment.
      *
      * @var boolean
      */
-    public $alignAtEndOfAssignToken = true;
+    public $alignAtEnd = true;
 
 
     /**
@@ -270,7 +260,7 @@ public function checkAlignment($phpcsFile, $stackPtr, $end=null)
             // padding length if they aligned with us.
             $varEnd    = $tokens[($var + 1)]['column'];
             $assignLen = $tokens[$assign]['length'];
-            if ($this->alignAtEndOfAssignToken !== true) {
+            if ($this->alignAtEnd !== true) {
                 $assignLen = 1;
             }
 
diff --git a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc
index f1d3c5ee0f..44d0cef27a 100644
--- a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc
+++ b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc
@@ -421,7 +421,7 @@ $foo      .= ' World';
 $test     = 1;
 $test     <<= 6;
 
-// phpcs:set Generic.Formatting.MultipleStatementAlignment alignAtEndOfAssignToken false
+// phpcs:set Generic.Formatting.MultipleStatementAlignment alignAtEnd false
 
 // Valid
 $foo      = 'Hello';
@@ -454,7 +454,7 @@ $varonetwothreefour = 'four';
 $one         <<= 8;
 $onetwothree = 3;
 
-// phpcs:set Generic.Formatting.MultipleStatementAlignment alignAtEndOfAssignToken true
+// phpcs:set Generic.Formatting.MultipleStatementAlignment alignAtEnd true
 
 $one       <<= 8;
 $onetwothree = 3;
diff --git a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc.fixed b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc.fixed
index cb7e8f6f02..d2159e560f 100644
--- a/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc.fixed
+++ b/src/Standards/Generic/Tests/Formatting/MultipleStatementAlignmentUnitTest.inc.fixed
@@ -421,7 +421,7 @@ $foo     .= ' World';
 $test     = 1;
 $test   <<= 6;
 
-// phpcs:set Generic.Formatting.MultipleStatementAlignment alignAtEndOfAssignToken false
+// phpcs:set Generic.Formatting.MultipleStatementAlignment alignAtEnd false
 
 // Valid
 $foo      = 'Hello';
@@ -454,7 +454,7 @@ $varonetwothreefour = 'four';
 $one <<= 8;
 $onetwothree = 3;
 
-// phpcs:set Generic.Formatting.MultipleStatementAlignment alignAtEndOfAssignToken true
+// phpcs:set Generic.Formatting.MultipleStatementAlignment alignAtEnd true
 
 $one       <<= 8;
 $onetwothree = 3;