[TypeDeclaration] Skip conditional Throw_ on ReturnNeverTypeRector (#…

…1217)

Co-authored-by: Markus Staab <markus.staab@redaxo.de>
Co-authored-by: GitHub Action <action@github.com>

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/Fixture/skip_conditional_throw2.php.inc

@@ -0,0 +1,12 @@
+<?php
+
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector\Fixture;
+
+function assertEmptyOutputBuffer($messagePrefix)
+{
+    if (Rocket::isAppMode('development')) {
+        if (ob_get_length() > 0) {
+            throw new Exception($messagePrefix.'Unexpected start of output:'.print_r(ob_get_contents(), true));
+        }
+    }
+}

rules-tests/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector/Fixture/skip_conditional_throw3.php.inc

@@ -0,0 +1,14 @@
+<?php
+namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector\Fixture;
+
+class X {
+    protected function configBoot()
+    {
+        if (isset($helper_files)) {
+            throw new Exception('error');
+        }
+        if (isset($builtin_files)) {
+            throw new Exception('error');
+        }
+    }
+}

rules/TypeDeclaration/Rector/ClassMethod/ReturnNeverTypeRector.php

@@ -102,10 +102,8 @@ private function shouldSkip(ClassMethod | Function_ $node): bool
             return true;
         }
 
-        $hasNotNeverNodes = $this->betterNodeFinder->hasInstancesOf(
-            $node,
-            [Yield_::class] + ControlStructure::CONDITIONAL_NODE_SCOPE_TYPES
-        );
+        $yieldAndConditionalNodes = array_merge([Yield_::class], ControlStructure::CONDITIONAL_NODE_SCOPE_TYPES);
+        $hasNotNeverNodes = $this->betterNodeFinder->hasInstancesOf($node, $yieldAndConditionalNodes);
         if ($hasNotNeverNodes) {
             return true;
         }