Simplify and improve void or never addition logic (#453)

Author: IanDelMar

src/Visitor.php

@@ -99,19 +99,18 @@ public function enterNode(Node $node)
             $this->additionalTagStrings[$symbolName] = $additions;
         }
 
-        if ($voidOrNever instanceof Type) {
-            $addition = sprintf(
-                '@phpstan-return %s',
-                $voidOrNever->__toString()
-            );
-            if (
-                ! isset($this->additionalTagStrings[$symbolName])
-                || ! in_array($addition, $this->additionalTagStrings[$symbolName], true)
-            ) {
-                $this->additionalTagStrings[$symbolName][] = $addition;
-            }
+        if (! ($voidOrNever instanceof Type)) {
+            return null;
+        }
+
+        $addition = sprintf('@phpstan-return %s', $voidOrNever->__toString());
+
+        if (in_array($addition, $additions, true)) {
+            return null;
         }
 
+        $this->additionalTagStrings[$symbolName] = [...$additions, $addition];
+
         return null;
     }
 
@@ -811,6 +810,10 @@ private function voidOrNever(Node $node): ?Type
             return null;
         }
 
+        if ($node->getReturnType() !== null) {
+            return null;
+        }
+
         $returnStmts = $this->nodeFinder->findInstanceOf($node, Stmt_Return::class);
 
         // If there is a return statement, it's not return type never.

wordpress-stubs.php

@@ -127890,7 +127890,6 @@ function wp_sizes_attribute_includes_valid_auto(string $sizes_attr): bool
      * @see https://html.spec.whatwg.org/multipage/rendering.html#img-contain-size
      * @see https://core.trac.wordpress.org/ticket/62413
      * @see https://core.trac.wordpress.org/ticket/62731
-     * @phpstan-return void
      */
     function wp_enqueue_img_auto_sizes_contain_css_fix(): void
     {
@@ -143365,7 +143364,6 @@ function wp_get_speculation_rules(): ?\WP_Speculation_Rules
      *
      * @since 6.8.0
      * @access private
-     * @phpstan-return void
      */
     function wp_print_speculation_rules(): void
     {