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

Updated Rector to commit dcca12200e8be5fbe0e136d863a6c7a3c0a354ce

Browse Source 
dcca12200e [Performance][NodeNameResolver] Remove autowire on NodeNameResolverInterface instance (#4321)
This commit is contained in:
Tomas Votruba 2023-06-22 19:46:15 +00:00
parent 6d1a7ecf0c
commit 6a50917e27
10 changed files with 31 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/NodeNameResolver/NodeNameResolver/ClassConstFetchNameResolver.php
View File

@ -4,27 +4,16 @@ declare (strict_types=1);
namespace Rector\NodeNameResolver\NodeNameResolver;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\ClassConstFetch;
use PhpParser\Node\Expr\Error;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202306\Symfony\Contracts\Service\Attribute\Required;
/**
* @implements NodeNameResolverInterface<ClassConstFetch>
*/
final class ClassConstFetchNameResolver implements NodeNameResolverInterface
{
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @required
*/
public function autowire(NodeNameResolver $nodeNameResolver) : void
{
$this->nodeNameResolver = $nodeNameResolver;
}
public function getNode() : string
{
return ClassConstFetch::class;
@ -34,14 +23,14 @@ final class ClassConstFetchNameResolver implements NodeNameResolverInterface
*/
public function resolve(Node $node, ?Scope $scope) : ?string
{
$class = $this->nodeNameResolver->getName($node->class);
$name = $this->nodeNameResolver->getName($node->name);
if ($class === null) {
if ($node->class instanceof Expr) {
return null;
}
if ($name === null) {
if ($node->name instanceof Error) {
return null;
}
$class = $node->class->toString();
$name = $node->name->toString();
return $class . '::' . $name;
}
}

15
packages/NodeNameResolver/NodeNameResolver/ClassConstNameResolver.php
View File

@ -7,24 +7,11 @@ use PhpParser\Node;
use PhpParser\Node\Stmt\ClassConst;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202306\Symfony\Contracts\Service\Attribute\Required;
/**
* @implements NodeNameResolverInterface<ClassConst>
*/
final class ClassConstNameResolver implements NodeNameResolverInterface
{
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @required
*/
public function autowire(NodeNameResolver $nodeNameResolver) : void
{
$this->nodeNameResolver = $nodeNameResolver;
}
public function getNode() : string
{
return ClassConst::class;
@ -38,6 +25,6 @@ final class ClassConstNameResolver implements NodeNameResolverInterface
return null;
}
$onlyConstant = $node->consts[0];
return $this->nodeNameResolver->getName($onlyConstant);
return $onlyConstant->name->toString();
}
}

15
packages/NodeNameResolver/NodeNameResolver/ClassNameResolver.php
View File

@ -9,24 +9,11 @@ use PhpParser\Node\Name;
use PhpParser\Node\Stmt\ClassLike;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202306\Symfony\Contracts\Service\Attribute\Required;
/**
* @implements NodeNameResolverInterface<ClassLike>
*/
final class ClassNameResolver implements NodeNameResolverInterface
{
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @required
*/
public function autowire(NodeNameResolver $nodeNameResolver) : void
{
$this->nodeNameResolver = $nodeNameResolver;
}
public function getNode() : string
{
return ClassLike::class;
@ -42,6 +29,6 @@ final class ClassNameResolver implements NodeNameResolverInterface
if (!$node->name instanceof Identifier) {
return null;
}
return $this->nodeNameResolver->getName($node->name);
return $node->name->toString();
}
}

23
packages/NodeNameResolver/NodeNameResolver/ParamNameResolver.php
View File

@ -4,27 +4,16 @@ declare (strict_types=1);
namespace Rector\NodeNameResolver\NodeNameResolver;
use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\Error;
use PhpParser\Node\Param;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202306\Symfony\Contracts\Service\Attribute\Required;
/**
* @implements NodeNameResolverInterface<Param>
*/
final class ParamNameResolver implements NodeNameResolverInterface
{
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @required
*/
public function autowire(NodeNameResolver $nodeNameResolver) : void
{
$this->nodeNameResolver = $nodeNameResolver;
}
public function getNode() : string
{
return Param::class;
@ -34,6 +23,12 @@ final class ParamNameResolver implements NodeNameResolverInterface
*/
public function resolve(Node $node, ?Scope $scope) : ?string
{
return $this->nodeNameResolver->getName($node->var);
if ($node->var instanceof Error) {
return null;
}
if ($node->var->name instanceof Expr) {
return null;
}
return $node->var->name;
}
}

15
packages/NodeNameResolver/NodeNameResolver/PropertyNameResolver.php
View File

@ -7,24 +7,11 @@ use PhpParser\Node;
use PhpParser\Node\Stmt\Property;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202306\Symfony\Contracts\Service\Attribute\Required;
/**
* @implements NodeNameResolverInterface<Property>
*/
final class PropertyNameResolver implements NodeNameResolverInterface
{
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @required
*/
public function autowire(NodeNameResolver $nodeNameResolver) : void
{
$this->nodeNameResolver = $nodeNameResolver;
}
public function getNode() : string
{
return Property::class;
@ -38,6 +25,6 @@ final class PropertyNameResolver implements NodeNameResolverInterface
return null;
}
$onlyProperty = $node->props[0];
return $this->nodeNameResolver->getName($onlyProperty);
return $onlyProperty->name->toString();
}
}

15
packages/NodeNameResolver/NodeNameResolver/UseNameResolver.php
View File

@ -7,24 +7,11 @@ use PhpParser\Node;
use PhpParser\Node\Stmt\Use_;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202306\Symfony\Contracts\Service\Attribute\Required;
/**
* @implements NodeNameResolverInterface<Use_>
*/
final class UseNameResolver implements NodeNameResolverInterface
{
/**
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @required
*/
public function autowire(NodeNameResolver $nodeNameResolver) : void
{
$this->nodeNameResolver = $nodeNameResolver;
}
public function getNode() : string
{
return Use_::class;
@ -38,6 +25,6 @@ final class UseNameResolver implements NodeNameResolverInterface
return null;
}
$onlyUse = $node->uses[0];
return $this->nodeNameResolver->getName($onlyUse);
return $onlyUse->name->toString();
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '5370b722f8802f82ead12b12b2e3988f40192718';
public const PACKAGE_VERSION = 'dcca12200e8be5fbe0e136d863a6c7a3c0a354ce';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-06-23 01:57:01';
public const RELEASE_DATE = '2023-06-23 02:41:57';
/**
* @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 ComposerAutoloaderInitf10055ac6e56ac1cc4e6efb218ea487e::getLoader();
return ComposerAutoloaderInit37b5c1f8163747c74e7c7e35fe9e3dac::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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