diff --git a/infection.json.dist b/infection.json.dist index e6852ad96..7827eb88b 100644 --- a/infection.json.dist +++ b/infection.json.dist @@ -10,12 +10,5 @@ "badge": { "branch": "master" } - }, - "mutators": { - "MethodCallRemoval": { - "ignore": [ - "Infection\\Finder\\SourceFilesFinder::__construct::63" - ] - } } } diff --git a/src/Mutator/Util/Mutator.php b/src/Mutator/Util/Mutator.php index 551f0943d..019a2e08b 100644 --- a/src/Mutator/Util/Mutator.php +++ b/src/Mutator/Util/Mutator.php @@ -67,11 +67,7 @@ final public function shouldMutate(Node $node): bool return true; } - return !$this->config->isIgnored( - $reflectionClass->getName(), - $node->getAttribute(ReflectionVisitor::FUNCTION_NAME, ''), - $node->getLine() - ); + return !$this->config->isIgnored($reflectionClass->getName(), $node->getAttribute(ReflectionVisitor::FUNCTION_NAME, '')); } final public static function getName(): string diff --git a/src/Mutator/Util/MutatorConfig.php b/src/Mutator/Util/MutatorConfig.php index 6eb89339e..d7e1c0618 100644 --- a/src/Mutator/Util/MutatorConfig.php +++ b/src/Mutator/Util/MutatorConfig.php @@ -56,7 +56,7 @@ public function __construct(array $config) $this->mutatorSettings = $config['settings'] ?? []; } - public function isIgnored(string $class, string $method, int $lineNumber = null): bool + public function isIgnored(string $class, string $method): bool { if (\in_array($class, $this->ignoreConfig)) { return true; @@ -67,10 +67,7 @@ public function isIgnored(string $class, string $method, int $lineNumber = null) } foreach ($this->ignoreConfig as $ignorePattern) { - if (fnmatch($ignorePattern, $class, FNM_NOESCAPE) - || fnmatch($ignorePattern, $class . '::' . $method, FNM_NOESCAPE) - || ($lineNumber !== null && fnmatch($ignorePattern, $class . '::' . $method . '::' . $lineNumber, FNM_NOESCAPE)) - ) { + if (fnmatch($ignorePattern, $class, FNM_NOESCAPE) || fnmatch($ignorePattern, $class . '::' . $method, FNM_NOESCAPE)) { return true; } } diff --git a/tests/Mutator/Util/MutatorConfigTest.php b/tests/Mutator/Util/MutatorConfigTest.php index 617d57848..e766b6a7d 100644 --- a/tests/Mutator/Util/MutatorConfigTest.php +++ b/tests/Mutator/Util/MutatorConfigTest.php @@ -46,11 +46,11 @@ final class MutatorConfigTest extends TestCase /** * @dataProvider providesIgnoredValues */ - public function test_is_ignored_returns_true_if_there_is_a_match(array $ignored, string $class, string $method, int $lineNumber = null): void + public function test_is_ignored_returns_true_if_there_is_a_match(array $ignored, string $class, string $method): void { $config = new MutatorConfig(['ignore' => $ignored]); - $this->assertTrue($config->isIgnored($class, $method, $lineNumber)); + $this->assertTrue($config->isIgnored($class, $method)); } public function providesIgnoredValues(): \Generator @@ -90,13 +90,6 @@ public function providesIgnoredValues(): \Generator 'Foo\Bar\Test', 'method', ]; - - yield 'It ignores a specific line number' => [ - ['Foo\Bar\Test::method::63'], - 'Foo\Bar\Test', - 'method', - 63, - ]; } /**