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

Updated Rector to commit d5f399eee5709932b579d41e3799c3097bbc101f

Browse Source 
d5f399eee5 [DeadCode] Remove @return void on return self on RemoveUselessReturnTagRector (#4894)
This commit is contained in:
Tomas Votruba 2023-09-02 15:59:59 +00:00
parent fc46b4d878
commit 28c16a1c00
7 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rules/DeadCode/PhpDoc/DeadParamTagValueNodeAnalyzer.php
View File

@ -65,6 +65,9 @@ final class DeadParamTagValueNodeAnalyzer
if ($param->type === null) {
return \false;
}
if ($paramTagValueNode->description !== '') {
return \false;
}
if ($param->type instanceof Name && $this->nodeNameResolver->isName($param->type, 'object')) {
return $paramTagValueNode->type instanceof IdentifierTypeNode && (string) $paramTagValueNode->type === 'object';
}
@ -75,14 +78,11 @@ final class DeadParamTagValueNodeAnalyzer
return \false;
}
if (!$paramTagValueNode->type instanceof BracketsAwareUnionTypeNode) {
return $paramTagValueNode->description === '';
return \true;
}
if ($this->mixedArrayTypeNodeAnalyzer->hasMixedArrayType($paramTagValueNode->type)) {
return \false;
}
if (!$this->genericTypeNodeAnalyzer->hasGenericType($paramTagValueNode->type)) {
return $paramTagValueNode->description === '';
}
return \false;
return !$this->genericTypeNodeAnalyzer->hasGenericType($paramTagValueNode->type);
}
}

20
rules/DeadCode/PhpDoc/DeadReturnTagValueNodeAnalyzer.php
View File

@ -3,7 +3,6 @@
declare (strict_types=1);
namespace Rector\DeadCode\PhpDoc;
use PhpParser\Node;
use PhpParser\Node\Stmt\ClassMethod;
use PHPStan\Analyser\Scope;
use PHPStan\PhpDocParser\Ast\PhpDoc\ReturnTagValueNode;
@ -57,18 +56,21 @@ final class DeadReturnTagValueNodeAnalyzer
if ($returnType === null) {
return \false;
}
if ($returnTagValueNode->description !== '') {
return \false;
}
$scope = $classMethod->getAttribute(AttributeKey::SCOPE);
if ($scope instanceof Scope && $scope->isInTrait() && $returnTagValueNode->type instanceof ThisTypeNode) {
return \false;
}
if (!$this->typeComparator->arePhpParserAndPhpStanPhpDocTypesEqual($returnType, $returnTagValueNode->type, $classMethod)) {
return \false;
return $returnTagValueNode->type instanceof IdentifierTypeNode && (string) $returnTagValueNode->type === 'void';
}
if ($this->phpDocTypeChanger->isAllowed($returnTagValueNode->type)) {
return \false;
}
if (!$returnTagValueNode->type instanceof BracketsAwareUnionTypeNode) {
return $this->isIdentiferRemovalAllowed($returnTagValueNode, $returnType);
return $this->standaloneTypeRemovalGuard->isLegal($returnTagValueNode->type, $returnType);
}
if ($this->genericTypeNodeAnalyzer->hasGenericType($returnTagValueNode->type)) {
return \false;
@ -76,17 +78,7 @@ final class DeadReturnTagValueNodeAnalyzer
if ($this->mixedArrayTypeNodeAnalyzer->hasMixedArrayType($returnTagValueNode->type)) {
return \false;
}
if ($this->hasTruePseudoType($returnTagValueNode->type)) {
return \false;
}
return $returnTagValueNode->description === '';
}
private function isIdentiferRemovalAllowed(ReturnTagValueNode $returnTagValueNode, Node $node) : bool
{
if ($returnTagValueNode->description === '') {
return $this->standaloneTypeRemovalGuard->isLegal($returnTagValueNode->type, $node);
}
return \false;
return !$this->hasTruePseudoType($returnTagValueNode->type);
}
private function hasTruePseudoType(BracketsAwareUnionTypeNode $bracketsAwareUnionTypeNode) : bool
{

8
rules/DeadCode/PhpDoc/DeadVarTagValueNodeAnalyzer.php
View File

@ -31,15 +31,15 @@ final class DeadVarTagValueNodeAnalyzer
if ($property->type === null) {
return \false;
}
if ($varTagValueNode->description !== '') {
return \false;
}
// is strict type superior to doc type? keep strict type only
$propertyType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($property->type);
$docType = $this->staticTypeMapper->mapPHPStanPhpDocTypeNodeToPHPStanType($varTagValueNode->type, $property);
if ($propertyType instanceof UnionType && !$docType instanceof UnionType) {
return !$docType instanceof IntersectionType;
}
if (!$this->typeComparator->arePhpParserAndPhpStanPhpDocTypesEqual($property->type, $varTagValueNode->type, $property)) {
return \false;
}
return $varTagValueNode->description === '';
return $this->typeComparator->arePhpParserAndPhpStanPhpDocTypesEqual($property->type, $varTagValueNode->type, $property);
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '3243e0efc1b7cab4f4c3f08cb73f16750018bad4';
public const PACKAGE_VERSION = 'd5f399eee5709932b579d41e3799c3097bbc101f';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-09-02 17:51:12';
public const RELEASE_DATE = '2023-09-02 22:56:30';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit774e500b32ec830425edd44fc34198ba::getLoader();
return ComposerAutoloaderInit08c6becc47ada3067410d3a704631e02::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit774e500b32ec830425edd44fc34198ba
class ComposerAutoloaderInit08c6becc47ada3067410d3a704631e02
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit774e500b32ec830425edd44fc34198ba
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit774e500b32ec830425edd44fc34198ba', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit08c6becc47ada3067410d3a704631e02', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit774e500b32ec830425edd44fc34198ba', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit08c6becc47ada3067410d3a704631e02', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit774e500b32ec830425edd44fc34198ba::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit08c6becc47ada3067410d3a704631e02::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit774e500b32ec830425edd44fc34198ba::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit08c6becc47ada3067410d3a704631e02::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit774e500b32ec830425edd44fc34198ba
class ComposerStaticInit08c6becc47ada3067410d3a704631e02
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2610,9 +2610,9 @@ class ComposerStaticInit774e500b32ec830425edd44fc34198ba
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit774e500b32ec830425edd44fc34198ba::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit774e500b32ec830425edd44fc34198ba::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit774e500b32ec830425edd44fc34198ba::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit08c6becc47ada3067410d3a704631e02::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit08c6becc47ada3067410d3a704631e02::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit08c6becc47ada3067410d3a704631e02::$classMap;
}, null, ClassLoader::class);
}