only make typed with use doc @param mixed

rectorphp · Jul 24, 2022 · bd6803e · bd6803e
1 parent 8e87c31
commit bd6803e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 148 deletions.
diff --git a/rules-tests/Php80/Rector/FunctionLike/MixedTypeRector/Fixture/no_mixed_param_doc.php.inc b/rules-tests/Php80/Rector/FunctionLike/MixedTypeRector/Fixture/no_mixed_param_doc.php.inc
diff --git a/...ector/FunctionLike/MixedTypeRector/Fixture/skip_extends_parent_with_non_mixed_doc.php.inc b/...ector/FunctionLike/MixedTypeRector/Fixture/skip_extends_parent_with_non_mixed_doc.php.inc
diff --git a/...tor/FunctionLike/MixedTypeRector/Fixture/skip_extends_parent_with_non_mixed_typed.php.inc b/...tor/FunctionLike/MixedTypeRector/Fixture/skip_extends_parent_with_non_mixed_typed.php.inc
diff --git a/...ctor/Source/SomeParentWithNonMixedDoc.php → ...r/Fixture/skip_no_mixed_param_doc.php.inc b/...ctor/Source/SomeParentWithNonMixedDoc.php → ...r/Fixture/skip_no_mixed_param_doc.php.inc
@@ -1,15 +1,10 @@
 <?php
 
-declare(strict_types=1);
+namespace Rector\Tests\Php80\Rector\FunctionLike\MixedTypeRector\Fixture;
 
-namespace Rector\Tests\Php80\Rector\FunctionLike\MixedTypeRector\Source;
-
-class SomeParentWithNonMixedDoc
+class NoMixedParamDoc
 {
-    /**
-     * @param int $param
-     */
     public function run($param)
     {
     }
-}
+}
diff --git a/rules-tests/Php80/Rector/FunctionLike/MixedTypeRector/Source/SomeParentWithNonMixedTyped.php b/rules-tests/Php80/Rector/FunctionLike/MixedTypeRector/Source/SomeParentWithNonMixedTyped.php
diff --git a/rules/Php80/Guard/MakeClassMethodParamMixedTypedGuard.php b/rules/Php80/Guard/MakeClassMethodParamMixedTypedGuard.php
diff --git a/rules/Php80/Rector/FunctionLike/MixedTypeRector.php b/rules/Php80/Rector/FunctionLike/MixedTypeRector.php
@@ -10,12 +10,12 @@
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Function_;
+use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
 use PHPStan\Type\MixedType;
 use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Core\ValueObject\PhpVersionFeature;
 use Rector\DeadCode\PhpDoc\TagRemover\ParamTagRemover;
-use Rector\Php80\Guard\MakeClassMethodParamMixedTypedGuard;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -28,8 +28,7 @@ final class MixedTypeRector extends AbstractRector implements MinPhpVersionInter
     private bool $hasChanged = false;
 
     public function __construct(
-        private readonly ParamTagRemover $paramTagRemover,
-        private readonly MakeClassMethodParamMixedTypedGuard $makeClassMethodParamMixedTypedGuard
+        private readonly ParamTagRemover $paramTagRemover
     ) {
     }
 
@@ -102,19 +101,18 @@ private function refactorParamTypes(
         ClassMethod | Function_ | Closure | ArrowFunction $functionLike,
         PhpDocInfo $phpDocInfo
     ): void {
-        foreach ($functionLike->params as $keyParam => $param) {
+        foreach ($functionLike->params as $param) {
             if ($param->type instanceof Node) {
                 continue;
             }
 
-            if ($functionLike instanceof ClassMethod && ! $this->makeClassMethodParamMixedTypedGuard->isLegal(
-                $functionLike,
-                $keyParam
-            )) {
+            $paramName = (string) $this->getName($param->var);
+            $paramTagValue = $phpDocInfo->getParamTagValueByName($paramName);
+
+            if (! $paramTagValue instanceof ParamTagValueNode) {
                 continue;
             }
 
-            $paramName = (string) $this->getName($param->var);
             $paramType = $phpDocInfo->getParamType($paramName);
 
             if (! $paramType instanceof MixedType) {