Remove Mutant

doc/nomenclature.md

@@ -2,9 +2,58 @@
 
 ## Table of Contents
 
+- [A](#a)
+    - [AST][ast]
+- [M](#m)
+    - [Mutagenesis][mutagenesis]
+    - [Mutant][mutant]
+    - [Mutation][mutation]
+    - [Mutator][mutator]
+- [S](#s)
+    - [Subject][subject]
 - [T](#t)
-  - [Tracer][tracer]
-  - [Trace][trace]
+    - [Tracer][tracer]
+    - [Trace][trace]
+
+
+## A
+
+### AST
+
+Acronym for [Abstract Syntax Tree][ast-definition]. It is a tree representation of the abstract
+syntactic structure of code. It is what Infection parses the code into in order to operate on it.
+
+
+## M
+
+### Mutagenesis
+
+Process of creating a mutant from the original program.
+
+
+### Mutant
+
+New program that differs from the original by applying a mutation.
+
+
+### Mutation
+
+The result of applying a mutator to the AST of a subject and represents a change to be applied.
+
+
+### Mutator
+
+Define a possible transformation, which applied to the AST of a subject will result in a mutation.
+
+In the Mutation Testing literature, mutators are also known as "mutant operator",
+"mutagenic operator", "mutagen" and "mutation rule".
+
+
+## S
+
+### Subject
+
+An addressable piece of code to be targeted for mutation testing.
 
 
 ## T
@@ -23,5 +72,12 @@ Artifact produced by a tracer: provides the piece of source code and its associa
 
 <hr />
 
+[ast]: #ast
+[ast-definition]: https://en.wikipedia.org/wiki/Abstract_syntax_tree
+[mutagenesis]: #mutagenesis
+[mutant]: #mutant
+[mutation]: #mutation
+[mutator]: #mutator
+[subject]: #subject
 [tracer]: #tracer
 [trace]: #trace

src/Container.php

@@ -64,7 +64,7 @@
 use Infection\Metrics\MinMsiChecker;
 use Infection\Mutant\MutantCodeFactory;
 use Infection\Mutant\MutantExecutionResultFactory;
-use Infection\Mutant\MutantFactory;
+use Infection\Mutant\MutationFactory;
 use Infection\Mutation\FileMutationGenerator;
 use Infection\Mutation\MutationAttributeKeys;
 use Infection\Mutation\MutationGenerator;
@@ -224,8 +224,8 @@ public static function create(): self
             MutantCodeFactory::class => static function (self $container): MutantCodeFactory {
                 return new MutantCodeFactory($container->getPrinter());
             },
-            MutantFactory::class => static function (self $container): MutantFactory {
-                return new MutantFactory(
+            MutationFactory::class => static function (self $container): MutationFactory {
+                return new MutationFactory(
                     $container->getConfiguration()->getTmpDir(),
                     $container->getDiffer(),
                     $container->getPrinter(),
@@ -398,7 +398,8 @@ public static function create(): self
                 return new FileMutationGenerator(
                     $container->getFileParser(),
                     $container->getNodeTraverserFactory(),
-                    $container->getLineRangeCalculator()
+                    $container->getLineRangeCalculator(),
+                    $container->getMutationFactory()
                 );
             },
             LoggerFactory::class => static function (self $container): LoggerFactory {
@@ -453,7 +454,6 @@ public static function create(): self
             MutationTestingRunner::class => static function (self $container): MutationTestingRunner {
                 return new MutationTestingRunner(
                     $container->getMutantProcessFactory(),
-                    $container->getMutantFactory(),
                     $container->getProcessRunner(),
                     $container->getEventDispatcher(),
                     $container->getConfiguration()->isDryRun()
@@ -654,9 +654,9 @@ public function getMutantCodeFactory(): MutantCodeFactory
         return $this->get(MutantCodeFactory::class);
     }
 
-    public function getMutantFactory(): MutantFactory
+    public function getMutationFactory(): MutationFactory
     {
-        return $this->get(MutantFactory::class);
+        return $this->get(MutationFactory::class);
     }
 
     public function getDiffer(): Differ

src/Engine.php

@@ -157,12 +157,15 @@ private function runMutationAnalysis(): void
                 : []
         );
 
-        $actualExtraOptions = $this->config->getTestFrameworkExtraOptions();
+        $extraOptions = $this->config->getTestFrameworkExtraOptions();
 
-        $filteredExtraOptionsForMutant = $this->adapter instanceof ProvidesInitialRunOnlyOptions
-            ? $this->testFrameworkExtraOptionsFilter->filterForMutantProcess($actualExtraOptions, $this->adapter->getInitialRunOnlyOptions())
-            : $actualExtraOptions;
+        $mutationExtraOptions = $this->adapter instanceof ProvidesInitialRunOnlyOptions
+            ? $this->testFrameworkExtraOptionsFilter->filterForMutantProcess(
+                $extraOptions,
+                $this->adapter->getInitialRunOnlyOptions()
+            )
+            : $extraOptions;
 
-        $this->mutationTestingRunner->run($mutations, $filteredExtraOptionsForMutant);
+        $this->mutationTestingRunner->run($mutations, $mutationExtraOptions);
     }
 }

src/Event/Subscriber/MutationTestingConsoleLoggerSubscriber.php

@@ -138,7 +138,7 @@ private function showMutations(array $executionResults, string $headlinePrefix):
                 ),
             ]);
 
-            $this->output->writeln($this->diffColorizer->colorize($executionResult->getMutantDiff()));
+            $this->output->writeln($this->diffColorizer->colorize($executionResult->getMutationDiff()));
         }
     }
 

src/Logger/TextFileLogger.php

@@ -138,7 +138,7 @@ private function getResultsLine(
 
             $lines[] = self::getMutatorLine($index, $executionResult);
             $lines[] = '';
-            $lines[] = Str::trimLineReturns($executionResult->getMutantDiff());
+            $lines[] = Str::trimLineReturns($executionResult->getMutationDiff());
 
             if ($this->debugMode) {
                 $lines[] = '';

src/Mutant/MutantCodeFactory.php

@@ -35,9 +35,10 @@
 
 namespace Infection\Mutant;
 
-use Infection\Mutation\Mutation;
+use Infection\PhpParser\MutatedNode;
 use Infection\PhpParser\Visitor\CloneVisitor;
 use Infection\PhpParser\Visitor\MutatorVisitor;
+use PhpParser\Node;
 use PhpParser\NodeTraverser;
 use PhpParser\PrettyPrinterAbstract;
 
@@ -54,14 +55,23 @@ public function __construct(PrettyPrinterAbstract $prettyPrinter)
         $this->printer = $prettyPrinter;
     }
 
-    public function createCode(Mutation $mutation): string
-    {
+    /**
+     * @param array<string|int|float> $attributes
+     * @param Node[] $originalFileAst
+     * @param class-string $mutatedNodeClass
+     */
+    public function createCode(
+        array $attributes,
+        array $originalFileAst,
+        string $mutatedNodeClass,
+        MutatedNode $mutatedNode
+    ): string {
         $traverser = new NodeTraverser();
 
         $traverser->addVisitor(new CloneVisitor());
-        $traverser->addVisitor(new MutatorVisitor($mutation));
+        $traverser->addVisitor(new MutatorVisitor($attributes, $mutatedNodeClass, $mutatedNode));
 
-        $mutatedStatements = $traverser->traverse($mutation->getOriginalFileAst());
+        $mutatedStatements = $traverser->traverse($originalFileAst);
 
         return $this->printer->prettyPrintFile($mutatedStatements);
     }

src/Mutant/MutantExecutionResult.php

@@ -36,6 +36,7 @@
 namespace Infection\Mutant;
 
 use function array_keys;
+use Infection\Mutation\Mutation;
 use Infection\Mutator\ProfileList;
 use Webmozart\Assert\Assert;
 
@@ -48,7 +49,7 @@ class MutantExecutionResult
     private $processCommandLine;
     private $processOutput;
     private $detectionStatus;
-    private $mutantDiff;
+    private $mutationDiff;
     private $mutatorName;
     private $originalFilePath;
     private $originalStartingLine;
@@ -57,7 +58,7 @@ public function __construct(
         string $processCommandLine,
         string $processOutput,
         string $detectionStatus,
-        string $mutantDiff,
+        string $mutationDiff,
         string $mutatorName,
         string $originalFilePath,
         int $originalStartingLine
@@ -68,22 +69,20 @@ public function __construct(
         $this->processCommandLine = $processCommandLine;
         $this->processOutput = $processOutput;
         $this->detectionStatus = $detectionStatus;
-        $this->mutantDiff = $mutantDiff;
+        $this->mutationDiff = $mutationDiff;
         $this->mutatorName = $mutatorName;
         $this->originalFilePath = $originalFilePath;
         $this->originalStartingLine = $originalStartingLine;
     }
 
-    public static function createFromNonCoveredMutant(Mutant $mutant): self
+    public static function createFromNonCoveredByTestsMutation(Mutation $mutation): self
     {
-        $mutation = $mutant->getMutation();
-
         return new self(
             '',
             '',
             DetectionStatus::NOT_COVERED,
-            $mutant->getDiff(),
-            $mutant->getMutation()->getMutatorName(),
+            $mutation->getDiff(),
+            $mutation->getMutatorName(),
             $mutation->getOriginalFilePath(),
             $mutation->getOriginalStartingLine()
         );
@@ -104,9 +103,9 @@ public function getDetectionStatus(): string
         return $this->detectionStatus;
     }
 
-    public function getMutantDiff(): string
+    public function getMutationDiff(): string
     {
-        return $this->mutantDiff;
+        return $this->mutationDiff;
     }
 
     public function getMutatorName(): string

src/Mutant/MutantExecutionResultFactory.php

@@ -57,14 +57,13 @@ public function __construct(TestFrameworkAdapter $testFrameworkAdapter)
     public function createFromProcess(MutantProcess $mutantProcess): MutantExecutionResult
     {
         $process = $mutantProcess->getProcess();
-        $mutant = $mutantProcess->getMutant();
-        $mutation = $mutant->getMutation();
+        $mutation = $mutantProcess->getMutation();
 
         return new MutantExecutionResult(
             $process->getCommandLine(),
             $this->retrieveProcessOutput($process),
             $this->retrieveDetectionStatus($mutantProcess),
-            $mutant->getDiff(),
+            $mutation->getDiff(),
             $mutation->getMutatorName(),
             $mutation->getOriginalFilePath(),
             $mutation->getOriginalStartingLine()
@@ -86,7 +85,7 @@ private function retrieveProcessOutput(Process $process): string
 
     private function retrieveDetectionStatus(MutantProcess $mutantProcess): string
     {
-        if (!$mutantProcess->getMutant()->isCoveredByTest()) {
+        if (!$mutantProcess->getMutation()->hasTests()) {
             return DetectionStatus::NOT_COVERED;
         }