chore: type adjustments

nunomaduro · nunomaduro · commit 1a7eede45292 · 2025-04-20T22:37:44.000+01:00
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,11 +1,8 @@
 includes:
     - vendor/phpstan/phpstan-strict-rules/rules.neon
-    - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon
 
 parameters:
-    level: max
+    level: 9
     paths:
         - src
 
-    checkMissingIterableValueType: true
-    reportUnmatchedIgnoredErrors: true
diff --git a/src/Boostrappers/BootPhpUnitSubscribers.php b/src/Boostrappers/BootPhpUnitSubscribers.php
@@ -23,7 +23,7 @@
      *
      * @var array<int, class-string<Subscriber>>
      */
-    private const SUBSCRIBERS = [
+    private const array SUBSCRIBERS = [
         DisplayInitialTestRunMessage::class,
         PrepareForInitialTestRun::class,
         EnsureInitialTestRunWasSuccessful::class,
diff --git a/src/Boostrappers/BootSubscribers.php b/src/Boostrappers/BootSubscribers.php
@@ -23,7 +23,7 @@
      *
      * @var array<int, class-string<Subscriber>>
      */
-    private const SUBSCRIBERS = [
+    private const array SUBSCRIBERS = [
         TrackMutationSuiteStart::class,
         TrackMutationSuiteFinish::class,
         StopOnUncoveredMutation::class,
diff --git a/src/Cache/FileStore.php b/src/Cache/FileStore.php
@@ -11,7 +11,7 @@
 
 class FileStore implements CacheInterface
 {
-    private const CACHE_FOLDER_NAME = 'pest-mutate-cache';
+    private const string CACHE_FOLDER_NAME = 'pest-mutate-cache';
 
     private readonly string $directory;
 
@@ -147,7 +147,7 @@ private function getPayload(string $key): mixed
             $expire = (int) substr(
                 $content, 0, 10
             );
-        } catch (Exception) { // @phpstan-ignore-line
+        } catch (Exception) {
             $this->delete($key);
 
             return $this->emptyPayload();
@@ -161,7 +161,7 @@ private function getPayload(string $key): mixed
 
         try {
             $data = unserialize(substr($content, 10));
-        } catch (Exception) { // @phpstan-ignore-line
+        } catch (Exception) {
             $this->delete($key);
 
             return $this->emptyPayload();
diff --git a/src/Mutation.php b/src/Mutation.php
@@ -17,15 +17,15 @@
 
 class Mutation
 {
-    private const TMP_FOLDER = __DIR__
+    private const string TMP_FOLDER = __DIR__
         .DIRECTORY_SEPARATOR
         .'..'
         .DIRECTORY_SEPARATOR
         .'.temp'
         .DIRECTORY_SEPARATOR
         .'mutations';
 
-    private const DIFF_SEPARATOR = '--- Expected'.PHP_EOL.'+++ Actual'.PHP_EOL.'@@ @@'.PHP_EOL;
+    private const string DIFF_SEPARATOR = '--- Expected'.PHP_EOL.'+++ Actual'.PHP_EOL.'@@ @@'.PHP_EOL;
 
     public function __construct(
         public readonly SplFileInfo $file,
diff --git a/src/MutationTest.php b/src/MutationTest.php
@@ -52,10 +52,10 @@ public function start(array $coveredLines, Configuration $configuration, array $
         foreach (range($this->mutation->startLine, $this->mutation->endLine) as $lineNumber) {
             foreach ($coveredLines[$this->mutation->file->getRealPath()][$lineNumber] ?? [] as $test) {
                 preg_match('/\\\\([a-zA-Z0-9]*)::(__pest_evaluable_)?([^#]*)"?/', $test, $matches);
-                if ($matches[2] === '__pest_evaluable_') { // @phpstan-ignore-line
-                    $filters[] = $matches[1].'::(.*)'.str_replace(['__', '_'], ['.{1,2}', '.'], $matches[3]); // @phpstan-ignore-line
+                if ($matches[2] === '__pest_evaluable_') {
+                    $filters[] = $matches[1].'::(.*)'.str_replace(['__', '_'], ['.{1,2}', '.'], $matches[3]);
                 } else {
-                    $filters[] = $matches[1].'::(.*)'.$matches[3]; // @phpstan-ignore-line
+                    $filters[] = $matches[1].'::(.*)'.$matches[3];
                 }
             }
         }
diff --git a/src/Mutators.php b/src/Mutators.php
diff --git a/src/Mutators/Abstract/AbstractFunctionCallUnwrapMutator.php b/src/Mutators/Abstract/AbstractFunctionCallUnwrapMutator.php
@@ -19,6 +19,7 @@ public static function nodesToHandle(): array
         return [FuncCall::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! $node instanceof FuncCall) {
diff --git a/src/Mutators/Abstract/AbstractFunctionReplaceMutator.php b/src/Mutators/Abstract/AbstractFunctionReplaceMutator.php
@@ -15,6 +15,7 @@ public static function nodesToHandle(): array
         return [FuncCall::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! $node instanceof FuncCall) {
diff --git a/src/Mutators/Array/UnwrapArrayMap.php b/src/Mutators/Array/UnwrapArrayMap.php
@@ -24,6 +24,7 @@ public static function functionName(): string
         return 'array_map';
     }
 
+    #[\Override]
     public static function mutate(Node $node): Node
     {
         /** @var FuncCall $node */
diff --git a/src/Mutators/Laravel/Remove/LaravelRemoveStringableUpper.php b/src/Mutators/Laravel/Remove/LaravelRemoveStringableUpper.php
@@ -28,6 +28,7 @@ public static function nodesToHandle(): array
         return [MethodCall::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! parent::can($node)) {
diff --git a/src/Mutators/Laravel/Unwrap/LaravelUnwrapStrUpper.php b/src/Mutators/Laravel/Unwrap/LaravelUnwrapStrUpper.php
@@ -27,6 +27,7 @@ public static function nodesToHandle(): array
         return [MethodCall::class, StaticCall::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! parent::can($node)) {
diff --git a/src/Mutators/Logical/FalseToTrue.php b/src/Mutators/Logical/FalseToTrue.php
@@ -27,6 +27,7 @@ public static function nodesToHandle(): array
         return [ConstFetch::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! parent::can($node)) {
diff --git a/src/Mutators/Logical/TrueToFalse.php b/src/Mutators/Logical/TrueToFalse.php
@@ -12,7 +12,7 @@
 
 class TrueToFalse extends AbstractMutator
 {
-    private const FUNCTIONS_TO_IGNORE = ['in_array', 'array_search'];
+    private const array FUNCTIONS_TO_IGNORE = ['in_array', 'array_search'];
 
     public const SET = 'Logical';
 
@@ -30,6 +30,7 @@ public static function nodesToHandle(): array
         return [ConstFetch::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! parent::can($node)) {
diff --git a/src/Mutators/Number/DecrementInteger.php b/src/Mutators/Number/DecrementInteger.php
@@ -30,6 +30,7 @@ public static function nodesToHandle(): array
         ];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! parent::can($node)) {
diff --git a/src/Mutators/Number/IncrementInteger.php b/src/Mutators/Number/IncrementInteger.php
@@ -30,6 +30,7 @@ public static function nodesToHandle(): array
         ];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! parent::can($node)) {
diff --git a/src/Mutators/Removal/RemoveEarlyReturn.php b/src/Mutators/Removal/RemoveEarlyReturn.php
@@ -30,6 +30,7 @@ public static function nodesToHandle(): array
         return [Return_::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! $node instanceof Return_) {
diff --git a/src/Mutators/Removal/RemoveFunctionCall.php b/src/Mutators/Removal/RemoveFunctionCall.php
@@ -25,6 +25,7 @@ public static function nodesToHandle(): array
         return [Expression::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! $node instanceof Expression) {
diff --git a/src/Mutators/Removal/RemoveMethodCall.php b/src/Mutators/Removal/RemoveMethodCall.php
@@ -26,6 +26,7 @@ public static function nodesToHandle(): array
         return [Expression::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! $node instanceof Expression) {
diff --git a/src/Mutators/Return/AlwaysReturnEmptyArray.php b/src/Mutators/Return/AlwaysReturnEmptyArray.php
@@ -31,6 +31,7 @@ public static function nodesToHandle(): array
         return [Return_::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! $node instanceof Return_) {
diff --git a/src/Mutators/Return/AlwaysReturnNull.php b/src/Mutators/Return/AlwaysReturnNull.php
@@ -32,6 +32,7 @@ public static function nodesToHandle(): array
         return [Return_::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! $node instanceof Return_) {
@@ -48,7 +49,7 @@ public static function can(Node $node): bool
             return false;
         }
 
-        if ($parent->returnType === null) {
+        if (! $parent->returnType instanceof \PhpParser\Node) {
             return true;
         }
 
diff --git a/src/Mutators/String/ConcatSwitchSides.php b/src/Mutators/String/ConcatSwitchSides.php
@@ -27,6 +27,7 @@ public static function nodesToHandle(): array
         return [Concat::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! $node instanceof Concat) {
diff --git a/src/Mutators/String/EmptyStringToNotEmpty.php b/src/Mutators/String/EmptyStringToNotEmpty.php
@@ -24,6 +24,7 @@ public static function nodesToHandle(): array
         return [String_::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         return $node instanceof String_ &&
diff --git a/src/Mutators/String/NotEmptyStringToEmpty.php b/src/Mutators/String/NotEmptyStringToEmpty.php
@@ -26,6 +26,7 @@ public static function nodesToHandle(): array
         return [String_::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if (! $node instanceof String_) {
diff --git a/src/Mutators/String/UnwrapStrIreplace.php b/src/Mutators/String/UnwrapStrIreplace.php
@@ -24,6 +24,7 @@ public static function functionName(): string
         return 'str_ireplace';
     }
 
+    #[\Override]
     public static function mutate(Node $node): Node
     {
         /** @var FuncCall $node */
diff --git a/src/Mutators/String/UnwrapStrReplace.php b/src/Mutators/String/UnwrapStrReplace.php
@@ -24,6 +24,7 @@ public static function functionName(): string
         return 'str_replace';
     }
 
+    #[\Override]
     public static function mutate(Node $node): Node
     {
         /** @var FuncCall $node */
diff --git a/src/Mutators/Visibility/ConstantProtectedToPrivate.php b/src/Mutators/Visibility/ConstantProtectedToPrivate.php
@@ -26,6 +26,7 @@ public static function nodesToHandle(): array
         return [ClassConst::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         return $node instanceof ClassConst && $node->isProtected();
diff --git a/src/Mutators/Visibility/ConstantPublicToProtected.php b/src/Mutators/Visibility/ConstantPublicToProtected.php
@@ -26,6 +26,7 @@ public static function nodesToHandle(): array
         return [ClassConst::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         return $node instanceof ClassConst && $node->isPublic();
diff --git a/src/Mutators/Visibility/FunctionProtectedToPrivate.php b/src/Mutators/Visibility/FunctionProtectedToPrivate.php
@@ -28,6 +28,7 @@ public static function nodesToHandle(): array
         return [ClassMethod::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         return $node instanceof ClassMethod && $node->isProtected();
diff --git a/src/Mutators/Visibility/FunctionPublicToProtected.php b/src/Mutators/Visibility/FunctionPublicToProtected.php
@@ -28,6 +28,7 @@ public static function nodesToHandle(): array
         return [ClassMethod::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         return $node instanceof ClassMethod && $node->isPublic();
diff --git a/src/Mutators/Visibility/PropertyProtectedToPrivate.php b/src/Mutators/Visibility/PropertyProtectedToPrivate.php
@@ -26,6 +26,7 @@ public static function nodesToHandle(): array
         return [Property::class, Param::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if ($node instanceof Property && $node->isProtected()) {
diff --git a/src/Mutators/Visibility/PropertyPublicToProtected.php b/src/Mutators/Visibility/PropertyPublicToProtected.php
@@ -26,6 +26,7 @@ public static function nodesToHandle(): array
         return [Property::class, Param::class];
     }
 
+    #[\Override]
     public static function can(Node $node): bool
     {
         if ($node instanceof Property && $node->isPublic()) {
diff --git a/src/Options/BailOption.php b/src/Options/BailOption.php
@@ -8,7 +8,7 @@
 
 class BailOption
 {
-    final public const ARGUMENT = 'bail';
+    final public const string ARGUMENT = 'bail';
 
     public static function remove(): bool
     {
diff --git a/src/Options/ClassOption.php b/src/Options/ClassOption.php
@@ -8,7 +8,7 @@
 
 class ClassOption
 {
-    final public const ARGUMENT = 'class';
+    final public const string ARGUMENT = 'class';
 
     public static function remove(): bool
     {
diff --git a/src/Options/ClearCacheOption.php b/src/Options/ClearCacheOption.php
@@ -8,7 +8,7 @@
 
 class ClearCacheOption
 {
-    final public const ARGUMENT = 'clear-cache';
+    final public const string ARGUMENT = 'clear-cache';
 
     public static function remove(): bool
     {
diff --git a/src/Options/CoveredOnlyOption.php b/src/Options/CoveredOnlyOption.php
@@ -8,7 +8,7 @@
 
 class CoveredOnlyOption
 {
-    final public const ARGUMENT = 'covered-only';
+    final public const string ARGUMENT = 'covered-only';
 
     public static function remove(): bool
     {
diff --git a/src/Options/EverythingOption.php b/src/Options/EverythingOption.php
@@ -8,7 +8,7 @@
 
 class EverythingOption
 {
-    final public const ARGUMENT = 'everything';
+    final public const string ARGUMENT = 'everything';
 
     public static function remove(): bool
     {
diff --git a/src/Options/ExceptOption.php b/src/Options/ExceptOption.php
@@ -8,7 +8,7 @@
 
 class ExceptOption
 {
-    final public const ARGUMENT = 'except';
+    final public const string ARGUMENT = 'except';
 
     public static function remove(): bool
     {
diff --git a/src/Options/IgnoreMinScoreOnZeroMutationsOption.php b/src/Options/IgnoreMinScoreOnZeroMutationsOption.php
@@ -8,7 +8,7 @@
 
 class IgnoreMinScoreOnZeroMutationsOption
 {
-    final public const ARGUMENT = 'ignore-min-score-on-zero-mutations';
+    final public const string ARGUMENT = 'ignore-min-score-on-zero-mutations';
 
     public static function remove(): bool
     {
diff --git a/src/Options/IgnoreOption.php b/src/Options/IgnoreOption.php
@@ -8,7 +8,7 @@
 
 class IgnoreOption
 {
-    final public const ARGUMENT = 'ignore';
+    final public const string ARGUMENT = 'ignore';
 
     public static function remove(): bool
     {
diff --git a/src/Options/MinScoreOption.php b/src/Options/MinScoreOption.php
@@ -8,7 +8,7 @@
 
 class MinScoreOption
 {
-    final public const ARGUMENT = 'min';
+    final public const string ARGUMENT = 'min';
 
     public static function remove(): bool
     {
diff --git a/src/Options/MutateOption.php b/src/Options/MutateOption.php
@@ -8,7 +8,7 @@
 
 class MutateOption
 {
-    final public const ARGUMENT = 'mutate';
+    final public const string ARGUMENT = 'mutate';
 
     public static function remove(): bool
     {
diff --git a/src/Options/MutationIdOption.php b/src/Options/MutationIdOption.php
diff --git a/src/Options/MutatorsOption.php b/src/Options/MutatorsOption.php
diff --git a/src/Options/NoCacheOption.php b/src/Options/NoCacheOption.php
diff --git a/src/Options/ParallelOption.php b/src/Options/ParallelOption.php
diff --git a/src/Options/PathOption.php b/src/Options/PathOption.php
diff --git a/src/Options/ProcessesOption.php b/src/Options/ProcessesOption.php
diff --git a/src/Options/ProfileOption.php b/src/Options/ProfileOption.php
diff --git a/src/Options/RetryOption.php b/src/Options/RetryOption.php
diff --git a/src/Options/StopOnUncoveredOption.php b/src/Options/StopOnUncoveredOption.php
diff --git a/src/Options/StopOnUntestedOption.php b/src/Options/StopOnUntestedOption.php
diff --git a/src/Plugins/Mutate.php b/src/Plugins/Mutate.php
diff --git a/src/Repositories/ConfigurationRepository.php b/src/Repositories/ConfigurationRepository.php
diff --git a/src/Support/Configuration/CliConfiguration.php b/src/Support/Configuration/CliConfiguration.php
diff --git a/src/Support/StreamWrapper.php b/src/Support/StreamWrapper.php
diff --git a/tests/Mutators/Removal/RemoveEarlyReturnTest.php b/tests/Mutators/Removal/RemoveEarlyReturnTest.php
diff --git a/tests/Unit/Support/Printers/DefaultPrinterTest.php b/tests/Unit/Support/Printers/DefaultPrinterTest.php
diff --git a/tests/Visual/Tested.php b/tests/Visual/Tested.php
diff --git a/tests/Visual/TestedWithDescribe.php b/tests/Visual/TestedWithDescribe.php

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*`
`24`	`24`	`* @var array<int, class-string<Subscriber>>`
`25`	`25`	`*/`
`26`		`- private const SUBSCRIBERS = [`
	`26`	`+ private const array SUBSCRIBERS = [`
`27`	`27`	`DisplayInitialTestRunMessage::class,`
`28`	`28`	`PrepareForInitialTestRun::class,`
`29`	`29`	`EnsureInitialTestRunWasSuccessful::class,`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,10 @@ public function start(array $coveredLines, Configuration $configuration, array $`
`52`	`52`	`foreach (range($this->mutation->startLine, $this->mutation->endLine) as $lineNumber) {`
`53`	`53`	`foreach ($coveredLines[$this->mutation->file->getRealPath()][$lineNumber] ?? [] as $test) {`
`54`	`54`	`preg_match('/\\\\([a-zA-Z0-9])::(__pest_evaluable_)?([^#])"?/', $test, $matches);`
`55`		`- if ($matches[2] === '__pest_evaluable_') { // @phpstan-ignore-line`
`56`		`- $filters[] = $matches[1].'::(.*)'.str_replace(['__', '_'], ['.{1,2}', '.'], $matches[3]); // @phpstan-ignore-line`
	`55`	`+ if ($matches[2] === '__pest_evaluable_') {`
	`56`	`+ $filters[] = $matches[1].'::(.*)'.str_replace(['__', '_'], ['.{1,2}', '.'], $matches[3]);`
`57`	`57`	`} else {`
`58`		`- $filters[] = $matches[1].'::(.*)'.$matches[3]; // @phpstan-ignore-line`
	`58`	`+ $filters[] = $matches[1].'::(.*)'.$matches[3];`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public static function nodesToHandle(): array`
`19`	`19`	`return [FuncCall::class];`
`20`	`20`	`}`
`21`	`21`
	`22`	`+ #[\Override]`
`22`	`23`	`public static function can(Node $node): bool`
`23`	`24`	`{`
`24`	`25`	`if (! $node instanceof FuncCall) {`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public static function nodesToHandle(): array`
`15`	`15`	`return [FuncCall::class];`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ #[\Override]`
`18`	`19`	`public static function can(Node $node): bool`
`19`	`20`	`{`
`20`	`21`	`if (! $node instanceof FuncCall) {`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ public static function functionName(): string`
`24`	`24`	`return 'array_map';`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ #[\Override]`
`27`	`28`	`public static function mutate(Node $node): Node`
`28`	`29`	`{`
`29`	`30`	`/** @var FuncCall $node */`