Merge branch 'master' into feature/ignore-code-by-regex

infection · Sep 14, 2020 · cb789a0 · cb789a0
2 parents 8a1910c + 2a2a203
commit cb789a0
Show file tree

Hide file tree

Showing 11 changed files with 329 additions and 31 deletions.
diff --git a/src/Engine.php b/src/Engine.php
@@ -45,6 +45,7 @@
 use Infection\Metrics\MinMsiChecker;
 use Infection\Metrics\MinMsiCheckFailed;
 use Infection\Mutation\MutationGenerator;
+use Infection\PhpParser\Visitor\IgnoreNode\NodeIgnorer;
 use Infection\Process\Runner\InitialTestsFailed;
 use Infection\Process\Runner\InitialTestsRunner;
 use Infection\Process\Runner\MutationTestingRunner;
@@ -128,41 +129,70 @@ private function runInitialTestSuite(): void
             return;
         }
 
-        $initialTestSuitProcess = $this->initialTestsRunner->run(
+        $initialTestSuiteProcess = $this->initialTestsRunner->run(
             $this->config->getTestFrameworkExtraOptions(),
-            explode(' ', (string) $this->config->getInitialTestsPhpOptions()),
+            $this->getInitialTestsPhpOptionsArray(),
             $this->config->shouldSkipCoverage()
         );
 
-        if (!$initialTestSuitProcess->isSuccessful()) {
-            throw InitialTestsFailed::fromProcessAndAdapter($initialTestSuitProcess, $this->adapter);
+        if (!$initialTestSuiteProcess->isSuccessful()) {
+            throw InitialTestsFailed::fromProcessAndAdapter($initialTestSuiteProcess, $this->adapter);
         }
 
         $this->coverageChecker->checkCoverageHasBeenGenerated(
-            $initialTestSuitProcess->getCommandLine(),
-            $initialTestSuitProcess->getOutput()
+            $initialTestSuiteProcess->getCommandLine(),
+            $initialTestSuiteProcess->getOutput()
         );
 
-        // Limit the memory used for the mutation processes based on the memory used for the initial
-        // test run
-        $this->memoryLimiter->limitMemory($initialTestSuitProcess->getOutput(), $this->adapter);
+        /*
+         * Limit the memory used for the mutation processes based on the memory
+         * used for the initial test run.
+         */
+        $this->memoryLimiter->limitMemory($initialTestSuiteProcess->getOutput(), $this->adapter);
+    }
+
+    /**
+     * @return string[]
+     */
+    private function getInitialTestsPhpOptionsArray(): array
+    {
+        return explode(' ', (string) $this->config->getInitialTestsPhpOptions());
     }
 
     private function runMutationAnalysis(): void
     {
         $mutations = $this->mutationGenerator->generate(
             $this->config->mutateOnlyCoveredCode(),
-            $this->adapter instanceof IgnoresAdditionalNodes
-                ? $this->adapter->getNodeIgnorers()
-                : []
+            $this->getNodeIgnorers()
+        );
+
+        $this->mutationTestingRunner->run(
+            $mutations,
+            $this->getFilteredExtraOptionsForMutant()
         );
+    }
 
-        $actualExtraOptions = $this->config->getTestFrameworkExtraOptions();
+    /**
+     * @return NodeIgnorer[]
+     */
+    private function getNodeIgnorers(): array
+    {
+        if ($this->adapter instanceof IgnoresAdditionalNodes) {
+            return $this->adapter->getNodeIgnorers();
+        }
 
-        $filteredExtraOptionsForMutant = $this->adapter instanceof ProvidesInitialRunOnlyOptions
-            ? $this->testFrameworkExtraOptionsFilter->filterForMutantProcess($actualExtraOptions, $this->adapter->getInitialRunOnlyOptions())
-            : $actualExtraOptions;
+        return [];
+    }
+
+    private function getFilteredExtraOptionsForMutant(): string
+    {
+        if ($this->adapter instanceof ProvidesInitialRunOnlyOptions) {
+            return $this->testFrameworkExtraOptionsFilter->filterForMutantProcess(
+                $this->config->getTestFrameworkExtraOptions(),
+                $this->adapter->getInitialRunOnlyOptions()
+            );
+        }
 
-        $this->mutationTestingRunner->run($mutations, $filteredExtraOptionsForMutant);
+        return $this->config->getTestFrameworkExtraOptions();
     }
 }
diff --git a/src/Metrics/MinMsiChecker.php b/src/Metrics/MinMsiChecker.php
@@ -39,8 +39,9 @@
 
 /**
  * @internal
+ * @final
  */
