[DeadCode] Skip Remove @return/@param null functionality in case of s…

…ub type (#5350)

* [DeadCode] Remove @return/@param null only when has native type already

* move to usefull check

* param null with description

* skip

* [ci-review] Rector Rectify

* skip remove null

* remove null same type

---------

Co-authored-by: GitHub Action <actions@github.com>

rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/Fixture/skip_param_null_with_description.php.inc

@@ -0,0 +1,15 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Fixture;
+
+class SkipParamNullWithDescription
+{
+    /**
+     * @param null $a this is description
+     */
+    public function foo(int $a = null)
+    {
+
+    }
+}
+

rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessParamTagRector/Fixture/skip_remove_null.php.inc

@@ -0,0 +1,13 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessParamTagRector\Fixture;
+
+class SkipRemoveNull
+{
+    /**
+     * @param null $a
+     */
+    public function foo(int $a = null)
+    {
+    }
+}

rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector/Fixture/remove_null.php.inc

@@ -7,7 +7,7 @@ class RemoveNull
     /**
      * @return null
      */
-    function foo()
+    function foo(): null
     {
         return null;
     }
@@ -21,10 +21,10 @@ namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector\
 
 class RemoveNull
 {
-    function foo()
+    function foo(): null
     {
         return null;
     }
 }
 
-?>
+?>

rules-tests/DeadCode/Rector/ClassMethod/RemoveUselessReturnTagRector/Fixture/skip_remove_null.php.inc

@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Tests\DeadCode\Rector\ClassMethod\RemoveUselessReturnTagRector\Fixture;
+
+class SkipRemoveNull
+{
+    /**
+     * @return null
+     */
+    function foo(): ?int
+    {
+        return null;
+    }
+}

rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php

@@ -36,11 +36,6 @@ public function isDead(ParamTagValueNode $paramTagValueNode, FunctionLike $funct
             return false;
         }
 
-        // param null is always dead
-        if ($this->isNullTagValueNode($paramTagValueNode)) {
-            return true;
-        }
-
         if ($param->type === null) {
             return false;
         }
@@ -75,13 +70,4 @@ public function isDead(ParamTagValueNode $paramTagValueNode, FunctionLike $funct
 
         return ! $this->genericTypeNodeAnalyzer->hasGenericType($paramTagValueNode->type);
     }
-
-    private function isNullTagValueNode(ParamTagValueNode $paramTagValueNode): bool
-    {
-        if (! $paramTagValueNode->type instanceof IdentifierTypeNode) {
-            return false;
-        }
-
-        return (string) $paramTagValueNode->type === 'null';
-    }
 }

rules/DeadCode/PhpDoc/DeadReturnTagValueNodeAnalyzer.php

@@ -39,11 +39,6 @@ public function isDead(ReturnTagValueNode $returnTagValueNode, ClassMethod|Funct
     {
         $returnType = $functionLike->getReturnType();
 
-        if ($this->isNullTagValueNode($returnTagValueNode)) {
-            // return null is always unused
-            return true;
-        }
-
         if ($returnType === null) {
             return false;
         }
@@ -156,13 +151,4 @@ private function hasUsefullPhpdocType(ReturnTagValueNode $returnTagValueNode, mi
 
         return ! $this->isNeverReturnType($returnType);
     }
-
-    private function isNullTagValueNode(ReturnTagValueNode $returnTagValueNode): bool
-    {
-        if (! $returnTagValueNode->type instanceof IdentifierTypeNode) {
-            return false;
-        }
-
-        return (string) $returnTagValueNode->type === 'null';
-    }
 }