octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-05-31 16:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 7e0859efe1

Browse Source 
7e0859efe1 [DeadCode] Skip non-typed property for RecastingRemovalRector (#608)
This commit is contained in:
Tomas Votruba 2021-08-07 11:36:26 +00:00
parent b5290c94c5
commit fb1a342d17
7 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
rules/DeadCode/Rector/Cast/RecastingRemovalRector.php
View File

@ -4,6 +4,7 @@ declare (strict_types=1);
namespace Rector\DeadCode\Rector\Cast;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Cast;
use PhpParser\Node\Expr\Cast\Array_;
use PhpParser\Node\Expr\Cast\Bool_;
@ -11,6 +12,9 @@ use PhpParser\Node\Expr\Cast\Double;
use PhpParser\Node\Expr\Cast\Int_;
use PhpParser\Node\Expr\Cast\Object_;
use PhpParser\Node\Expr\Cast\String_;
use PhpParser\Node\Expr\PropertyFetch;
use PhpParser\Node\Expr\StaticPropertyFetch;
use PHPStan\Reflection\Php\PhpPropertyReflection;
use PHPStan\Type\ArrayType;
use PHPStan\Type\BooleanType;
use PHPStan\Type\FloatType;
@ -19,7 +23,9 @@ use PHPStan\Type\MixedType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\StringType;
use PHPStan\Type\Type;
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\Reflection\ReflectionResolver;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
@ -31,6 +37,19 @@ final class RecastingRemovalRector extends \Rector\Core\Rector\AbstractRector
* @var array<class-string<Node>, class-string<Type>>
*/
private const CAST_CLASS_TO_NODE_TYPE = [\PhpParser\Node\Expr\Cast\String_::class => \PHPStan\Type\StringType::class, \PhpParser\Node\Expr\Cast\Bool_::class => \PHPStan\Type\BooleanType::class, \PhpParser\Node\Expr\Cast\Array_::class => \PHPStan\Type\ArrayType::class, \PhpParser\Node\Expr\Cast\Int_::class => \PHPStan\Type\IntegerType::class, \PhpParser\Node\Expr\Cast\Object_::class => \PHPStan\Type\ObjectType::class, \PhpParser\Node\Expr\Cast\Double::class => \PHPStan\Type\FloatType::class];
/**
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
*/
private $propertyFetchAnalyzer;
/**
* @var \Rector\Core\Reflection\ReflectionResolver
*/
private $reflectionResolver;
public function __construct(\Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer $propertyFetchAnalyzer, \Rector\Core\Reflection\ReflectionResolver $reflectionResolver)
{
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
$this->reflectionResolver = $reflectionResolver;
}
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
return new \Symplify\RuleDocGenerator\ValueObject\RuleDefinition('Removes recasting of the same type', [new \Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample(<<<'CODE_SAMPLE'
@ -73,6 +92,22 @@ CODE_SAMPLE
if (!\is_a($nodeType, $sameNodeType, \true)) {
return null;
}
if ($this->shouldSkip($node->expr)) {
return null;
}
return $node->expr;
}
private function shouldSkip(\PhpParser\Node\Expr $expr) : bool
{
if (!$this->propertyFetchAnalyzer->isPropertyFetch($expr)) {
return \false;
}
/** @var PropertyFetch|StaticPropertyFetch $expr */
$phpPropertyReflection = $this->reflectionResolver->resolvePropertyReflectionFromPropertyFetch($expr);
if (!$phpPropertyReflection instanceof \PHPStan\Reflection\Php\PhpPropertyReflection) {
return \false;
}
$nativeType = $phpPropertyReflection->getNativeType();
return $nativeType instanceof \PHPStan\Type\MixedType;
}
}

5
rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php
View File

@ -4,6 +4,7 @@ declare (strict_types=1);
namespace Rector\DeadCode\Rector\MethodCall;
use PhpParser\Node;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\ArrowFunction;
use PhpParser\Node\Expr\Assign;
use PhpParser\Node\Expr\ConstFetch;
@ -111,6 +112,10 @@ CODE_SAMPLE
if ($this->callAnalyzer->isObjectCall($methodCall->var)) {
return null;
}
$parentArg = $this->betterNodeFinder->findParentType($methodCall, \PhpParser\Node\Arg::class);
if ($parentArg instanceof \PhpParser\Node\Arg) {
return null;
}
$scope = $methodCall->var->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE);
if (!$scope instanceof \PHPStan\Analyser\Scope) {
return null;

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '2d22795af1549dfbe40e3b8cf1c71cf88af7d3b1';
public const PACKAGE_VERSION = '7e0859efe177331b53a327b60f5d6c48d7087bee';
/**
* @var string
*/
public const RELEASE_DATE = '2021-08-07 13:23:31';
public const RELEASE_DATE = '2021-08-07 13:24:57';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210807\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit1348308913578ac84ac0564b0e9c7359::getLoader();
return ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit1348308913578ac84ac0564b0e9c7359
class ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit1348308913578ac84ac0564b0e9c7359
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit1348308913578ac84ac0564b0e9c7359', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit1348308913578ac84ac0564b0e9c7359', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit1348308913578ac84ac0564b0e9c7359::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit99d0fb8da44b4089c90e97ba15b5dc3d::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit1348308913578ac84ac0564b0e9c7359
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit1348308913578ac84ac0564b0e9c7359::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit99d0fb8da44b4089c90e97ba15b5dc3d::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire1348308913578ac84ac0564b0e9c7359($fileIdentifier, $file);
composerRequire99d0fb8da44b4089c90e97ba15b5dc3d($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire1348308913578ac84ac0564b0e9c7359($fileIdentifier, $file)
function composerRequire99d0fb8da44b4089c90e97ba15b5dc3d($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit1348308913578ac84ac0564b0e9c7359
class ComposerStaticInit99d0fb8da44b4089c90e97ba15b5dc3d
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3846,9 +3846,9 @@ class ComposerStaticInit1348308913578ac84ac0564b0e9c7359
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit1348308913578ac84ac0564b0e9c7359::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit1348308913578ac84ac0564b0e9c7359::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit1348308913578ac84ac0564b0e9c7359::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit99d0fb8da44b4089c90e97ba15b5dc3d::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit99d0fb8da44b4089c90e97ba15b5dc3d::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit99d0fb8da44b4089c90e97ba15b5dc3d::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20210807\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit1348308913578ac84ac0564b0e9c7359', false) && !interface_exists('ComposerAutoloaderInit1348308913578ac84ac0564b0e9c7359', false) && !trait_exists('ComposerAutoloaderInit1348308913578ac84ac0564b0e9c7359', false)) {
spl_autoload_call('RectorPrefix20210807\ComposerAutoloaderInit1348308913578ac84ac0564b0e9c7359');
if (!class_exists('ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d', false) && !interface_exists('ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d', false) && !trait_exists('ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d', false)) {
spl_autoload_call('RectorPrefix20210807\ComposerAutoloaderInit99d0fb8da44b4089c90e97ba15b5dc3d');
}
if (!class_exists('AjaxLogin', false) && !interface_exists('AjaxLogin', false) && !trait_exists('AjaxLogin', false)) {
spl_autoload_call('RectorPrefix20210807\AjaxLogin');
@ -3305,9 +3305,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210807\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire1348308913578ac84ac0564b0e9c7359')) {
function composerRequire1348308913578ac84ac0564b0e9c7359() {
return \RectorPrefix20210807\composerRequire1348308913578ac84ac0564b0e9c7359(...func_get_args());
if (!function_exists('composerRequire99d0fb8da44b4089c90e97ba15b5dc3d')) {
function composerRequire99d0fb8da44b4089c90e97ba15b5dc3d() {
return \RectorPrefix20210807\composerRequire99d0fb8da44b4089c90e97ba15b5dc3d(...func_get_args());
}
}
if (!function_exists('parseArgs')) {