diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php
index 53fb7bf4b09..8a54963fecb 100644
--- a/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php
+++ b/rules/TypeDeclaration/Rector/ClassMethod/AddParamTypeBasedOnPHPUnitDataProviderRector.php
@@ -166,12 +166,12 @@ CODE_SAMPLE
             return new MixedType();
         }
         /** @var Return_[] $returns */
-        $returns = $this->betterNodeFinder->findInstanceOf((array) $dataProviderClassMethod->stmts, Return_::class);
+        $returns = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($dataProviderClassMethod, Return_::class);
         if ($returns !== []) {
             return $this->resolveReturnStaticArrayTypeByParameterPosition($returns, $parameterPosition);
         }
         /** @var Yield_[] $yields */
-        $yields = $this->betterNodeFinder->findInstanceOf((array) $dataProviderClassMethod->stmts, Yield_::class);
+        $yields = $this->betterNodeFinder->findInstancesOfInFunctionLikeScoped($dataProviderClassMethod, Yield_::class);
         return $this->resolveYieldStaticArrayTypeByParameterPosition($yields, $parameterPosition);
     }
     /**
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
index d61cbfc6a4c..943dcd61a79 100644
--- a/src/Application/VersionResolver.php
+++ b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = 'd86930657fc80c2db725391d1bb8f3ad6a61d96a';
+    public const PACKAGE_VERSION = '35c1bf45b0bed6351e0db6e3a44a452f3713b155';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-04-01 02:46:21';
+    public const RELEASE_DATE = '2024-04-01 03:45:30';
     /**
      * @var int
      */