mirror of
https://github.com/rectorphp/rector.git
synced 2024-06-02 17:30:50 +00:00
Updated Rector to commit 4a03eb97153dd3d3868d90feeb0a269f3be754e6
4a03eb9715
[DeadCode] Skip expr as MethodCall or StaticCall from ClassMethod @return string docblock on RecastingRemovalRector (#3187)
This commit is contained in:
parent
84c989ec89
commit
aec87d7b85
|
@ -12,8 +12,11 @@ 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\MethodCall;
|
||||
use PhpParser\Node\Expr\PropertyFetch;
|
||||
use PhpParser\Node\Expr\StaticCall;
|
||||
use PhpParser\Node\Expr\StaticPropertyFetch;
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PHPStan\Reflection\Php\PhpPropertyReflection;
|
||||
use PHPStan\Type\ArrayType;
|
||||
use PHPStan\Type\BooleanType;
|
||||
|
@ -26,6 +29,7 @@ use PHPStan\Type\Type;
|
|||
use PHPStan\Type\UnionType;
|
||||
use Rector\Core\NodeAnalyzer\ExprAnalyzer;
|
||||
use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
|
||||
use Rector\Core\PhpParser\AstResolver;
|
||||
use Rector\Core\Rector\AbstractRector;
|
||||
use Rector\Core\Reflection\ReflectionResolver;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
|
||||
|
@ -54,11 +58,17 @@ final class RecastingRemovalRector extends AbstractRector
|
|||
* @var \Rector\Core\NodeAnalyzer\ExprAnalyzer
|
||||
*/
|
||||
private $exprAnalyzer;
|
||||
public function __construct(PropertyFetchAnalyzer $propertyFetchAnalyzer, ReflectionResolver $reflectionResolver, ExprAnalyzer $exprAnalyzer)
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\PhpParser\AstResolver
|
||||
*/
|
||||
private $astResolver;
|
||||
public function __construct(PropertyFetchAnalyzer $propertyFetchAnalyzer, ReflectionResolver $reflectionResolver, ExprAnalyzer $exprAnalyzer, AstResolver $astResolver)
|
||||
{
|
||||
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
|
||||
$this->reflectionResolver = $reflectionResolver;
|
||||
$this->exprAnalyzer = $exprAnalyzer;
|
||||
$this->astResolver = $astResolver;
|
||||
}
|
||||
public function getRuleDefinition() : RuleDefinition
|
||||
{
|
||||
|
@ -105,8 +115,22 @@ CODE_SAMPLE
|
|||
if ($this->shouldSkip($node->expr)) {
|
||||
return null;
|
||||
}
|
||||
if ($this->shouldSkipCall($node->expr)) {
|
||||
return null;
|
||||
}
|
||||
return $node->expr;
|
||||
}
|
||||
private function shouldSkipCall(Expr $expr) : bool
|
||||
{
|
||||
if (!$expr instanceof MethodCall && !$expr instanceof StaticCall) {
|
||||
return \false;
|
||||
}
|
||||
$classMethod = $this->astResolver->resolveClassMethodFromCall($expr);
|
||||
if (!$classMethod instanceof ClassMethod) {
|
||||
return \false;
|
||||
}
|
||||
return !$classMethod->returnType instanceof Node;
|
||||
}
|
||||
private function shouldSkip(Expr $expr) : bool
|
||||
{
|
||||
if (!$this->propertyFetchAnalyzer->isPropertyFetch($expr)) {
|
||||
|
|
|
@ -17,12 +17,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = '8bf7073f83f1758013cdecc804075ddce316f0f5';
|
||||
public const PACKAGE_VERSION = '4a03eb97153dd3d3868d90feeb0a269f3be754e6';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2022-12-11 16:33:05';
|
||||
public const RELEASE_DATE = '2022-12-11 23:18:38';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit1f04abfda8049127c969d196d121346a::getLoader();
|
||||
return ComposerAutoloaderInit129f3fdfab6e279083ad28d635cc51a3::getLoader();
|
||||
|
|
14
vendor/composer/autoload_real.php
vendored
14
vendor/composer/autoload_real.php
vendored
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit1f04abfda8049127c969d196d121346a
|
||||
class ComposerAutoloaderInit129f3fdfab6e279083ad28d635cc51a3
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,19 +22,19 @@ class ComposerAutoloaderInit1f04abfda8049127c969d196d121346a
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit1f04abfda8049127c969d196d121346a', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit129f3fdfab6e279083ad28d635cc51a3', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit1f04abfda8049127c969d196d121346a', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit129f3fdfab6e279083ad28d635cc51a3', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit1f04abfda8049127c969d196d121346a::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit129f3fdfab6e279083ad28d635cc51a3::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$includeFiles = \Composer\Autoload\ComposerStaticInit1f04abfda8049127c969d196d121346a::$files;
|
||||
$includeFiles = \Composer\Autoload\ComposerStaticInit129f3fdfab6e279083ad28d635cc51a3::$files;
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequire1f04abfda8049127c969d196d121346a($fileIdentifier, $file);
|
||||
composerRequire129f3fdfab6e279083ad28d635cc51a3($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
|
@ -46,7 +46,7 @@ class ComposerAutoloaderInit1f04abfda8049127c969d196d121346a
|
|||
* @param string $file
|
||||
* @return void
|
||||
*/
|
||||
function composerRequire1f04abfda8049127c969d196d121346a($fileIdentifier, $file)
|
||||
function composerRequire129f3fdfab6e279083ad28d635cc51a3($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
||||
|
|
8
vendor/composer/autoload_static.php
vendored
8
vendor/composer/autoload_static.php
vendored
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit1f04abfda8049127c969d196d121346a
|
||||
class ComposerStaticInit129f3fdfab6e279083ad28d635cc51a3
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
|
@ -3026,9 +3026,9 @@ class ComposerStaticInit1f04abfda8049127c969d196d121346a
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit1f04abfda8049127c969d196d121346a::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit1f04abfda8049127c969d196d121346a::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit1f04abfda8049127c969d196d121346a::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit129f3fdfab6e279083ad28d635cc51a3::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit129f3fdfab6e279083ad28d635cc51a3::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit129f3fdfab6e279083ad28d635cc51a3::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user