fix new issues founded by static analyzing tools, update baselines, increase MSI as much as possible

Author: sidz

Makefile

@@ -33,8 +33,8 @@ COMPOSER=$(PHP) $(shell which composer)
 
 # Infection
 INFECTION=vendor/bin/infection
-MIN_MSI=52.678571428571
-MIN_COVERED_MSI=96
+MIN_MSI=52.212389380531
+MIN_COVERED_MSI=95
 INFECTION_ARGS=--min-msi=$(MIN_MSI) --min-covered-msi=$(MIN_COVERED_MSI) --threads=$(JOBS) --log-verbosity=default --show-mutations
 
 all: test

composer.json

@@ -49,6 +49,6 @@
         "phpstan/phpstan-webmozart-assert": "^0.12.8",
         "phpunit/phpunit": "^8.5",
         "thecodingmachine/safe": "^1.3",
-        "vimeo/psalm": "^4.3"
+        "vimeo/psalm": "^4.4"
     }
 }

composer.lock

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.8.5@e6ec5fa22a7b9e61670a24d07b3119aff80dcd89">
+<files psalm-version="4.4.1@9fd7a7d885b3a216cff8dec9d8c21a132f275224">
   <file src="src/CommandLineBuilder.php">
     <ForbiddenCode occurrences="1">
-      <code>`command -v php`</code>
+      <code>shell_exec('command -v php')</code>
     </ForbiddenCode>
   </file>
   <file src="src/Config/AbstractYamlConfiguration.php">
     <MixedArgument occurrences="1">
       <code>$extensionName</code>
     </MixedArgument>
-    <MixedAssignment occurrences="1">
+    <MixedAssignment occurrences="2">
+      <code>$extensionName</code>
       <code>$options</code>
     </MixedAssignment>
   </file>
@@ -41,7 +42,13 @@
     <MixedArrayAccess occurrences="1">
       <code>$parsedYaml['extensions'][$extensionName]</code>
     </MixedArrayAccess>
-    <MixedAssignment occurrences="2">
+    <MixedArrayAssignment occurrences="2">
+      <code>$options['format']</code>
+      <code>$options['output']</code>
+    </MixedArrayAssignment>
+    <MixedAssignment occurrences="4">
+      <code>$extensionName</code>
+      <code>$extensionName</code>
       <code>$options</code>
       <code>$options</code>
     </MixedAssignment>
@@ -53,9 +60,10 @@
     <MixedArgument occurrences="1">
       <code>$extensionName</code>
     </MixedArgument>
-    <MixedAssignment occurrences="2">
-      <code>$options</code>
+    <MixedAssignment occurrences="3">
+      <code>$extensionName</code>
       <code>$filteredExtensions[$extensionName]</code>
+      <code>$options</code>
     </MixedAssignment>
   </file>
   <file src="src/PhpSpecAdapterFactory.php">

psalm-baseline.xml

@@ -35,7 +35,6 @@
         <MissingReturnType errorLevel="error" />
         <MissingPropertyType errorLevel="error" />
         <InvalidDocblock errorLevel="error" />
-        <MisplacedRequiredParam errorLevel="error" />
 
         <PropertyNotSetInConstructor errorLevel="error" />
         <MissingConstructor errorLevel="error" />

psalm.xml

@@ -58,10 +58,7 @@ final class PhpSpecAdapter implements TestFrameworkAdapter
     private $mutationConfigBuilder;
     private $versionParser;
     private $commandLineBuilder;
