bug #6089 TokensAnalyzer.php - Fix T_ENCAPSED_AND_WHITESPACE handling…

… in isBina… (SpacePossum) This PR was merged into the master branch. Discussion ---------- TokensAnalyzer.php - Fix T_ENCAPSED_AND_WHITESPACE handling in isBina… …ryOperator replaces #6088 Commits ------- 79f0872 TokensAnalyzer.php - Fix T_ENCAPSED_AND_WHITESPACE handling in isBinaryOperator
PHP-CS-Fixer · Oct 31, 2021 · b93ee4b · b93ee4b
2 parents 17d66a7 + 79f0872
commit b93ee4b
Show file tree

Hide file tree

Showing 27 changed files with 74 additions and 97 deletions.
diff --git a/src/AbstractPhpdocTypesFixer.php b/src/AbstractPhpdocTypesFixer.php
@@ -66,7 +66,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
             $doc = new DocBlock($token->getContent());
             $annotations = $doc->getAnnotationsOfType($this->tags);
 
-            if (empty($annotations)) {
+            if (0 === \count($annotations)) {
                 continue;
             }
 

diff --git a/src/Fixer/ClassNotation/NoPhp4ConstructorFixer.php b/src/Fixer/ClassNotation/NoPhp4ConstructorFixer.php
@@ -147,13 +147,11 @@ private function fixConstructor(Tokens $tokens, string $className, int $classSta
         $php4 = $this->findFunction($tokens, $className, $classStart, $classEnd);
 
         if (null === $php4) {
-            // no PHP4-constructor!
-            return;
+            return; // no PHP4-constructor!
         }
 
         if (!empty($php4['modifiers'][T_ABSTRACT]) || !empty($php4['modifiers'][T_STATIC])) {
-            // PHP4 constructor can't be abstract or static
-            return;
+            return; // PHP4 constructor can't be abstract or static
         }
 
         $php5 = $this->findFunction($tokens, '__construct', $classStart, $classEnd);

diff --git a/src/Fixer/Import/OrderedImportsFixer.php b/src/Fixer/Import/OrderedImportsFixer.php
@@ -477,6 +477,7 @@ private function getNewOrder(array $uses, Tokens $tokens): array
         if (null !== $this->configuration['imports_order']) {
             // Grouping indexes by import type.
             $groupedByTypes = [];
+
             foreach ($indexes as $startIndex => $item) {
                 $groupedByTypes[$item['importType']][$startIndex] = $item;
             }
@@ -488,6 +489,7 @@ private function getNewOrder(array $uses, Tokens $tokens): array
 
             // Ordering groups
             $sortedGroups = [];
+
             foreach ($this->configuration['imports_order'] as $type) {
                 if (isset($groupedByTypes[$type]) && !empty($groupedByTypes[$type])) {
                     foreach ($groupedByTypes[$type] as $startIndex => $item) {

diff --git a/src/Fixer/PhpUnit/PhpUnitNamespacedFixer.php b/src/Fixer/PhpUnit/PhpUnitNamespacedFixer.php
@@ -216,8 +216,8 @@ private function generateReplacement(string $originalClassName): Tokens
         }
 
         $parts = explode($delimiter, $string);
-
         $tokensArray = [];
+
         while (!empty($parts)) {
             $tokensArray[] = new Token([T_STRING, array_shift($parts)]);
             if (!empty($parts)) {

diff --git a/src/Fixer/PhpUnit/PhpUnitSizeClassFixer.php b/src/Fixer/PhpUnit/PhpUnitSizeClassFixer.php
@@ -106,9 +106,11 @@ private function createDocBlock(Tokens $tokens, int $docBlockIndex): void
     private function updateDocBlockIfNeeded(Tokens $tokens, int $docBlockIndex): void
     {
         $doc = new DocBlock($tokens[$docBlockIndex]->getContent());
-        if (!empty($this->filterDocBlock($doc))) {
+
+        if (0 !== \count($this->filterDocBlock($doc))) {
             return;
         }
+
         $doc = $this->makeDocBlockMultiLineIfNeeded($doc, $tokens, $docBlockIndex);
         $lines = $this->addSizeAnnotation($doc, $tokens, $docBlockIndex);
         $lines = implode('', $lines);
@@ -133,7 +135,8 @@ private function addSizeAnnotation(DocBlock $docBlock, Tokens $tokens, int $docB
     private function makeDocBlockMultiLineIfNeeded(DocBlock $doc, Tokens $tokens, int $docBlockIndex): DocBlock
     {
         $lines = $doc->getLines();
-        if (1 === \count($lines) && empty($this->filterDocBlock($doc))) {
+
+        if (1 === \count($lines) && 0 === \count($this->filterDocBlock($doc))) {
             $lines = $this->splitUpDocBlock($lines, $tokens, $docBlockIndex);
 
             return new DocBlock(implode('', $lines));

diff --git a/src/Fixer/PhpUnit/PhpUnitTestAnnotationFixer.php b/src/Fixer/PhpUnit/PhpUnitTestAnnotationFixer.php
@@ -408,6 +408,6 @@ private function addTestAnnotation(array $lines, Tokens $tokens, int $docBlockIn
 
     private function doesDocBlockContainTest(DocBlock $doc): bool
     {
-        return !empty($doc->getAnnotationsOfType('test'));
+        return 0 !== \count($doc->getAnnotationsOfType('test'));
     }
 }
diff --git a/src/Fixer/PhpUnit/PhpUnitTestClassRequiresCoversFixer.php b/src/Fixer/PhpUnit/PhpUnitTestClassRequiresCoversFixer.php
@@ -86,7 +86,7 @@ protected function applyPhpUnitClassFix(Tokens $tokens, int $startIndex, int $en
             $doc = new DocBlock($docContent);
 
             // skip if already has annotation
-            if (!empty($doc->getAnnotationsOfType([
+            if (0 !== \count($doc->getAnnotationsOfType([
                 'covers',
                 'coversDefaultClass',
                 'coversNothing',

diff --git a/src/Fixer/Phpdoc/GeneralPhpdocAnnotationRemoveFixer.php b/src/Fixer/Phpdoc/GeneralPhpdocAnnotationRemoveFixer.php
@@ -103,7 +103,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
             $annotations = $doc->getAnnotationsOfType($this->configuration['annotations']);
 
             // nothing to do if there are no annotations
-            if (empty($annotations)) {
+            if (0 === \count($annotations)) {
                 continue;
             }
 

diff --git a/src/Fixer/Phpdoc/PhpdocAnnotationWithoutDotFixer.php b/src/Fixer/Phpdoc/PhpdocAnnotationWithoutDotFixer.php
@@ -81,7 +81,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
             $doc = new DocBlock($token->getContent());
             $annotations = $doc->getAnnotations();
 
-            if (empty($annotations)) {
+            if (0 === \count($annotations)) {
                 continue;
             }
 

diff --git a/src/Fixer/Phpdoc/PhpdocNoEmptyReturnFixer.php b/src/Fixer/Phpdoc/PhpdocNoEmptyReturnFixer.php
@@ -88,7 +88,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
             $doc = new DocBlock($token->getContent());
             $annotations = $doc->getAnnotationsOfType('return');
 
-            if (empty($annotations)) {
+            if (0 === \count($annotations)) {
                 continue;
             }
 

diff --git a/src/Fixer/Phpdoc/PhpdocOrderFixer.php b/src/Fixer/Phpdoc/PhpdocOrderFixer.php
@@ -101,13 +101,13 @@ private function moveParamAnnotations(string $content): string
         $params = $doc->getAnnotationsOfType('param');
 
         // nothing to do if there are no param annotations
-        if (empty($params)) {
+        if (0 === \count($params)) {
             return $content;
         }
 
         $others = $doc->getAnnotationsOfType(['throws', 'return']);
 
-        if (empty($others)) {
+        if (0 === \count($others)) {
             return $content;
         }
 
@@ -137,14 +137,14 @@ private function moveReturnAnnotations(string $content): string
         $returns = $doc->getAnnotationsOfType('return');
 
         // nothing to do if there are no return annotations
-        if (empty($returns)) {
+        if (0 === \count($returns)) {
             return $content;
         }
 
         $others = $doc->getAnnotationsOfType(['param', 'throws']);
 
         // nothing to do if there are no other annotations
-        if (empty($others)) {
+        if (0 === \count($others)) {
             return $content;
         }
 

diff --git a/src/Tokenizer/TokensAnalyzer.php b/src/Tokenizer/TokensAnalyzer.php
@@ -345,6 +345,7 @@ public function isConstantInvocation(int $index): bool
         // check for `extends`/`implements`/`use` list
         if ($this->tokens[$prevIndex]->equals(',')) {
             $checkIndex = $prevIndex;
+
             while ($this->tokens[$checkIndex]->equalsAny([',', [T_AS], [CT::T_NAMESPACE_OPERATOR], [T_NS_SEPARATOR], [T_STRING]])) {
                 $checkIndex = $this->tokens->getPrevMeaningfulToken($checkIndex);
             }
@@ -382,6 +383,7 @@ public function isConstantInvocation(int $index): bool
         // check for non-capturing catches
         if ($this->tokens[$prevIndex]->equals('(')) {
             $prevPrevIndex = $this->tokens->getPrevMeaningfulToken($prevIndex);
+
             if ($this->tokens[$prevPrevIndex]->isGivenKind(T_CATCH)) {
                 return false;
             }
@@ -426,11 +428,13 @@ public function isUnaryPredecessorOperator(int $index): bool
         static $potentialBinaryOperator = ['+', '-', '&', [CT::T_RETURN_REF]];
 
         static $otherOperators;
+
         if (null === $otherOperators) {
             $otherOperators = ['!', '~', '@', [T_ELLIPSIS]];
         }
 
         static $disallowedPrevTokens;
+
         if (null === $disallowedPrevTokens) {
             $disallowedPrevTokens = [
                 ']',
@@ -522,6 +526,7 @@ public function isBinaryOperator(int $index): bool
         ];
 
         static $arrayOperators;
+
         if (null === $arrayOperators) {
             $arrayOperators = [
                 T_AND_EQUAL => true,            // &=
@@ -564,10 +569,6 @@ public function isBinaryOperator(int $index): bool
         $tokens = $this->tokens;
         $token = $tokens[$index];
 
-        if (isset($potentialUnaryNonArrayOperators[$token->getContent()])) {
-            return !$this->isUnaryPredecessorOperator($index);
-        }
-
         if ($token->isArray()) {
             return isset($arrayOperators[$token->getId()]);
         }
@@ -576,6 +577,10 @@ public function isBinaryOperator(int $index): bool
             return true;
         }
 
+        if (isset($potentialUnaryNonArrayOperators[$token->getContent()])) {
+            return !$this->isUnaryPredecessorOperator($index);
+        }
+
         return false;
     }
 

diff --git a/src/Utils.php b/src/Utils.php
@@ -130,7 +130,7 @@ static function (int $a, int $b): int {
      */
     public static function naturalLanguageJoinWithBackticks(array $names): string
     {
-        if (empty($names)) {
+        if (0 === \count($names)) {
             throw new \InvalidArgumentException('Array of names cannot be empty.');
         }
 

diff --git a/tests/DocBlock/AnnotationTest.php b/tests/DocBlock/AnnotationTest.php
@@ -522,7 +522,7 @@ public function testSetTypesOnBadTag(): void
     public function testGetTagsWithTypes(): void
     {
         $tags = Annotation::getTagsWithTypes();
-        static::assertIsArray($tags);
+
         foreach ($tags as $tag) {
             static::assertIsString($tag);
             static::assertNotEmpty($tag);

diff --git a/tests/DocBlock/DocBlockTest.php b/tests/DocBlock/DocBlockTest.php
@@ -65,11 +65,11 @@ public function testEmptyContent(): void
     public function testGetLines(): void
     {
         $doc = new DocBlock(self::$sample);
+        $lines = $doc->getLines();
 
-        static::assertIsArray($doc->getLines());
-        static::assertCount(15, $doc->getLines());
+        static::assertCount(15, $lines);
 
-        foreach ($doc->getLines() as $index => $line) {
+        foreach ($lines as $index => $line) {
             static::assertInstanceOf(\PhpCsFixer\DocBlock\Line::class, $line);
             static::assertSame($doc->getLine($index), $line);
         }
@@ -80,13 +80,13 @@ public function testGetLines(): void
     public function testGetAnnotations(): void
     {
         $doc = new DocBlock(self::$sample);
+        $annotations = $doc->getAnnotations();
 
-        static::assertIsArray($doc->getAnnotations());
-        static::assertCount(5, $doc->getAnnotations());
+        static::assertCount(5, $annotations);
 
-        foreach ($doc->getAnnotations() as $index => $annotations) {
-            static::assertInstanceOf(\PhpCsFixer\DocBlock\Annotation::class, $annotations);
-            static::assertSame($doc->getAnnotation($index), $annotations);
+        foreach ($annotations as $index => $annotation) {
+            static::assertInstanceOf(\PhpCsFixer\DocBlock\Annotation::class, $annotation);
+            static::assertSame($doc->getAnnotation($index), $annotation);
         }
 
         static::assertEmpty($doc->getAnnotation(5));
@@ -95,10 +95,8 @@ public function testGetAnnotations(): void
     public function testGetAnnotationsOfTypeParam(): void
     {
         $doc = new DocBlock(self::$sample);
-
         $annotations = $doc->getAnnotationsOfType('param');
 
-        static::assertIsArray($annotations);
         static::assertCount(3, $annotations);
 
         $first = '     * @param string $hello
@@ -117,10 +115,8 @@ public function testGetAnnotationsOfTypeParam(): void
     public function testGetAnnotationsOfTypeThrows(): void
     {
         $doc = new DocBlock(self::$sample);
-
         $annotations = $doc->getAnnotationsOfType('throws');
 
-        static::assertIsArray($annotations);
         static::assertCount(1, $annotations);
 
         $content = '     * @throws \Exception asdnjkasd
@@ -134,10 +130,8 @@ public function testGetAnnotationsOfTypeThrows(): void
     public function testGetAnnotationsOfTypeReturn(): void
     {
         $doc = new DocBlock(self::$sample);
-
         $annotations = $doc->getAnnotationsOfType('return');
 
-        static::assertIsArray($annotations);
         static::assertCount(1, $annotations);
 
         $content = '     * @return void
@@ -149,10 +143,8 @@ public function testGetAnnotationsOfTypeReturn(): void
     public function testGetAnnotationsOfTypeFoo(): void
     {
         $doc = new DocBlock(self::$sample);
-
         $annotations = $doc->getAnnotationsOfType('foo');
 
-        static::assertIsArray($annotations);
         static::assertCount(0, $annotations);
     }
 

diff --git a/tests/FixerDefinition/FileSpecificCodeSampleTest.php b/tests/FixerDefinition/FileSpecificCodeSampleTest.php
@@ -28,10 +28,7 @@ final class FileSpecificCodeSampleTest extends TestCase
 {
     public function testImplementsFileSpecificCodeSampleInterface(): void
     {
-        $sample = new FileSpecificCodeSample(
-            file_get_contents(__FILE__),
-            new \SplFileInfo(__FILE__)
-        );
+        $sample = new FileSpecificCodeSample(file_get_contents(__FILE__), new \SplFileInfo(__FILE__));
 
         static::assertInstanceOf(\PhpCsFixer\FixerDefinition\FileSpecificCodeSampleInterface::class, $sample);
     }

diff --git a/tests/RuleSet/RuleSetTest.php b/tests/RuleSet/RuleSetTest.php
@@ -134,7 +134,6 @@ public function testGetBuildInSetDefinitionNames(): void
     {
         $setNames = RuleSets::getSetDefinitionNames();
 
-        static::assertIsArray($setNames);
         static::assertNotEmpty($setNames);
     }
 

diff --git a/tests/RuleSet/RuleSetsTest.php b/tests/RuleSet/RuleSetsTest.php
@@ -294,7 +294,7 @@ private static function getFixerByName(string $name): AbstractFixer
 
         $fixers = $factory->getFixers();
 
-        if (empty($fixers)) {
+        if (0 === \count($fixers)) {
             throw new \RuntimeException('FixerFactory unexpectedly returned empty array.');
         }
 

diff --git a/tests/Test/AbstractFixerTestCase.php b/tests/Test/AbstractFixerTestCase.php
@@ -19,7 +19,6 @@
 use PhpCsFixer\Fixer\ConfigurableFixerInterface;
 use PhpCsFixer\Fixer\DeprecatedFixerInterface;
 use PhpCsFixer\Fixer\Whitespace\SingleBlankLineAtEofFixer;
-use PhpCsFixer\FixerConfiguration\FixerConfigurationResolverInterface;
 use PhpCsFixer\FixerConfiguration\FixerOptionInterface;
 use PhpCsFixer\FixerDefinition\CodeSampleInterface;
 use PhpCsFixer\FixerDefinition\FileSpecificCodeSampleInterface;
@@ -92,8 +91,6 @@ protected function tearDown(): void
 
     final public function testIsRisky(): void
     {
-        static::assertIsBool($this->fixer->isRisky(), sprintf('Return type for ::isRisky of "%s" is invalid.', $this->fixer->getName()));
-
         if ($this->fixer->isRisky()) {
             self::assertValidDescription($this->fixer->getName(), 'risky description', $this->fixer->getDefinition()->getRiskyDescription());
         } else {
@@ -126,23 +123,23 @@ final public function testFixerDefinitions(): void
 
         $configSamplesProvided = [];
         $dummyFileInfo = new StdinFileInfo();
+
         foreach ($samples as $sampleCounter => $sample) {
             static::assertInstanceOf(CodeSampleInterface::class, $sample, sprintf('[%s] Sample #%d', $fixerName, $sampleCounter));
             static::assertIsInt($sampleCounter);
 
             $code = $sample->getCode();
 
-            static::assertIsString($code, sprintf('[%s] Sample #%d', $fixerName, $sampleCounter));
             static::assertNotEmpty($code, sprintf('[%s] Sample #%d', $fixerName, $sampleCounter));
 
             if (!($this->fixer instanceof SingleBlankLineAtEofFixer)) {
                 static::assertStringEndsWith("\n", $code, sprintf('[%s] Sample #%d must end with linebreak', $fixerName, $sampleCounter));
             }
 
             $config = $sample->getConfiguration();
+
             if (null !== $config) {
                 static::assertTrue($fixerIsConfigurable, sprintf('[%s] Sample #%d has configuration, but the fixer is not configurable.', $fixerName, $sampleCounter));
-                static::assertIsArray($config, sprintf('[%s] Sample #%d configuration must be an array or null.', $fixerName, $sampleCounter));
 
                 $configSamplesProvided[$sampleCounter] = $config;
             } elseif ($fixerIsConfigurable) {
@@ -320,8 +317,6 @@ final public function testFixerConfigurationDefinitions(): void
 
         $configurationDefinition = $this->fixer->getConfigurationDefinition();
 
-        static::assertInstanceOf(FixerConfigurationResolverInterface::class, $configurationDefinition);
-
         foreach ($configurationDefinition->getOptions() as $option) {
             static::assertInstanceOf(FixerOptionInterface::class, $option);
             static::assertNotEmpty($option->getDescription());

diff --git a/tests/Test/AbstractTransformerTestCase.php b/tests/Test/AbstractTransformerTestCase.php
@@ -55,7 +55,6 @@ public function testGetName(): void
     {
         $name = $this->transformer->getName();
 
-        static::assertIsString($name);
         static::assertMatchesRegularExpression('/^[a-z]+[a-z_]*[a-z]$/', $name);
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,7 +134,6 @@ public function testGetBuildInSetDefinitionNames(): void @@
         {
             $setNames = RuleSets::getSetDefinitionNames();
-            static::assertIsArray($setNames);
             static::assertNotEmpty($setNames);
         }
@@ Expand Down @@