-final class MinMsiChecker
+class MinMsiChecker
 {
     private const VALUE_OVER_REQUIRED_TOLERANCE = 2;
 

diff --git a/src/Mutation/MutationGenerator.php b/src/Mutation/MutationGenerator.php
@@ -49,8 +49,9 @@
 
 /**
  * @internal
+ * @final
  */
-final class MutationGenerator
+class MutationGenerator
 {
     private $traceProvider;
     private $mutators;

diff --git a/src/Process/Runner/InitialTestsFailed.php b/src/Process/Runner/InitialTestsFailed.php
@@ -47,31 +47,31 @@
 final class InitialTestsFailed extends Exception
 {
     public static function fromProcessAndAdapter(
-        Process $initialTestSuitProcess,
+        Process $initialTestSuiteProcess,
         TestFrameworkAdapter $testFrameworkAdapter
     ): self {
         $testFrameworkKey = $testFrameworkAdapter->getName();
 
         $lines = [
             'Project tests must be in a passing state before running Infection.',
-            $testFrameworkAdapter->getInitialTestsFailRecommendations($initialTestSuitProcess->getCommandLine()),
+            $testFrameworkAdapter->getInitialTestsFailRecommendations($initialTestSuiteProcess->getCommandLine()),
             sprintf(
                 '%s reported an exit code of %d.',
                 $testFrameworkKey,
-                $initialTestSuitProcess->getExitCode()
+                $initialTestSuiteProcess->getExitCode()
             ),
             sprintf(
                 'Refer to the %s\'s output below:',
                 $testFrameworkKey
             ),
         ];
 
-        if ($stdOut = $initialTestSuitProcess->getOutput()) {
+        if ($stdOut = $initialTestSuiteProcess->getOutput()) {
             $lines[] = 'STDOUT:';
             $lines[] = $stdOut;
         }
 
-        if ($stdError = $initialTestSuitProcess->getErrorOutput()) {
+        if ($stdError = $initialTestSuiteProcess->getErrorOutput()) {
             $lines[] = 'STDERR:';
             $lines[] = $stdError;
         }

diff --git a/src/Process/Runner/InitialTestsRunner.php b/src/Process/Runner/InitialTestsRunner.php
@@ -44,8 +44,9 @@
 
 /**
  * @internal
+ * @final
  */
-final class InitialTestsRunner
+class InitialTestsRunner
 {
     private $processBuilder;
     private $eventDispatcher;

diff --git a/src/Process/Runner/MutationTestingRunner.php b/src/Process/Runner/MutationTestingRunner.php
@@ -52,8 +52,9 @@
 
 /**
  * @internal
+ * @final
  */
-final class MutationTestingRunner
+class MutationTestingRunner
 {
     private $processFactory;
     private $mutantFactory;

diff --git a/src/Resource/Memory/MemoryLimiter.php b/src/Resource/Memory/MemoryLimiter.php
@@ -44,8 +44,9 @@
 
 /**
  * @internal
+ * @final
  */
-final class MemoryLimiter
+class MemoryLimiter
 {
     private $fileSystem;
     private $phpIniPath;

diff --git a/src/TestFramework/Coverage/CoverageChecker.php b/src/TestFramework/Coverage/CoverageChecker.php
@@ -50,8 +50,9 @@
 
 /**
  * @internal
+ * @final
  */
-final class CoverageChecker
+class CoverageChecker
 {
     private const PHPUNIT = 'phpunit';
     private const CODECEPTION = 'codeception';

diff --git a/src/TestFramework/TestFrameworkExtraOptionsFilter.php b/src/TestFramework/TestFrameworkExtraOptionsFilter.php
@@ -42,8 +42,9 @@
 
 /**
  * @internal
+ * @final
  */
-final class TestFrameworkExtraOptionsFilter
+class TestFrameworkExtraOptionsFilter
 {
     /**
      * @param string[] $initialRunOnlyOptions

diff --git a/tests/phpunit/AutoReview/ProjectCode/ProjectCodeProvider.php b/tests/phpunit/AutoReview/ProjectCode/ProjectCodeProvider.php
@@ -50,7 +50,6 @@
 use Infection\Console\OutputFormatter\OutputFormatter;
 use Infection\Console\OutputFormatter\ProgressFormatter;
 use Infection\Console\XdebugHandler;
-use Infection\Engine;
 use Infection\Event\Subscriber\MutationGeneratingConsoleLoggerSubscriber;
 use Infection\Event\Subscriber\NullSubscriber;
 use Infection\FileSystem\DummyFileSystem;
@@ -101,7 +100,6 @@ final class ProjectCodeProvider
         MutationGeneratingConsoleLoggerSubscriber::class,
         TestFrameworkTypes::class,
         NodeMutationGenerator::class,
-        Engine::class,
         NonExecutableFinder::class,
         AdapterInstaller::class,
         DetectionStatus::class,