-    /**
-     * @var string|null
-     */
-    private $cachedVersion;
+    private ?string $cachedVersion = null;
 
     public function __construct(
         string $testFrameworkExecutable,
@@ -127,21 +124,21 @@ public function getInitialTestRunCommandLine(
     /**
      * Returns array of arguments to pass them into the Mutant Symfony Process
      *
-     * @param TestLocation[] $tests
+     * @param TestLocation[] $coverageTests
      *
      * @return string[]
      */
     public function getMutantCommandLine(
-        array $tests,
-        string $mutantFilePath,
+        array $coverageTests,
+        string $mutatedFilePath,
         string $mutationHash,
         string $mutationOriginalFilePath,
         string $extraOptions
     ): array {
         return $this->getCommandLine(
             $this->buildMutationConfigFile(
-                $tests,
-                $mutantFilePath,
+                $coverageTests,
+                $mutatedFilePath,
                 $mutationHash,
                 $mutationOriginalFilePath
             ),
@@ -165,16 +162,14 @@ public function getVersion(): string
         $process = new Process($testFrameworkVersionExecutable);
         $process->mustRun();
 
-        $version = 'unknown';
-
         try {
             $version = $this->versionParser->parse($process->getOutput());
         } catch (InvalidArgumentException $e) {
             $version = 'unknown';
-        } finally {
-            $this->cachedVersion = $version;
         }
 
+        $this->cachedVersion = $version;
+
         return $this->cachedVersion;
     }
 

src/PhpSpecAdapter.php

@@ -49,6 +49,9 @@ public function test_it_builds_path_to_initial_config_file(): void
 
         $builder = new InitialConfigBuilder($this->tmp, $originalYamlConfigPath, false);
 
-        self::assertSame($this->tmp . '/phpspecConfiguration.initial.infection.yml', $builder->build('2.0'));
+        $actualPath = $builder->build('2.0');
+
+        self::assertFileExists($actualPath);
+        self::assertSame($this->tmp . '/phpspecConfiguration.initial.infection.yml', $actualPath);
     }
 }

tests/phpunit/Config/Builder/InitialConfigBuilderTest.php

@@ -55,15 +55,15 @@ public function test_it_builds_path_to_mutation_config_file(): void
 
         $builder = new MutationConfigBuilder($this->tmp, $originalYamlConfigPath, $projectDir);
 
-        self::assertSame(
-            $this->tmp . '/phpspecConfiguration.a1b2c3.infection.yml',
-            $builder->build(
-                [],
-                self::MUTATED_FILE_PATH,
-                self::MUTATION_HASH,
-                self::ORIGINAL_FILE_PATH
-            )
+        $actualPath = $builder->build(
+            [],
+            self::MUTATED_FILE_PATH,
+            self::MUTATION_HASH,
+            self::ORIGINAL_FILE_PATH
         );
+
+        self::assertFileExists($actualPath);
+        self::assertSame($this->tmp . '/phpspecConfiguration.a1b2c3.infection.yml', $actualPath);
     }
 
     public function test_it_adds_original_bootstrap_file_to_custom_autoload(): void
@@ -82,10 +82,11 @@ public function test_it_adds_original_bootstrap_file_to_custom_autoload(): void
                 self::ORIGINAL_FILE_PATH
             )
         );
-        self::assertStringContainsString(
-            "require_once '/project/dir/bootstrap.php';",
-            file_get_contents($this->tmp . '/interceptor.phpspec.autoload.a1b2c3.infection.php')
-        );
+
+        $actualContent = file_get_contents($this->tmp . '/interceptor.phpspec.autoload.a1b2c3.infection.php');
+
+        self::assertStringContainsString("require_once '/project/dir/bootstrap.php';", $actualContent);
+        self::assertStringNotContainsString('\Phar::loadPhar("%s", "%s");', $actualContent);
     }
 
     public function test_interceptor_is_included(): void

tests/phpunit/Config/Builder/MutationConfigBuilderTest.php

@@ -66,6 +66,7 @@ final class MutationYamlConfigurationTest extends TestCase
             'SomeOtherExtension' => ['option' => 123],
         ],
         'bootstrap' => '/path/to/adc',
+        'verbose' => true,
     ];
 
     public function test_it_removes_code_coverage_extension(): void
@@ -80,6 +81,7 @@ public function test_it_removes_code_coverage_extension(): void
                 'FirstExtension' => [],
                 'SomeOtherExtension' => ['option' => 123],
             ],
+            'verbose' => true,
         ];
 
         self::assertSame($expectedConfig, $parsedYaml);