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

cleanup dead code

Browse Source
This commit is contained in:
Tomas Votruba 2019-09-02 20:50:58 +02:00
parent 7008685873
commit 1bdbc9dadd
1 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
packages/TypeDeclaration/src/Rector/FunctionLike/ReturnTypeDeclarationRector.php
View File

@ -3,7 +3,6 @@
namespace Rector\TypeDeclaration\Rector\FunctionLike;
use PhpParser\Node;
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Function_;
@ -113,41 +112,22 @@ CODE_SAMPLE
$returnTypeInfo = new ReturnTypeInfo($inferedTypes, $this->typeAnalyzer, $inferedTypes);
// @todo is it violation?
if ($this->hasNewTypeFromPreviousIteration($node)) {
// should override - is it subtype?
$possibleOverrideNewReturnType = $returnTypeInfo->getFqnTypeNode();
if ($possibleOverrideNewReturnType !== null) {
if ($node->returnType !== null) {
$isSubtype = $this->isSubtypeOf($possibleOverrideNewReturnType, $node->returnType);
if ($this->isReturnTypeAlreadyAdded($node, $returnTypeInfo)) {
return null;
}
// @see https://wiki.php.net/rfc/covariant-returns-and-contravariant-parameters
if ($isSubtype && $this->isAtLeastPhpVersion('7.4')) {
// allow override
$node->returnType = $returnTypeInfo->getFqnTypeNode();
}
} else {
$node->returnType = $returnTypeInfo->getFqnTypeNode();
}
}
} else {
if ($this->isReturnTypeAlreadyAdded($node, $returnTypeInfo)) {
return null;
}
// should be previous overridden?
if ($node->returnType !== null && $returnTypeInfo->getFqnTypeNode() !== null) {
$isSubtype = $this->isSubtypeOf($returnTypeInfo->getFqnTypeNode(), $node->returnType);
// should be previosu node overriden?
if ($node->returnType !== null && $returnTypeInfo->getFqnTypeNode() !== null) {
$isSubtype = $this->isSubtypeOf($returnTypeInfo->getFqnTypeNode(), $node->returnType);
// @see https://wiki.php.net/rfc/covariant-returns-and-contravariant-parameters
if ($this->isAtLeastPhpVersion('7.4') && $isSubtype) {
$node->returnType = $returnTypeInfo->getFqnTypeNode();
} elseif ($isSubtype === false) {
$node->returnType = $returnTypeInfo->getFqnTypeNode();
}
} else {
// @see https://wiki.php.net/rfc/covariant-returns-and-contravariant-parameters
if ($this->isAtLeastPhpVersion('7.4') && $isSubtype) {
$node->returnType = $returnTypeInfo->getFqnTypeNode();
} elseif ($isSubtype === false) {
$node->returnType = $returnTypeInfo->getFqnTypeNode();
}
} else {
$node->returnType = $returnTypeInfo->getFqnTypeNode();
}
$this->populateChildren($node, $returnTypeInfo);
@ -211,9 +191,6 @@ CODE_SAMPLE
$currentClassMethod->returnType = $resolvedChildType;
// let the method now it was changed now
$currentClassMethod->returnType->setAttribute(self::HAS_NEW_INHERITED_TYPE, true);
$this->notifyNodeChangeFileInfo($currentClassMethod);
}
@ -246,16 +223,4 @@ CODE_SAMPLE
return false;
}
/**
* @param ClassMethod|Function_ $functionLike
*/
private function hasNewTypeFromPreviousIteration(FunctionLike $functionLike): bool
{
if ($functionLike->returnType === null) {
return false;
}
return (bool) $functionLike->returnType->getAttribute(self::HAS_NEW_INHERITED_TYPE, false);
}
}