Updated Rector to commit 7899f2b186919d8b6bec30272f5e3046ec0793bd

7899f2b186 [NodeNameResolver] Remove EmptyNameResolver (#4782)
This commit is contained in:
Tomas Votruba 2023-08-14 06:35:46 +00:00
parent 81362af021
commit a8b42110be
10 changed files with 23 additions and 52 deletions

View File

@ -1,26 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\NodeNameResolver\NodeNameResolver;
use PhpParser\Node;
use PhpParser\Node\Expr\Empty_;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
/**
* @implements NodeNameResolverInterface<Empty_>
*/
final class EmptyNameResolver implements NodeNameResolverInterface
{
public function getNode() : string
{
return Empty_::class;
}
/**
* @param Empty_ $node
*/
public function resolve(Node $node, ?Scope $scope) : ?string
{
return 'empty';
}
}

View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '72815588219a43f3881295c77bd5c97239e4721a';
public const PACKAGE_VERSION = '7899f2b186919d8b6bec30272f5e3046ec0793bd';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-13 23:48:38';
public const RELEASE_DATE = '2023-08-14 07:31:46';
/**
* @var int
*/

View File

@ -75,7 +75,6 @@ use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeNameResolver\NodeNameResolver\ClassConstFetchNameResolver;
use Rector\NodeNameResolver\NodeNameResolver\ClassConstNameResolver;
use Rector\NodeNameResolver\NodeNameResolver\ClassNameResolver;
use Rector\NodeNameResolver\NodeNameResolver\EmptyNameResolver;
use Rector\NodeNameResolver\NodeNameResolver\FuncCallNameResolver;
use Rector\NodeNameResolver\NodeNameResolver\FunctionNameResolver;
use Rector\NodeNameResolver\NodeNameResolver\NameNameResolver;
@ -188,7 +187,7 @@ final class LazyContainerFactory
/**
* @var array<class-string<NodeNameResolverInterface>>
*/
private const NODE_NAME_RESOLVER_CLASSES = [ClassConstFetchNameResolver::class, ClassConstNameResolver::class, ClassNameResolver::class, EmptyNameResolver::class, FuncCallNameResolver::class, FunctionNameResolver::class, NameNameResolver::class, ParamNameResolver::class, PropertyNameResolver::class, UseNameResolver::class, VariableNameResolver::class];
private const NODE_NAME_RESOLVER_CLASSES = [ClassConstFetchNameResolver::class, ClassConstNameResolver::class, ClassNameResolver::class, FuncCallNameResolver::class, FunctionNameResolver::class, NameNameResolver::class, ParamNameResolver::class, PropertyNameResolver::class, UseNameResolver::class, VariableNameResolver::class];
/**
* @var array<class-string<BasePhpDocNodeVisitorInterface>>
*/

2
vendor/autoload.php vendored
View File

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

View File

@ -1891,7 +1891,6 @@ return array(
'Rector\\NodeNameResolver\\NodeNameResolver\\ClassConstFetchNameResolver' => $baseDir . '/packages/NodeNameResolver/NodeNameResolver/ClassConstFetchNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\ClassConstNameResolver' => $baseDir . '/packages/NodeNameResolver/NodeNameResolver/ClassConstNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\ClassNameResolver' => $baseDir . '/packages/NodeNameResolver/NodeNameResolver/ClassNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\EmptyNameResolver' => $baseDir . '/packages/NodeNameResolver/NodeNameResolver/EmptyNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\FuncCallNameResolver' => $baseDir . '/packages/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\FunctionNameResolver' => $baseDir . '/packages/NodeNameResolver/NodeNameResolver/FunctionNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\NameNameResolver' => $baseDir . '/packages/NodeNameResolver/NodeNameResolver/NameNameResolver.php',

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit519d39a38bf4d0d8e73bb2c623f55275
class ComposerAutoloaderInita964e0a56465619b8c0fa01369eb27c6
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit519d39a38bf4d0d8e73bb2c623f55275
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit519d39a38bf4d0d8e73bb2c623f55275', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInita964e0a56465619b8c0fa01369eb27c6', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit519d39a38bf4d0d8e73bb2c623f55275', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInita964e0a56465619b8c0fa01369eb27c6', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit519d39a38bf4d0d8e73bb2c623f55275::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInita964e0a56465619b8c0fa01369eb27c6::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit519d39a38bf4d0d8e73bb2c623f55275::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInita964e0a56465619b8c0fa01369eb27c6::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit519d39a38bf4d0d8e73bb2c623f55275
class ComposerStaticInita964e0a56465619b8c0fa01369eb27c6
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -2144,7 +2144,6 @@ class ComposerStaticInit519d39a38bf4d0d8e73bb2c623f55275
'Rector\\NodeNameResolver\\NodeNameResolver\\ClassConstFetchNameResolver' => __DIR__ . '/../..' . '/packages/NodeNameResolver/NodeNameResolver/ClassConstFetchNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\ClassConstNameResolver' => __DIR__ . '/../..' . '/packages/NodeNameResolver/NodeNameResolver/ClassConstNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\ClassNameResolver' => __DIR__ . '/../..' . '/packages/NodeNameResolver/NodeNameResolver/ClassNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\EmptyNameResolver' => __DIR__ . '/../..' . '/packages/NodeNameResolver/NodeNameResolver/EmptyNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\FuncCallNameResolver' => __DIR__ . '/../..' . '/packages/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\FunctionNameResolver' => __DIR__ . '/../..' . '/packages/NodeNameResolver/NodeNameResolver/FunctionNameResolver.php',
'Rector\\NodeNameResolver\\NodeNameResolver\\NameNameResolver' => __DIR__ . '/../..' . '/packages/NodeNameResolver/NodeNameResolver/NameNameResolver.php',
@ -2960,9 +2959,9 @@ class ComposerStaticInit519d39a38bf4d0d8e73bb2c623f55275
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit519d39a38bf4d0d8e73bb2c623f55275::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit519d39a38bf4d0d8e73bb2c623f55275::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit519d39a38bf4d0d8e73bb2c623f55275::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInita964e0a56465619b8c0fa01369eb27c6::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInita964e0a56465619b8c0fa01369eb27c6::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInita964e0a56465619b8c0fa01369eb27c6::$classMap;
}, null, ClassLoader::class);
}

