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

Updated Rector to commit 392898c5de7e25ceeb83072eb951939ddf1c7150

Browse Source 
392898c5de [Performance] Remove NODES_TO_MATCH constant on RemoveNonExistingVarAnnotationRector (#4267)
This commit is contained in:
Tomas Votruba 2023-06-18 03:50:55 +00:00
parent 071632b237
commit 950bd50ad1
5 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rules/DeadCode/Rector/Node/RemoveNonExistingVarAnnotationRector.php
View File

@ -21,7 +21,6 @@ use PhpParser\Node\Stmt\While_;
use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\Util\MultiInstanceofChecker;
use Rector\DeadCode\NodeAnalyzer\ExprUsedInNodeAnalyzer;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@ -37,19 +36,9 @@ final class RemoveNonExistingVarAnnotationRector extends AbstractRector
* @var \Rector\DeadCode\NodeAnalyzer\ExprUsedInNodeAnalyzer
*/
private $exprUsedInNodeAnalyzer;
/**
* @readonly
* @var \Rector\Core\Util\MultiInstanceofChecker
*/
private $multiInstanceofChecker;
/**
* @var array<class-string<Node>>
*/
private const NODES_TO_MATCH = [Foreach_::class, Static_::class, Echo_::class, Return_::class, Expression::class, Throw_::class, If_::class, While_::class, Switch_::class, Nop::class];
public function __construct(ExprUsedInNodeAnalyzer $exprUsedInNodeAnalyzer, MultiInstanceofChecker $multiInstanceofChecker)
public function __construct(ExprUsedInNodeAnalyzer $exprUsedInNodeAnalyzer)
{
$this->exprUsedInNodeAnalyzer = $exprUsedInNodeAnalyzer;
$this->multiInstanceofChecker = $multiInstanceofChecker;
}
public function getRuleDefinition() : RuleDefinition
{
@ -79,7 +68,7 @@ CODE_SAMPLE
*/
public function getNodeTypes() : array
{
return [Node::class];
return [Foreach_::class, Static_::class, Echo_::class, Return_::class, Expression::class, Throw_::class, If_::class, While_::class, Switch_::class, Nop::class];
}
public function refactor(Node $node) : ?Node
{
@ -130,13 +119,7 @@ CODE_SAMPLE
}
private function shouldSkip(Node $node) : bool
{
if (!$node instanceof Nop) {
return !$this->multiInstanceofChecker->isInstanceOf($node, self::NODES_TO_MATCH);
}
if (\count($node->getComments()) <= 1) {
return !$this->multiInstanceofChecker->isInstanceOf($node, self::NODES_TO_MATCH);
}
return \true;
return \count($node->getComments()) !== 1;
}
private function hasVariableName(Node $node, string $variableName) : bool
{

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '0d9828f9d90ee0dd4b50f759c150575785cce6b8';
public const PACKAGE_VERSION = '392898c5de7e25ceeb83072eb951939ddf1c7150';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-06-18 00:30:36';
public const RELEASE_DATE = '2023-06-18 10:45:19';
/**
* @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 ComposerAutoloaderInit8c35cca90ed5f80fa311a589eebd66f9::getLoader();
return ComposerAutoloaderInit3828b21a5ac14b5b6ae0465dfb4554e3::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit8c35cca90ed5f80fa311a589eebd66f9
class ComposerAutoloaderInit3828b21a5ac14b5b6ae0465dfb4554e3
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit8c35cca90ed5f80fa311a589eebd66f9
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit8c35cca90ed5f80fa311a589eebd66f9', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit3828b21a5ac14b5b6ae0465dfb4554e3', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit8c35cca90ed5f80fa311a589eebd66f9', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit3828b21a5ac14b5b6ae0465dfb4554e3', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3::$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 ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9
class ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3094,9 +3094,9 @@ class ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit8c35cca90ed5f80fa311a589eebd66f9::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit3828b21a5ac14b5b6ae0465dfb4554e3::$classMap;
}, null, ClassLoader::class);
}