[DX] Add strict PHPStan rules - step #2 (#1330)

phpstan.neon

@@ -583,3 +583,10 @@ parameters:
 
         # skip === false compare
         - '#Do not compare call directly, use a variable assign#'
+
+        # strict - resolve later
+        - '#Foreach overwrites \$(.*?) with its value variable#'
+
+        -
+            message: '#Strict comparison using \!\=\= between null and null will always evaluate to false#'
+            path: rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php

rules-tests/Transform/Rector/FuncCall/FuncCallToNewRector/config/configured_rule.php

@@ -8,9 +8,7 @@
 return static function (ContainerConfigurator $containerConfigurator): void {
     $services = $containerConfigurator->services();
     $services->set(FuncCallToNewRector::class)
-        ->call('configure', [[
-            FuncCallToNewRector::FUNCTIONS_TO_NEWS => [
-                'collection' => ['Collection'],
-            ],
-        ]]);
+        ->configure([
+            'collection' => 'Collection',
+        ]);
 };

rules/Arguments/Rector/ClassMethod/ArgumentAdderRector.php

@@ -130,12 +130,12 @@ public function refactor(Node $node): MethodCall | StaticCall | ClassMethod | nu
     }
 
     /**
-     * @param array<string, ArgumentAdder[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $addedArguments = $configuration[self::ADDED_ARGUMENTS] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($addedArguments, ArgumentAdder::class);
+        $addedArguments = $configuration[self::ADDED_ARGUMENTS] ?? $configuration;
+        Assert::allIsAOf($addedArguments, ArgumentAdder::class);
         $this->addedArguments = $addedArguments;
     }
 

rules/Arguments/Rector/ClassMethod/ReplaceArgumentDefaultValueRector.php

@@ -100,12 +100,12 @@ public function refactor(Node $node): MethodCall | StaticCall | ClassMethod
     }
 
     /**
-     * @param array<string, ReplaceArgumentDefaultValue[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $replacedArguments = $configuration[self::REPLACED_ARGUMENTS] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($replacedArguments, ReplaceArgumentDefaultValue::class);
+        $replacedArguments = $configuration[self::REPLACED_ARGUMENTS] ?? $configuration;
+        Assert::allIsAOf($replacedArguments, ReplaceArgumentDefaultValue::class);
         $this->replacedArguments = $replacedArguments;
     }
 }

rules/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector.php

@@ -84,12 +84,12 @@ public function refactor(Node $node): FuncCall
     }
 
     /**
-     * @param array<string, ReplaceFuncCallArgumentDefaultValue[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $replacedArguments = $configuration[self::REPLACED_ARGUMENTS] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($replacedArguments, ReplaceFuncCallArgumentDefaultValue::class);
+        $replacedArguments = $configuration[self::REPLACED_ARGUMENTS] ?? $configuration;
+        Assert::allIsAOf($replacedArguments, ReplaceFuncCallArgumentDefaultValue::class);
         $this->replacedArguments = $replacedArguments;
     }
 }

rules/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector.php

@@ -106,12 +106,12 @@ public function refactor(Node $node): ?FuncCall
     }
 
     /**
-     * @param array<string, SwapFuncCallArguments[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $functionArgumentSwaps = $configuration[self::FUNCTION_ARGUMENT_SWAPS] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($functionArgumentSwaps, SwapFuncCallArguments::class);
+        $functionArgumentSwaps = $configuration[self::FUNCTION_ARGUMENT_SWAPS] ?? $configuration;
+        Assert::allIsAOf($functionArgumentSwaps, SwapFuncCallArguments::class);
         $this->functionArgumentSwaps = $functionArgumentSwaps;
     }
 

rules/Autodiscovery/Rector/Class_/MoveServicesBySuffixToDirectoryRector.php

@@ -91,11 +91,12 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @param array<string, string[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $groupNamesBySuffix = $configuration[self::GROUP_NAMES_BY_SUFFIX] ?? ($configuration ?: []);
+        $groupNamesBySuffix = $configuration[self::GROUP_NAMES_BY_SUFFIX] ?? $configuration;
+        Assert::isArray($groupNamesBySuffix);
         Assert::allString($groupNamesBySuffix);
 
         $this->groupNamesBySuffix = $groupNamesBySuffix;

rules/Autodiscovery/Rector/Class_/MoveValueObjectsToValueObjectDirectoryRector.php

@@ -151,7 +151,7 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @param array<string, mixed> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {

rules/CodingStyle/Rector/ClassMethod/OrderAttributesRector.php

@@ -108,11 +108,11 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @param array<string, mixed> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $attributesOrder = $configuration[self::ATTRIBUTES_ORDER] ?? ($configuration ?: []);
+        $attributesOrder = $configuration[self::ATTRIBUTES_ORDER] ?? $configuration;
         Assert::isArray($attributesOrder);
         Assert::allString($attributesOrder);
 

rules/CodingStyle/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php

@@ -124,12 +124,12 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @param array<string, ReturnArrayClassMethodToYield[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $methodsToYields = $configuration[self::METHODS_TO_YIELDS] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($methodsToYields, ReturnArrayClassMethodToYield::class);
+        $methodsToYields = $configuration[self::METHODS_TO_YIELDS] ?? $configuration;
+        Assert::allIsAOf($methodsToYields, ReturnArrayClassMethodToYield::class);
         $this->methodsToYields = $methodsToYields;
     }
 

rules/CodingStyle/Rector/MethodCall/PreferThisOrSelfMethodCallRector.php

@@ -106,7 +106,7 @@ public function refactor(Node $node): ?Node
      */
     public function configure(array $configuration): void
     {
-        $typeToPreference = $configuration[self::TYPE_TO_PREFERENCE] ?? ($configuration ?: []);
+        $typeToPreference = $configuration[self::TYPE_TO_PREFERENCE] ?? $configuration;
         Assert::allIsAOf($typeToPreference, PreferenceSelfThis::class);
 
         $this->typeToPreference = $typeToPreference;

rules/Composer/Rector/AddPackageToRequireComposerRector.php

@@ -63,12 +63,12 @@ public function getRuleDefinition(): RuleDefinition
     }
 
     /**
-     * @param array<string, PackageAndVersion[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $packagesAndVersions = $configuration[self::PACKAGES_AND_VERSIONS] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($packagesAndVersions, PackageAndVersion::class);
+        $packagesAndVersions = $configuration[self::PACKAGES_AND_VERSIONS] ?? $configuration;
+        Assert::allIsAOf($packagesAndVersions, PackageAndVersion::class);
 
         $this->versionGuard->validate($packagesAndVersions);
         $this->packagesAndVersions = $packagesAndVersions;

rules/Composer/Rector/AddPackageToRequireDevComposerRector.php

@@ -66,12 +66,12 @@ public function getRuleDefinition(): RuleDefinition
     }
 
     /**
-     * @param array<string, PackageAndVersion[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $packagesAndVersions = $configuration[self::PACKAGES_AND_VERSIONS] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($packagesAndVersions, PackageAndVersion::class);
+        $packagesAndVersions = $configuration[self::PACKAGES_AND_VERSIONS] ?? $configuration;
+        Assert::allIsAOf($packagesAndVersions, PackageAndVersion::class);
 
         $this->versionGuard->validate($packagesAndVersions);
         $this->packageAndVersions = $packagesAndVersions;

rules/Composer/Rector/ChangePackageVersionComposerRector.php

@@ -69,12 +69,12 @@ public function getRuleDefinition(): RuleDefinition
     }
 
     /**
-     * @param array<string, PackageAndVersion[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $packagesAndVersions = $configuration[self::PACKAGES_AND_VERSIONS] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($packagesAndVersions, PackageAndVersion::class);
+        $packagesAndVersions = $configuration[self::PACKAGES_AND_VERSIONS] ?? $configuration;
+        Assert::allIsAOf($packagesAndVersions, PackageAndVersion::class);
 
         $this->versionGuard->validate($packagesAndVersions);
         $this->packagesAndVersions = $packagesAndVersions;

rules/Composer/Rector/RemovePackageComposerRector.php

@@ -60,7 +60,7 @@ public function getRuleDefinition(): RuleDefinition
      */
     public function configure(array $configuration): void
     {
-        $packagesNames = $configuration[self::PACKAGE_NAMES] ?? ($configuration ?: []);
+        $packagesNames = $configuration[self::PACKAGE_NAMES] ?? $configuration;
 
         Assert::isArray($packagesNames);
         Assert::allString($packagesNames);

rules/Composer/Rector/RenamePackageComposerRector.php

@@ -76,12 +76,12 @@ public function getRuleDefinition(): RuleDefinition
     }
 
     /**
-     * @param array<string, RenamePackage[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $renamePackages = $configuration[self::RENAME_PACKAGES] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($renamePackages, RenamePackage::class);
+        $renamePackages = $configuration[self::RENAME_PACKAGES] ?? $configuration;
+        Assert::allIsAOf($renamePackages, RenamePackage::class);
         $this->renamePackages = $renamePackages;
     }
 }

rules/Composer/Rector/ReplacePackageAndVersionComposerRector.php

@@ -74,12 +74,12 @@ public function getRuleDefinition(): RuleDefinition
     }
 
     /**
-     * @param array<string, ReplacePackageAndVersion[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $replacePackagesAndVersions = $configuration[self::REPLACE_PACKAGES_AND_VERSIONS] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($replacePackagesAndVersions, ReplacePackageAndVersion::class);
+        $replacePackagesAndVersions = $configuration[self::REPLACE_PACKAGES_AND_VERSIONS] ?? $configuration;
+        Assert::allIsAOf($replacePackagesAndVersions, ReplacePackageAndVersion::class);
 
         $this->versionGuard->validate($replacePackagesAndVersions);
         $this->replacePackagesAndVersions = $replacePackagesAndVersions;

rules/DeadCode/Rector/ClassLike/RemoveAnnotationRector.php

@@ -101,11 +101,12 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @param array<string, string[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $annotationsToRemove = $configuration[self::ANNOTATIONS_TO_REMOVE] ?? ($configuration ?: []);
+        $annotationsToRemove = $configuration[self::ANNOTATIONS_TO_REMOVE] ?? $configuration;
+        Assert::isArray($annotationsToRemove);
         Assert::allString($annotationsToRemove);
 
         $this->annotationsToRemove = $annotationsToRemove;

rules/DeadCode/Rector/ConstFetch/RemovePhpVersionIdCheckRector.php

@@ -38,7 +38,7 @@ public function __construct(
     }
 
     /**
-     * @param array<string, int|string> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {

rules/DependencyInjection/Rector/ClassMethod/AddMethodParentCallRector.php

@@ -118,7 +118,7 @@ public function refactor(Node $node): ?Node
      */
     public function configure(array $configuration): void
     {
-        $methodsByParentTypes = $configuration[self::METHODS_BY_PARENT_TYPES] ?? ($configuration ?: []);
+        $methodsByParentTypes = $configuration[self::METHODS_BY_PARENT_TYPES] ?? $configuration;
         Assert::allString(array_keys($methodsByParentTypes));
         Assert::allString($methodsByParentTypes);
 

rules/DowngradePhp72/Rector/ClassMethod/DowngradeParameterTypeWideningRector.php

@@ -139,16 +139,16 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @param array<string, mixed> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $safeTypes = $configuration[self::SAFE_TYPES] ?? ($configuration ?: []);
+        $safeTypes = $configuration[self::SAFE_TYPES] ?? $configuration;
         Assert::isArray($safeTypes);
         Assert::allString($safeTypes);
         $this->safeTypes = $safeTypes;
 
-        $safeTypesToMethods = $configuration[self::SAFE_TYPES_TO_METHODS] ?? ($configuration ?: []);
+        $safeTypesToMethods = $configuration[self::SAFE_TYPES_TO_METHODS] ?? $configuration;
         Assert::isArray($safeTypesToMethods);
         foreach ($safeTypesToMethods as $key => $value) {
             Assert::string($key);

rules/DowngradePhp80/Rector/Class_/DowngradeAttributeToAnnotationRector.php

@@ -128,12 +128,12 @@ public function refactor(Node $node): ?Node
     }
 
     /**
-     * @param array<string, DowngradeAttributeToAnnotation[]> $configuration
+     * @param mixed[] $configuration
      */
     public function configure(array $configuration): void
     {
-        $attributesToAnnotations = $configuration[self::ATTRIBUTE_TO_ANNOTATION] ?? ($configuration ?: []);
-        Assert::allIsInstanceOf($attributesToAnnotations, DowngradeAttributeToAnnotation::class);
+        $attributesToAnnotations = $configuration[self::ATTRIBUTE_TO_ANNOTATION] ?? $configuration;
+        Assert::allIsAOf($attributesToAnnotations, DowngradeAttributeToAnnotation::class);
 
         $this->attributesToAnnotations = $attributesToAnnotations;
     }

rules/Generics/Rector/ClassMethod/GenericClassMethodParamRector.php

@@ -127,7 +127,7 @@ final class SomeClass implements SomeInterface
      */
     public function configure(array $configuration): void
     {
-        $makeClassMethodGenerics = $configuration[self::GENERIC_CLASS_METHOD_PARAMS] ?? ($configuration ?: []);
+        $makeClassMethodGenerics = $configuration[self::GENERIC_CLASS_METHOD_PARAMS] ?? $configuration;
         Assert::allIsAOf($makeClassMethodGenerics, GenericClassMethodParam::class);
 
         $this->genericClassMethodParams = $makeClassMethodGenerics;

rules/Naming/Contract/Guard/ConflictingNameGuardInterface.php

@@ -6,7 +6,13 @@
 
 use Rector\Naming\Contract\RenameValueObjectInterface;
 
+/**
+ * @template TRename as RenameValueObjectInterface
+ */
 interface ConflictingNameGuardInterface
 {
+    /**
+     * @param TRename $renameValueObject
+     */
     public function isConflicting(RenameValueObjectInterface $renameValueObject): bool;
 }

rules/Naming/Guard/DateTimeAtNamingConventionGuard.php

@@ -13,6 +13,9 @@
 use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\PHPStanStaticTypeMapper\Utils\TypeUnwrapper;
 
+/**
+ * @implements ConflictingNameGuardInterface<PropertyRename>
+ */
 final class DateTimeAtNamingConventionGuard implements ConflictingNameGuardInterface
 {
     /**

rules/Naming/Guard/HasMagicGetSetGuard.php

@@ -9,6 +9,9 @@
 use Rector\Naming\Contract\RenameValueObjectInterface;
 use Rector\Naming\ValueObject\PropertyRename;
 
+/**
+ * @implements ConflictingNameGuardInterface<PropertyRename>
+ */
 final class HasMagicGetSetGuard implements ConflictingNameGuardInterface
 {
     public function __construct(

rules/Naming/Guard/NotPrivatePropertyGuard.php

@@ -8,6 +8,9 @@
 use Rector\Naming\Contract\RenameValueObjectInterface;
 use Rector\Naming\ValueObject\PropertyRename;
 
+/**
+ * @implements ConflictingNameGuardInterface<PropertyRename>
+ */
 final class NotPrivatePropertyGuard implements ConflictingNameGuardInterface
 {
     /**

rules/Naming/Guard/RamseyUuidInterfaceGuard.php

@@ -10,6 +10,9 @@
 use Rector\Naming\ValueObject\PropertyRename;
 use Rector\NodeTypeResolver\NodeTypeResolver;
 
+/**
+ * @implements ConflictingNameGuardInterface<PropertyRename>
+ */
 final class RamseyUuidInterfaceGuard implements ConflictingNameGuardInterface
 {
     public function __construct(

rules/Naming/PhpArray/ArrayFilter.php

@@ -4,8 +4,6 @@
 
 namespace Rector\Naming\PhpArray;
 
-use Rector\Core\Exception\ShouldNotHappenException;
-
 final class ArrayFilter
 {
     /**
@@ -25,10 +23,6 @@ public function filterWithAtLeastTwoOccurences(array $values): array
                 continue;
             }
 
-            if (! is_string($value)) {
-                throw new ShouldNotHappenException();
-            }
-
             $duplicatedValues[] = $value;
         }