From d06d017699f138f4d77c2f505433d7537c3dd415 Mon Sep 17 00:00:00 2001 From: Abdul Malik Ikhsan Date: Fri, 12 Sep 2025 16:54:51 +0700 Subject: [PATCH 1/2] [TypeDeclarationDocblocks] Skip multiple returns on AddReturnDocblockForCommonObjectDenominatorRector --- .../Fixture/skip_multiple_returns.php.inc | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector/Fixture/skip_multiple_returns.php.inc diff --git a/rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector/Fixture/skip_multiple_returns.php.inc b/rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector/Fixture/skip_multiple_returns.php.inc new file mode 100644 index 00000000000..8cb6597741d --- /dev/null +++ b/rules-tests/TypeDeclarationDocblocks/Rector/ClassMethod/AddReturnDocblockForCommonObjectDenominatorRector/Fixture/skip_multiple_returns.php.inc @@ -0,0 +1,21 @@ + Date: Fri, 12 Sep 2025 16:57:00 +0700 Subject: [PATCH 2/2] Fix --- .../TypeDeclarationDocblocks/NodeFinder/ReturnNodeFinder.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rules/TypeDeclarationDocblocks/NodeFinder/ReturnNodeFinder.php b/rules/TypeDeclarationDocblocks/NodeFinder/ReturnNodeFinder.php index 4835d8b5111..47440606d86 100644 --- a/rules/TypeDeclarationDocblocks/NodeFinder/ReturnNodeFinder.php +++ b/rules/TypeDeclarationDocblocks/NodeFinder/ReturnNodeFinder.php @@ -25,6 +25,10 @@ public function findOnlyReturnWithExpr(ClassMethod|Function_ $functionLike): ?Re return null; } + if (count($returnsScoped) !== 1) { + return null; + } + return $returnsScoped[0]; } }