mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-01-17 21:38:22 +01:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit acca1e006a8fc1eee197fc8ffa6fa5e7cc2af131

Browse Source 
acca1e006a [TypeDeclaration] Clean up ArrowFunction check on ReturnTypeInferer (#6124)
This commit is contained in:
Tomas Votruba 2024-07-06 14:17:58 +00:00
parent 6a6b9d7674
commit c2b4dc9b5e
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rules/TypeDeclaration/TypeInferer/ReturnTypeInferer.php
View File

@ -5,7 +5,6 @@ namespace Rector\TypeDeclaration\TypeInferer;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ArrowFunction;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Expr\Yield_;
use PhpParser\Node\FunctionLike;
@ -139,14 +138,11 @@ final class ReturnTypeInferer
return new MixedType();
}
/**
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure|\PhpParser\Node\Expr\ArrowFunction $functionLike
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure $functionLike
*/
private function resolveTypeWithVoidHandling($functionLike, Type $resolvedType) : Type
{
if ($resolvedType->isVoid()->yes()) {
if ($functionLike instanceof ArrowFunction) {
return new MixedType();
}
$hasReturnValue = (bool) $this->betterNodeFinder->findFirstInFunctionLikeScoped($functionLike, static function (Node $subNode) : bool {
if (!$subNode instanceof Return_) {
// yield return is handled on speicific rule: AddReturnTypeDeclarationFromYieldsRector
@ -167,7 +163,7 @@ final class ReturnTypeInferer
return $resolvedType;
}
/**
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure|\PhpParser\Node\Expr\ArrowFunction $functionLike
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure $functionLike
*/
private function resolveBenevolentUnionTypeInteger($functionLike, UnionType $unionType) : Type
{
@ -179,15 +175,10 @@ final class ReturnTypeInferer
if (!($types[0]->isInteger()->yes() && $types[1]->isString()->yes())) {
return $unionType;
}
if (!$functionLike instanceof ArrowFunction) {
$returns = $this->betterNodeFinder->findReturnsScoped($functionLike);
$returnsWithExpr = \array_filter($returns, static function (Return_ $return) : bool {
return $return->expr instanceof Expr;
});
} else {
$returns = $functionLike->getStmts();
$returnsWithExpr = $returns;
}
$returns = $this->betterNodeFinder->findReturnsScoped($functionLike);
$returnsWithExpr = \array_filter($returns, static function (Return_ $return) : bool {
return $return->expr instanceof Expr;
});
if ($returns !== $returnsWithExpr) {
return $unionType;
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'b563c6d57a65c531f5f50b28db1c8baa4f960ae0';
public const PACKAGE_VERSION = 'acca1e006a8fc1eee197fc8ffa6fa5e7cc2af131';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2024-07-06 16:30:45';
public const RELEASE_DATE = '2024-07-06 21:15:36';
/**
* @var int
*/