Refactored tools & custom fixer classes

Author: shudd3r

src/Fixer/AlignedMethodChainFixer.php

@@ -86,12 +86,12 @@ private function findNextChain(int $search): ?int
 
     private function isStartOfMultilineChain(int $idx): bool
     {
-        $next = ($this->tokens[$idx + 2]->getContent() === '(') ? $this->findClosing($idx + 2) + 1 : $idx + 2;
+        $next = $this->tokens[$idx + 2]->getContent() === '(' ? $this->findClosing($idx + 2) + 1 : $idx + 2;
         if ($this->tokens[$next]->isWhitespace() && $this->tokens[$next + 1]->isGivenKind(T_OBJECT_OPERATOR)) {
             return true;
         }
 
-        return $this->tokens[$next]->isGivenKind(T_OBJECT_OPERATOR) ? $this->isStartOfMultilineChain($next) : false;
+        return $this->tokens[$next]->isGivenKind(T_OBJECT_OPERATOR) && $this->isStartOfMultilineChain($next);
     }
 
     private function indentationLength(int $idx): int

src/Fixer/ArrayContext.php

@@ -78,7 +78,7 @@ private function isMultipleAssign(int $firstArrow, int $lineEnd): bool
         $last = $this->tokens->getPrevTokenOfKind($lineEnd, [[T_DOUBLE_ARROW], [CT::T_ARRAY_SQUARE_BRACE_CLOSE]]);
         if ($this->tokens[$last]->isGivenKind(CT::T_ARRAY_SQUARE_BRACE_CLOSE)) {
             $continueFrom = $this->tokens->findBlockStart(Tokens::BLOCK_TYPE_ARRAY_SQUARE_BRACE, $last);
-            return $continueFrom < $firstArrow ? true : $this->isMultipleAssign($firstArrow, $continueFrom);
+            return $continueFrom < $firstArrow || $this->isMultipleAssign($firstArrow, $continueFrom);
         }
 
         return $firstArrow !== $last;

src/Fixer/NoTrailingCommaInMultilineArrayFixer.php

@@ -14,9 +14,8 @@
 use PhpCsFixer\Fixer\FixerInterface;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
-use PhpCsFixer\Tokenizer\CT;
 use PhpCsFixer\Tokenizer\Tokens;
-use PhpCsFixer\Tokenizer\TokensAnalyzer;
+use PhpCsFixer\Tokenizer\CT;
 use SplFileInfo;
 
 
@@ -54,13 +53,36 @@ public function isCandidate(Tokens $tokens): bool
 
     public function fix(SplFileInfo $file, Tokens $tokens): void
     {
-        $tokensAnalyzer = new TokensAnalyzer($tokens);
-
         for ($idx = $tokens->count() - 1; $idx >= 0; --$idx) {
-            if ($tokensAnalyzer->isArray($idx) && $tokensAnalyzer->isArrayMultiLine($idx)) {
-                $this->fixArray($tokens, $idx);
+            if (!$this->isMultilineArray($tokens, $idx)) { continue; }
+            $this->fixArray($tokens, $idx);
+        }
+    }
+
+    private function isMultilineArray(Tokens $tokens, int $idx): bool
+    {
+        $isArray = $tokens[$idx]->isGivenKind([T_ARRAY, CT::T_ARRAY_SQUARE_BRACE_OPEN]);
+        if (!$isArray) { return false; }
+
+        $openBrace = $tokens[$idx]->isGivenKind(T_ARRAY) ? $tokens->getNextMeaningfulToken($idx) : $idx;
+        $blockType = Tokens::detectBlockType($tokens[$openBrace]);
+        if (!$blockType || !$blockType['isStart']) { return false; }
+
+        $endIndex = $tokens->findBlockEnd($blockType['type'], $openBrace);
+        for ($index = $openBrace + 1; $index < $endIndex; ++$index) {
+            $token     = $tokens[$index];
+            $blockType = Tokens::detectBlockType($token);
+
+            if ($blockType && $blockType['isStart']) {
+                $index = $tokens->findBlockEnd($blockType['type'], $index);
+                continue;
             }
+
+            $isLineBreak = $token->isWhitespace() && strpos($token->getContent(), "\n") !== false;
+            if ($isLineBreak) { return true; }
         }
+
+        return false;
     }
 
     private function fixArray(Tokens $tokens, int $idx): void

src/Tools/FixerTokens.php

@@ -51,6 +51,6 @@ public static function dump(Tokens $tokens, ?string $dumpFile = null): void
             ];
         }
 
-        self::json($data, $dumpFile ?: dirname(dirname(__DIR__)) . '/temp/tokens-dump.json');
+        self::json($data, $dumpFile ?: dirname(__DIR__, 2) . '/temp/tokens-dump.json');
     }
 }

src/Tools/SnifferTokens.php

@@ -16,7 +16,7 @@
 use PHP_CodeSniffer\Config;
 use PHP_CodeSniffer\Exceptions;
 
-require_once dirname(dirname(__DIR__)) . '/vendor/squizlabs/php_codesniffer/autoload.php';
+require_once dirname(__DIR__, 2) . '/vendor/squizlabs/php_codesniffer/autoload.php';
 if (!defined('PHP_CODESNIFFER_CBF')) {
     define('PHP_CODESNIFFER_CBF', false);
 }
@@ -35,7 +35,7 @@ final class SnifferTokens
      */
     public static function runner(?string $configFile = null): Runner
     {
-        $configFile = $configFile ?: dirname(dirname(__DIR__)) . '/phpcs.xml.dist';
+        $configFile = $configFile ?: dirname(__DIR__, 2) . '/phpcs.xml.dist';
         $runner     = new Runner();
         $runner->config = new Config(['-q', '--standard=' . $configFile]);
         $runner->init();
@@ -84,6 +84,6 @@ public static function dump(Files\File $tokens, ?string $tokensFile = null): voi
             $token = ['idx' => $id] + $token;
         }
 
-        self::json($tokens, $tokensFile ?: dirname(dirname(__DIR__)) . '/temp/tokens-dump.json');
+        self::json($tokens, $tokensFile ?: dirname(__DIR__, 2) . '/temp/tokens-dump.json');
     }
 }