Move Infection\Mutator\Mutator to a separate package (#1963)

* Move `Infection\Mutator\Mutator` to a separate package * Upgrade `infection/mutator` * Fix `psalm` issues * Fix `phpstan` errors * Update e2e test to require `infection/mutator`. Bot, you were right * Add `TNode` template param to `IgnoreMutator`
infection · May 15, 2024 · 18a92e9 · 18a92e9
1 parent 0d5fd7e
commit 18a92e9
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 243 deletions.
diff --git a/composer.json b/composer.json
@@ -54,6 +54,7 @@
         "infection/abstract-testframework-adapter": "^0.5.0",
         "infection/extension-installer": "^0.1.0",
         "infection/include-interceptor": "^0.2.5",
+        "infection/mutator": "^0.4",
         "justinrainbow/json-schema": "^5.2.10",
         "nikic/php-parser": "^5.0",
         "ondram/ci-detector": "^4.1.0",

diff --git a/composer.lock b/composer.lock
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -10,11 +10,6 @@
       <code><![CDATA[$this->converters[$name->toLowerString()]($node)]]></code>
     </ImpureFunctionCall>
   </file>
-  <file src="src/Mutator/IgnoreMutator.php">
-    <InvalidArgument>
-      <code>$node</code>
-    </InvalidArgument>
-  </file>
   <file src="src/TestFramework/Coverage/JUnit/JUnitTestFileDataProvider.php">
     <InvalidReturnType>
       <code><![CDATA[iterable<string, string>]]></code>

diff --git a/src/Command/DescribeCommand.php b/src/Command/DescribeCommand.php
@@ -87,7 +87,7 @@ protected function executeCommand(IO $io): bool
 
         Assert::subclassOf($mutatorClass, Mutator::class);
 
-        /** @var ?Definition $definition */
+        /** @var Definition $definition */
         $definition = $mutatorClass::getDefinition();
 
         if ($definition === null) {

diff --git a/src/Mutator/Definition.php b/src/Mutator/Definition.php
diff --git a/src/Mutator/IgnoreMutator.php b/src/Mutator/IgnoreMutator.php
@@ -99,6 +99,8 @@ public function canMutate(Node $node): bool
     /**
      * @psalm-mutation-free
      *
+     * @param TNode $node
+     *
      * @return iterable<int|Node|Node[]>
      */
     public function mutate(Node $node): iterable

diff --git a/src/Mutator/Mutator.php b/src/Mutator/Mutator.php
diff --git a/src/Mutator/MutatorCategory.php b/src/Mutator/MutatorCategory.php
diff --git a/tests/e2e/Custom_Mutator/composer.json b/tests/e2e/Custom_Mutator/composer.json
@@ -11,5 +11,8 @@
         "psr-4": {
             "Custom_Mutator\\Test\\": "tests/"
         }
+    },
+    "require": {
+        "infection/mutator": "^0.4.0"
     }
 }
diff --git a/tests/e2e/Custom_Mutator/src/Mutator/CustomMutator.php b/tests/e2e/Custom_Mutator/src/Mutator/CustomMutator.php
@@ -54,7 +54,7 @@ public function getName(): string
         return end($parts);
     }
 
-    public static function getDefinition(): ?Definition
+    public static function getDefinition(): Definition
     {
         return new Definition(
             <<<'TXT'