ConstructorAnalyzer - always find only non-abstract contructors (#673)

kubawerlos · Dec 2, 2021 · 93cf807 · 93cf807
1 parent 656c164
commit 93cf807
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 27 deletions.
diff --git a/.dev-tools/infection.json b/.dev-tools/infection.json
@@ -50,6 +50,7 @@
         "Coalesce": true,
         "ConcatOperandRemoval": true,
         "Continue_": true,
+        "Decrement": true,
         "DivEqual": true,
         "Division": true,
         "DoWhile": true,
@@ -65,6 +66,7 @@
         "GreaterThanNegotiation": true,
         "GreaterThanOrEqualToNegotiation": true,
         "Identical": true,
+        "Increment": true,
         "InstanceOf_": true,
         "LessThanNegotiation": true,
         "LessThanOrEqualToNegotiation": true,

diff --git a/.dev-tools/src/InfectionConfigBuilder.php b/.dev-tools/src/InfectionConfigBuilder.php
@@ -18,13 +18,11 @@ final class InfectionConfigBuilder
 {
     private const UNWANTED_MUTATORS = [
         'Concat',
-        'Decrement',
         'DecrementInteger',
         'FalseValue',
         'GreaterThan',
         'GreaterThanOrEqualTo',
         'IdenticalEqual',
-        'Increment',
         'IncrementInteger',
         'IntegerNegation',
         'LessThan',

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-3104-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3103-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=main&event=push)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)

diff --git a/src/Analyzer/ConstructorAnalyzer.php b/src/Analyzer/ConstructorAnalyzer.php
@@ -21,7 +21,7 @@
  */
 final class ConstructorAnalyzer
 {
-    public function findConstructor(Tokens $tokens, int $classIndex, bool $allowAbstract): ?ConstructorAnalysis
+    public function findNonAbstractConstructor(Tokens $tokens, int $classIndex): ?ConstructorAnalysis
     {
         if (!$tokens[$classIndex]->isGivenKind(\T_CLASS)) {
             throw new \InvalidArgumentException(\sprintf('Index %d is not a class.', $classIndex));
@@ -39,7 +39,7 @@ public function findConstructor(Tokens $tokens, int $classIndex, bool $allowAbst
             }
 
             $constructorAttributes = $tokensAnalyzer->getMethodAttributes($index);
-            if (!$allowAbstract && $constructorAttributes['abstract']) {
+            if ($constructorAttributes['abstract']) {
                 return null;
             }
 

diff --git a/src/Fixer/ConstructorEmptyBracesFixer.php b/src/Fixer/ConstructorEmptyBracesFixer.php
@@ -66,7 +66,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
-            $constructorAnalysis = $constructorAnalyzer->findConstructor($tokens, $index, true);
+            $constructorAnalysis = $constructorAnalyzer->findNonAbstractConstructor($tokens, $index);
             if ($constructorAnalysis === null) {
                 continue;
             }

diff --git a/src/Fixer/MultilinePromotedPropertiesFixer.php b/src/Fixer/MultilinePromotedPropertiesFixer.php
@@ -80,7 +80,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
-            $constructorAnalysis = $constructorAnalyzer->findConstructor($tokens, $index, false);
+            $constructorAnalysis = $constructorAnalyzer->findNonAbstractConstructor($tokens, $index);
             if ($constructorAnalysis === null) {
                 continue;
             }

diff --git a/src/Fixer/PromotedConstructorPropertyFixer.php b/src/Fixer/PromotedConstructorPropertyFixer.php
@@ -105,7 +105,7 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
                 continue;
             }
 
-            $constructorAnalysis = $constructorAnalyzer->findConstructor($tokens, $index, false);
+            $constructorAnalysis = $constructorAnalyzer->findNonAbstractConstructor($tokens, $index);
             if ($constructorAnalysis === null) {
                 continue;
             }

diff --git a/tests/Analyzer/ConstructorAnalyzerTest.php b/tests/Analyzer/ConstructorAnalyzerTest.php
@@ -31,21 +31,21 @@ public function testFindingConstructorWhenNotForClass(): void
         $tokens = Tokens::fromCode('<?php $no . $class . $here;');
         $analyzer = new ConstructorAnalyzer();
 
-        $analyzer->findConstructor($tokens, 2, true);
+        $analyzer->findNonAbstractConstructor($tokens, 2);
     }
 
     /**
      * @param array<int, null|int> $expected
      *
      * @dataProvider provideFindingNonAbstractConstructorCases
      */
-    public function testFindingNonAbstractConstructor(array $expected, bool $allowAbstract, string $code): void
+    public function testFindingNonAbstractConstructor(array $expected, string $code): void
     {
         $tokens = Tokens::fromCode($code);
         $analyzer = new ConstructorAnalyzer();
 
         foreach ($expected as $classIndex => $nonAbstractConstructorIndex) {
-            $constructorAnalysis = $analyzer->findConstructor($tokens, $classIndex, $allowAbstract);
+            $constructorAnalysis = $analyzer->findNonAbstractConstructor($tokens, $classIndex);
 
             if ($nonAbstractConstructorIndex === null) {
                 self::assertNull($constructorAnalysis);
@@ -57,53 +57,40 @@ public function testFindingNonAbstractConstructor(array $expected, bool $allowAb
     }
 
     /**
-     * @return iterable<array{array<int, null|int>, bool, string}>
+     * @return iterable<array{array<int, null|int>, string}>
      */
     public static function provideFindingNonAbstractConstructorCases(): iterable
     {
         yield 'no constructor' => [
             [3 => null],
-            true,
             '<?php abstract class Foo {
                 public function notConstructor() {}
             }',
         ];
 
-        yield 'abstract constructor allowed to be found' => [
-            [3 => 13],
-            true,
-            '<?php abstract class Foo {
-                abstract public function __construct() {}
-            }',
-        ];
-
-        yield 'abstract constructor not allowed to be found' => [
+        yield 'abstract constructor' => [
             [3 => null],
-            false,
             '<?php abstract class Foo {
                 abstract public function __construct() {}
             }',
         ];
 
         yield 'public constructor' => [
             [3 => 11],
-            true,
             '<?php abstract class Foo {
                 public function __construct() {}
             }',
         ];
 
         yield 'uppercase constructor' => [
             [3 => 11],
-            true,
             '<?php abstract class Foo {
                 public function __CONSTRUCT() {}
             }',
         ];
 
         yield 'class with other elements' => [
             [3 => 29],
-            true,
             '<?php abstract class Foo {
                 public $a;
                 public static function create() {}
@@ -114,7 +101,6 @@ public function bar() {}
 
         yield 'multiple classes' => [
             [2 => 10, 21 => null, 29 => 37],
-            true,
             '<?php
             class Foo {
                 public function __construct() {}