octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-03 18:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit f0df3c5101f4b9465708589a2c13027bc84f898c

Browse Source 
f0df3c5101 [CodingStyle] Skip has static call call non static method on StaticArrowFunctionRector and StaticClosureRector (#2713)
This commit is contained in:
Tomas Votruba 2022-07-26 12:51:56 +00:00
parent 7efa43947f
commit a746965f93
8 changed files with 89 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
rules/CodingStyle/Guard/StaticGuard.php Normal file
View File

@ -0,0 +1,51 @@
<?php
declare (strict_types=1);
namespace Rector\CodingStyle\Guard;
use PhpParser\Node;
use PhpParser\Node\Expr\ArrowFunction;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Expr\Variable;
use PHPStan\Reflection\MethodReflection;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\Core\Reflection\ReflectionResolver;
final class StaticGuard
{
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
/**
* @readonly
* @var \Rector\Core\Reflection\ReflectionResolver
*/
private $reflectionResolver;
public function __construct(BetterNodeFinder $betterNodeFinder, ReflectionResolver $reflectionResolver)
{
$this->betterNodeFinder = $betterNodeFinder;
$this->reflectionResolver = $reflectionResolver;
}
/**
* @param \PhpParser\Node\Expr\Closure|\PhpParser\Node\Expr\ArrowFunction $node
*/
public function isLegal($node) : bool
{
if ($node->static) {
return \false;
}
$nodes = $node instanceof Closure ? $node->stmts : [$node->expr];
return !(bool) $this->betterNodeFinder->findFirst($nodes, function (Node $subNode) : bool {
if (!$subNode instanceof StaticCall) {
return $subNode instanceof Variable && $subNode->name === 'this';
}
$methodReflection = $this->reflectionResolver->resolveMethodReflectionFromStaticCall($subNode);
if (!$methodReflection instanceof MethodReflection) {
return \false;
}
return !$methodReflection->isStatic();
});
}
}

22
rules/CodingStyle/Rector/ArrowFunction/StaticArrowFunctionRector.php
View File

@ -5,7 +5,7 @@ namespace Rector\CodingStyle\Rector\ArrowFunction;
use PhpParser\Node;
use PhpParser\Node\Expr\ArrowFunction;
use PhpParser\Node\Expr\Variable;
use Rector\CodingStyle\Guard\StaticGuard;
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@ -14,6 +14,15 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
*/
final class StaticArrowFunctionRector extends AbstractRector
{
/**
* @readonly
* @var \Rector\CodingStyle\Guard\StaticGuard
*/
private $staticGuard;
public function __construct(StaticGuard $staticGuard)
{
$this->staticGuard = $staticGuard;
}
public function getRuleDefinition() : RuleDefinition
{
return new RuleDefinition('Changes ArrowFunction to be static when possible', [new CodeSample(<<<'CODE_SAMPLE'
@ -36,19 +45,10 @@ CODE_SAMPLE
*/
public function refactor(Node $node) : ?Node
{
if ($this->shouldSkip($node)) {
if (!$this->staticGuard->isLegal($node)) {
return null;
}
$node->static = \true;
return $node;
}
private function shouldSkip(ArrowFunction $arrowFunction) : bool
{
if ($arrowFunction->static) {
return \true;
}
return (bool) $this->betterNodeFinder->findFirst($arrowFunction->expr, static function (Node $subNode) : bool {
return $subNode instanceof Variable && $subNode->name === 'this';
});
}
}

22
rules/CodingStyle/Rector/Closure/StaticClosureRector.php
View File

@ -5,7 +5,7 @@ namespace Rector\CodingStyle\Rector\Closure;
use PhpParser\Node;
use PhpParser\Node\Expr\Closure;
use PhpParser\Node\Expr\Variable;
use Rector\CodingStyle\Guard\StaticGuard;
use Rector\Core\Rector\AbstractRector;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@ -14,6 +14,15 @@ use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
*/
final class StaticClosureRector extends AbstractRector
{
/**
* @readonly
* @var \Rector\CodingStyle\Guard\StaticGuard
*/
private $staticGuard;
public function __construct(StaticGuard $staticGuard)
{
$this->staticGuard = $staticGuard;
}
public function getRuleDefinition() : RuleDefinition
{
return new RuleDefinition('Changes Closure to be static when possible', [new CodeSample(<<<'CODE_SAMPLE'
@ -48,19 +57,10 @@ CODE_SAMPLE
*/
public function refactor(Node $node) : ?Node
{
if ($this->shouldSkip($node)) {
if (!$this->staticGuard->isLegal($node)) {
return null;
}
$node->static = \true;
return $node;
}
private function shouldSkip(Closure $closure) : bool
{
if ($closure->static) {
return \true;
}
return (bool) $this->betterNodeFinder->findFirst($closure->stmts, static function (Node $subNode) : bool {
return $subNode instanceof Variable && $subNode->name === 'this';
});
}
}

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'ce22a82f851781d39fb89479800d15a98b7f453b';
public const PACKAGE_VERSION = 'f0df3c5101f4b9465708589a2c13027bc84f898c';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-07-26 09:02:02';
public const RELEASE_DATE = '2022-07-26 14:46:50';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1422,6 +1422,7 @@ return array(
'Rector\\CodingStyle\\ClassNameImport\\UsedImportsResolver' => $baseDir . '/rules/CodingStyle/ClassNameImport/UsedImportsResolver.php',
'Rector\\CodingStyle\\Contract\\ClassNameImport\\ClassNameImportSkipVoterInterface' => $baseDir . '/rules/CodingStyle/Contract/ClassNameImport/ClassNameImportSkipVoterInterface.php',
'Rector\\CodingStyle\\Enum\\PreferenceSelfThis' => $baseDir . '/rules/CodingStyle/Enum/PreferenceSelfThis.php',
'Rector\\CodingStyle\\Guard\\StaticGuard' => $baseDir . '/rules/CodingStyle/Guard/StaticGuard.php',
'Rector\\CodingStyle\\Naming\\ClassNaming' => $baseDir . '/rules/CodingStyle/Naming/ClassNaming.php',
'Rector\\CodingStyle\\NodeAnalyzer\\SpreadVariablesCollector' => $baseDir . '/rules/CodingStyle/NodeAnalyzer/SpreadVariablesCollector.php',
'Rector\\CodingStyle\\NodeAnalyzer\\UseImportNameMatcher' => $baseDir . '/rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit15b23e55f0a88be35712bb1bb55b9927
class ComposerAutoloaderInit2e718407cdf3da2747ba3c260c1dd675
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit15b23e55f0a88be35712bb1bb55b9927
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit15b23e55f0a88be35712bb1bb55b9927', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit2e718407cdf3da2747ba3c260c1dd675', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit15b23e55f0a88be35712bb1bb55b9927', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit2e718407cdf3da2747ba3c260c1dd675', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit15b23e55f0a88be35712bb1bb55b9927::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit2e718407cdf3da2747ba3c260c1dd675::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit15b23e55f0a88be35712bb1bb55b9927::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit2e718407cdf3da2747ba3c260c1dd675::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire15b23e55f0a88be35712bb1bb55b9927($fileIdentifier, $file);
composerRequire2e718407cdf3da2747ba3c260c1dd675($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit15b23e55f0a88be35712bb1bb55b9927
* @param string $file
* @return void
*/
function composerRequire15b23e55f0a88be35712bb1bb55b9927($fileIdentifier, $file)
function composerRequire2e718407cdf3da2747ba3c260c1dd675($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit15b23e55f0a88be35712bb1bb55b9927
class ComposerStaticInit2e718407cdf3da2747ba3c260c1dd675
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -1729,6 +1729,7 @@ class ComposerStaticInit15b23e55f0a88be35712bb1bb55b9927
'Rector\\CodingStyle\\ClassNameImport\\UsedImportsResolver' => __DIR__ . '/../..' . '/rules/CodingStyle/ClassNameImport/UsedImportsResolver.php',
'Rector\\CodingStyle\\Contract\\ClassNameImport\\ClassNameImportSkipVoterInterface' => __DIR__ . '/../..' . '/rules/CodingStyle/Contract/ClassNameImport/ClassNameImportSkipVoterInterface.php',
'Rector\\CodingStyle\\Enum\\PreferenceSelfThis' => __DIR__ . '/../..' . '/rules/CodingStyle/Enum/PreferenceSelfThis.php',
'Rector\\CodingStyle\\Guard\\StaticGuard' => __DIR__ . '/../..' . '/rules/CodingStyle/Guard/StaticGuard.php',
'Rector\\CodingStyle\\Naming\\ClassNaming' => __DIR__ . '/../..' . '/rules/CodingStyle/Naming/ClassNaming.php',
'Rector\\CodingStyle\\NodeAnalyzer\\SpreadVariablesCollector' => __DIR__ . '/../..' . '/rules/CodingStyle/NodeAnalyzer/SpreadVariablesCollector.php',
'Rector\\CodingStyle\\NodeAnalyzer\\UseImportNameMatcher' => __DIR__ . '/../..' . '/rules/CodingStyle/NodeAnalyzer/UseImportNameMatcher.php',
@ -3405,9 +3406,9 @@ class ComposerStaticInit15b23e55f0a88be35712bb1bb55b9927
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit15b23e55f0a88be35712bb1bb55b9927::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit15b23e55f0a88be35712bb1bb55b9927::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit15b23e55f0a88be35712bb1bb55b9927::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit2e718407cdf3da2747ba3c260c1dd675::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit2e718407cdf3da2747ba3c260c1dd675::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit2e718407cdf3da2747ba3c260c1dd675::$classMap;
}, null, ClassLoader::class);
}