mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-01-18 14:03:41 +01:00
Code Issues Projects Releases Wiki Activity

Generate no return when empty return statement

Browse Source
This commit is contained in:
Witold Wasiczko 2020-01-05 19:33:35 +01:00
parent e15e6b0351
commit f610206257
No known key found for this signature in database
GPG Key ID: 018185A24DB71DCD
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/CodeQuality/src/Rector/Array_/CallableThisArrayToAnonymousFunctionRector.php
View File

@ -188,7 +188,7 @@ PHP
*/ */
private function createAnonymousFunction(ClassMethod $classMethod, Node $node): Closure private function createAnonymousFunction(ClassMethod $classMethod, Node $node): Closure
{ {
$hasClassMethodReturn = $this->betterNodeFinder->findInstanceOf((array) $classMethod->stmts, Return_::class); $classMethodReturns = $this->betterNodeFinder->findInstanceOf((array) $classMethod->stmts, Return_::class);
$anonymousFunction = new Closure(); $anonymousFunction = new Closure();
$newParams = $this->copyParams($classMethod->params); $newParams = $this->copyParams($classMethod->params);
@ -205,7 +205,7 @@ PHP
} }
// does method return something? // does method return something?
if ($hasClassMethodReturn !== []) { if ($this->hasClassMethodReturn($classMethodReturns)) {
$anonymousFunction->stmts[] = new Return_($innerMethodCall); $anonymousFunction->stmts[] = new Return_($innerMethodCall);
} else { } else {
$anonymousFunction->stmts[] = new Expression($innerMethodCall); $anonymousFunction->stmts[] = new Expression($innerMethodCall);
@ -220,6 +220,19 @@ PHP
return $anonymousFunction; return $anonymousFunction;
} }
/**
* @param Return_[] $nodes
*/
private function hasClassMethodReturn(array $nodes): bool
{
foreach($nodes as $node) {
if ($node->expr !== null) {
return true;
}
}
return false;
}
/** /**
* @param Param[] $params * @param Param[] $params
* @return Arg[] * @return Arg[]