Mutation coverage improvements

Makefile

@@ -5,7 +5,7 @@ PHP_CS_FIXER_BIN := ./vendor/bin/php-cs-fixer
 PHPSTAN_BIN	:= ./vendor/bin/phpstan
 PSALM_BIN	:= ./vendor/bin/psalm
 PHPUNIT_BIN	:= ./vendor/bin/phpunit
-INFECTION_BIN	:= ./vendor/bin/infection
+INFECTION_BIN	:= ./vendor/bin/roave-infection-static-analysis-plugin
 
 .PHONY: build composer-install tests tests-coverage gpg php-cs-check php-cs-fix phpstan
 
@@ -38,7 +38,7 @@ psalm:
 	$(PSALM_BIN)
 
 infection: composer-install
-	$(INFECTION_BIN) --threads=$(shell nproc || sysctl -n hw.ncpu || 1) --test-framework-options='--testsuite=Tests' --only-covered --min-msi=80
+	$(INFECTION_BIN) --threads=$(shell nproc || sysctl -n hw.ncpu || 1) --test-framework-options='--testsuite=Tests' --only-covered --min-msi=85 --psalm-config=psalm.xml
 
 gpg:
 	gpg --detach-sign --armor --default-key 41DDE07547459FAECFA17813B8F640134AB1782E --output deptrac.phar.asc deptrac.phar

composer.json

@@ -64,6 +64,7 @@
         "phpstan/phpstan": "^1.6.8",
         "phpstan/phpstan-symfony": "^1.1",
         "phpunit/phpunit": "^9.5",
+        "roave/infection-static-analysis-plugin": "^1.28",
         "vimeo/psalm": "^4.22"
     }
 }

infection.json.dist

@@ -1,14 +1,23 @@
 {
-    "timeout": 10,
-    "source": {
-        "directories": [
-            "src"
-        ]
+  "timeout": 10,
+  "source": {
+    "directories": [
+      "src"
+    ]
+  },
+  "logs": {
+    "text": "infection.log"
+  },
+  "mutators": {
+    "@default": true,
+    "FunctionCallRemoval": {
+      "ignoreSourceCodeByRegex": [
+        "trigger_deprecation.*"
+      ]
     },
-    "logs": {
-        "text": "infection.log"
-    },
-    "mutators": {
-        "@default": true
-    }
+    "global-ignoreSourceCodeByRegex": [
+      "\\$output->writeLineFormatted.*"
+    ],
+    "CatchBlockRemoval": false
+  }
 }

src/Core/Ast/AstMap/ClassLike/ClassLikeReferenceBuilder.php

@@ -17,7 +17,7 @@ final class ClassLikeReferenceBuilder extends ReferenceBuilder
     /**
      * @param string[] $tokenTemplates
      */
-    protected function __construct(
+    private function __construct(
         array $tokenTemplates,
         string $filepath,
         private readonly ClassLikeToken $classLikeToken,

src/Core/Ast/AstMap/FunctionLike/FunctionLikeReferenceBuilder.php

@@ -11,7 +11,7 @@ class FunctionLikeReferenceBuilder extends ReferenceBuilder
     /**
      * @param string[] $tokenTemplates
      */
-    protected function __construct(array $tokenTemplates, string $filepath, private readonly string $functionName)
+    private function __construct(array $tokenTemplates, string $filepath, private readonly string $functionName)
     {
         parent::__construct($tokenTemplates, $filepath);
     }

src/Core/Ast/Parser/TypeResolver.php

@@ -132,7 +132,7 @@ public function resolvePHPStanDocParserType(TypeNode $type, TypeScope $typeScope
     /**
      * @return string[]
      */
-    public function resolveString(string $type, TypeScope $nameScope): array
+    protected function resolveString(string $type, TypeScope $nameScope): array
     {
         $context = new Context($nameScope->namespace, $nameScope->getUses());
         try {

src/Supportive/OutputFormatter/BaselineOutputFormatter.php

@@ -63,7 +63,7 @@ public function finish(
     }
 
     /**
-     * @return array<string,array<string>>
+     * @return array<string,list<string>>
      */
     private function collectViolations(LegacyResult $result): array
     {