Rename TokenCollection methods to minimise overlap with Token

- `setWhitespace()` -> `setTokenWhitespace()` - `applyWhitespace()` -> `applyTokenWhitespace()`
lkrms · Jan 17, 2025 · 4860070 · 4860070
1 parent ac432a1
commit 4860070
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/Internal/TokenCollection.php b/src/Internal/TokenCollection.php
@@ -324,7 +324,7 @@ public function toString(string $delimiter = ''): string
     /**
      * @return $this
      */
-    public function setWhitespace(int $whitespace): self
+    public function setTokenWhitespace(int $whitespace): self
     {
         foreach ($this->Items as $token) {
             $token->Whitespace |= $whitespace;
@@ -335,7 +335,7 @@ public function setWhitespace(int $whitespace): self
     /**
      * @return $this
      */
-    public function applyWhitespace(int $whitespace): self
+    public function applyTokenWhitespace(int $whitespace): self
     {
         // Shift *_BEFORE and *_AFTER to their NO_* counterparts, then clear
         // other bits

diff --git a/src/Rule/SemiStrictExpressions.php b/src/Rule/SemiStrictExpressions.php
@@ -73,7 +73,7 @@ public function processTokens(array $tokens): void
                 if ($token->id === \T_FOR) {
                     /** @var TokenCollection */
                     $semicolons = $token->Data[Data::FOR_PARTS][3];
-                    $semicolons->setWhitespace(Space::LINE_AFTER);
+                    $semicolons->setTokenWhitespace(Space::LINE_AFTER);
                 }
             }
         }

diff --git a/src/Rule/StandardSpacing.php b/src/Rule/StandardSpacing.php
@@ -305,7 +305,7 @@ static function () use ($idx, $innerIndent, $next, $last) {
                 foreach ([$expr1, $expr2, $expr3] as $i => $expr) {
                     $count = $expr->count();
                     if ($i < 2 && $count === 1) {
-                        $expr->setWhitespace(Space::NONE_BEFORE);
+                        $expr->setTokenWhitespace(Space::NONE_BEFORE);
                     } elseif ($i === 2 && $count === 0) {
                         /** @var Token */
                         $semi2 = $semicolons->last();

diff --git a/src/Rule/StrictExpressions.php b/src/Rule/StrictExpressions.php
@@ -71,7 +71,7 @@ public function processTokens(array $tokens): void
                 if ($token->id === \T_FOR) {
                     /** @var TokenCollection */
                     $semicolons = $token->Data[Data::FOR_PARTS][3];
-                    $semicolons->setWhitespace(Space::LINE_AFTER);
+                    $semicolons->setTokenWhitespace(Space::LINE_AFTER);
                 }
             }
         }

diff --git a/src/Rule/StrictLists.php b/src/Rule/StrictLists.php
@@ -49,9 +49,9 @@ public function processList(Token $parent, TokenCollection $items, Token $lastCh
             ) {
                 $items = $items->shift();
             }
-            $items->applyWhitespace(Space::LINE_BEFORE);
+            $items->applyTokenWhitespace(Space::LINE_BEFORE);
         } else {
-            $items->setWhitespace(Space::NO_BLANK_BEFORE | Space::NO_LINE_BEFORE);
+            $items->setTokenWhitespace(Space::NO_BLANK_BEFORE | Space::NO_LINE_BEFORE);
         }
     }
 }
diff --git a/src/Rule/VerticalSpacing.php b/src/Rule/VerticalSpacing.php
@@ -272,10 +272,10 @@ public function processTokens(array $tokens): void
                     }
                 }
                 if ($hasNewlineAndComma) {
-                    $commas->setWhitespace(Space::LINE_AFTER);
-                    $semicolons->setWhitespace(Space::BLANK_AFTER);
+                    $commas->setTokenWhitespace(Space::LINE_AFTER);
+                    $semicolons->setTokenWhitespace(Space::BLANK_AFTER);
                 } elseif ($hasNewline || $semicolons->tokenHasNewlineAfter()) {
-                    $semicolons->setWhitespace(Space::LINE_AFTER);
+                    $semicolons->setTokenWhitespace(Space::LINE_AFTER);
                 }
             } elseif ($token->id === \T_OPEN_BRACE) {
                 if (
@@ -351,7 +351,7 @@ public function processTokens(array $tokens): void
                     $chain = $chain->shift();
                 }
 
-                $chain->setWhitespace(Space::LINE_BEFORE);
+                $chain->setTokenWhitespace(Space::LINE_BEFORE);
             }
         }
     }
@@ -388,7 +388,7 @@ public function processList(Token $parent, TokenCollection $items, Token $lastCh
         if ($lastChild->id === \T_COMMA) {
             $parent->Whitespace |= Space::LINE_AFTER;
             $items->add($parent->CloseBracket)
-                  ->applyWhitespace(Space::LINE_BEFORE);
+                  ->applyTokenWhitespace(Space::LINE_BEFORE);
         }
 
         if ($parent->id === \T_OPEN_PARENTHESIS && $parent->isParameterList()) {
@@ -424,7 +424,7 @@ public function processDeclarations(array $declarations): void
                     !$this->ListRuleEnabled
                     && $commas->tokenHasNewlineBeforeNextCode()
                 )) {
-                    $commas->setWhitespace(Space::LINE_AFTER);
+                    $commas->setTokenWhitespace(Space::LINE_AFTER);
                 }
             }