Tokens cleanup

kubawerlos · Oct 18, 2019 · e335de4 · e335de4
1 parent 84e9715
commit e335de4
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 55 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -4,6 +4,7 @@ parameters:
         - ./src
     ignoreErrors:
         - '#^Parameter \#\d+ \$[a-zA-Z]+ of method PhpCsFixer\\Tokenizer\\Tokens::insertAt\(\) expects#'
+        - '#^Parameter \#\d+ \$[a-zA-Z]+ of method PhpCsFixer\\Tokenizer\\Tokens::overrideRange\(\) expects#'
 
 includes:
     - ./dev-tools/vendor/phpstan/phpstan-strict-rules/rules.neon
diff --git a/src/Fixer/DataProviderReturnTypeFixer.php b/src/Fixer/DataProviderReturnTypeFixer.php
@@ -108,9 +108,7 @@ private function fixNames(Tokens $tokens, int $startIndex, int $endIndex): void
             if ($this->getTypeName($tokens, $typeAnalysis) !== 'iterable') {
                 /** @var int $startIndex */
                 $startIndex = $tokens->getNextMeaningfulToken($typeAnalysis->getStartIndex() - 1);
-                $tokens->clearRange($startIndex, $typeAnalysis->getEndIndex());
+                $tokens->overrideRange($startIndex, $typeAnalysis->getEndIndex(), [new Token([T_STRING, 'iterable'])]);
-
-                $tokens->insertAt($typeAnalysis->getEndIndex(), new Token([T_STRING, 'iterable']));
             }
         }
     }

diff --git a/src/Fixer/OperatorLinebreakFixer.php b/src/Fixer/OperatorLinebreakFixer.php
@@ -21,7 +21,7 @@ final class OperatorLinebreakFixer extends AbstractFixer implements Configuratio
     /** @var string */
     private $position = 'beginning';
 
-    /** @var Token[] */
+    /** @var array<array<int|string>|string> */
     private $operators = [];
 
     public function getDefinition(): FixerDefinitionInterface
@@ -54,62 +54,58 @@ public function getConfigurationDefinition(): FixerConfigurationResolver
     public function configure(?array $configuration = null): void
     {
         $this->operators = [
-            new Token([T_LOGICAL_AND, 'and']),
+            [T_LOGICAL_AND, 'and'],
-            new Token([T_LOGICAL_OR, 'or']),
+            [T_LOGICAL_OR, 'or'],
-            new Token([T_LOGICAL_XOR, 'xor']),
+            [T_LOGICAL_XOR, 'xor'],
-            new Token('&&'),
+            [T_BOOLEAN_AND, '&&'],
-            new Token('||'),
+            [T_BOOLEAN_OR, '||'],
         ];
+
         if (!isset($configuration['only_booleans']) || $configuration['only_booleans'] === false) {
             $this->operators = \array_merge(
                 $this->operators,
                 [
-                    new Token('+'),
+                    '+',
-                    new Token('-'),
+                    '-',
-                    new Token('*'),
+                    '*',
-                    new Token('/'),
+                    '/',
-                    new Token('%'),
+                    '%',
-                    new Token([T_POW, '**']),
+                    [T_POW, '**'],
-                    new Token([T_PLUS_EQUAL, '+=']),
+                    [T_PLUS_EQUAL, '+='],
-                    new Token([T_MINUS_EQUAL, '-=']),
+                    [T_MINUS_EQUAL, '-='],
-                    new Token([T_MUL_EQUAL, '*=']),
+                    [T_MUL_EQUAL, '*='],
-                    new Token([T_DIV_EQUAL, '/=']),
+                    [T_DIV_EQUAL, '/='],
-                    new Token([T_MOD_EQUAL, '%=']),
+                    [T_MOD_EQUAL, '%='],
-                    new Token([T_POW_EQUAL, '**=']),
+                    [T_POW_EQUAL, '**='],
-                    new Token('='),
+                    '=',
-                    new Token('&'),
+                    '&',
-                    new Token('|'),
+                    '|',
-                    new Token('^'),
+                    '^',
-                    new Token([T_SL, '<<']),
+                    [T_SL, '<<'],
-                    new Token([T_SR, '>>']),
+                    [T_SR, '>>'],
-                    new Token([T_AND_EQUAL, '&=']),
+                    [T_AND_EQUAL, '&='],
-                    new Token([T_OR_EQUAL, '|=']),
+                    [T_OR_EQUAL, '|='],
-                    new Token([T_XOR_EQUAL, '^=']),
+                    [T_XOR_EQUAL, '^='],
-                    new Token([T_SL_EQUAL, '<<=']),
+                    [T_SL_EQUAL, '<<='],
-                    new Token([T_SR_EQUAL, '>>=']),
+                    [T_SR_EQUAL, '>>='],
-                    new Token([T_IS_EQUAL, '==']),
+                    [T_IS_EQUAL, '=='],
-                    new Token([T_IS_IDENTICAL, '===']),
+                    [T_IS_IDENTICAL, '==='],
-                    new Token([T_IS_NOT_EQUAL, '!=']),
+                    [T_IS_NOT_EQUAL, '!='],
-                    new Token([T_IS_NOT_EQUAL, '<>']),
+                    [T_IS_NOT_EQUAL, '<>'],
-                    new Token([T_IS_NOT_IDENTICAL, '!==']),
+                    [T_IS_NOT_IDENTICAL, '!=='],
-                    new Token('<'),
+                    '<',
-                    new Token('>'),
+                    '>',
-                    new Token([T_IS_SMALLER_OR_EQUAL, '<=']),
+                    [T_IS_SMALLER_OR_EQUAL, '<='],
-                    new Token([T_IS_GREATER_OR_EQUAL, '>=']),
+                    [T_IS_GREATER_OR_EQUAL, '>='],
-                    new Token([T_SPACESHIP, '<=>']),
+                    [T_SPACESHIP, '<=>'],
-                    new Token('and'),
+                    '.',
-                    new Token('or'),
+                    [T_CONCAT_EQUAL, '.='],
-                    new Token('xor'),
+                    [T_COALESCE, '??'],
-                    new Token([T_BOOLEAN_AND, '&&']),
+                    [T_DOUBLE_ARROW, '=>'],
-                    new Token([T_BOOLEAN_OR, '||']),
+                    [T_OBJECT_OPERATOR, '->'],
-                    new Token('.'),
+                    [T_PAAMAYIM_NEKUDOTAYIM, '::'],
-                    new Token([T_CONCAT_EQUAL, '.=']),
+                    '?',
-                    new Token([T_COALESCE, '??']),
+                    ':',
-                    new Token([T_DOUBLE_ARROW, '=>']),
-                    new Token([T_OBJECT_OPERATOR, '->']),
-                    new Token([T_PAAMAYIM_NEKUDOTAYIM, '::']),
-                    new Token('?'),
-                    new Token(':'),
                 ]
             );
         }