View File

@ -701,17 +701,17 @@
},
{
"name": "nikic\/php-parser",
"version": "v4.17.0",
"version_normalized": "4.17.0.0",
"version": "v4.17.1",
"version_normalized": "4.17.1.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/nikic\/PHP-Parser.git",
"reference": "844c228bf2b34a25ea8fed58f7929d14cf0c068e"
"reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/nikic\/PHP-Parser\/zipball\/844c228bf2b34a25ea8fed58f7929d14cf0c068e",
"reference": "844c228bf2b34a25ea8fed58f7929d14cf0c068e",
"url": "https:\/\/api.github.com\/repos\/nikic\/PHP-Parser\/zipball\/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
"reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
"shasum": ""
},
"require": {
@ -722,7 +722,7 @@
"ircmaxell\/php-yacc": "^0.0.7",
"phpunit\/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
},
"time": "2023-08-13T14:53:08+00:00",
"time": "2023-08-13T19:53:39+00:00",
"bin": [
"bin\/php-parse"
],
@ -771,7 +771,7 @@
],
"support": {
"issues": "https:\/\/github.com\/nikic\/PHP-Parser\/issues",
"source": "https:\/\/github.com\/nikic\/PHP-Parser\/tree\/v4.17.0"
"source": "https:\/\/github.com\/nikic\/PHP-Parser\/tree\/v4.17.1"
},
"install-path": "..\/nikic\/php-parser"
},

File diff suppressed because one or more lines are too long

View File

@ -12,7 +12,7 @@ class ClassConst extends Node\Stmt
public $consts;
/** @var Node\AttributeGroup[] PHP attribute groups */
public $attrGroups;
/** @var Node\Identifier|Node\Name|Node\ComplexType Type declaration */
/** @var Node\Identifier|Node\Name|Node\ComplexType|null Type declaration */
public $type;
/**
* Constructs a class const list node.
@ -29,7 +29,7 @@ class ClassConst extends Node\Stmt
$this->flags = $flags;
$this->consts = $consts;
$this->attrGroups = $attrGroups;
$this->type = $type;
$this->type = \is_string($type) ? new Node\Identifier($type) : $type;
}
public function getSubNodeNames() : array
{