octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit e6fd26353fa114ac92ba4b0c9b572f508b850e7f 

e6fd26353f Get rid of  in the (#3780)
This commit is contained in:
Tomas Votruba 2023-05-09 16:39:58 +00:00
parent 91de512bfa
commit 7ec53f4a70
23 changed files with 63 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/NodeNameResolver/Contract/NodeNameResolverInterface.php
View File

@ -4,6 +4,7 @@ declare (strict_types=1);
namespace Rector\NodeNameResolver\Contract;
use PhpParser\Node;
use PHPStan\Analyser\Scope;
/**
* @template TNode as Node
*/
@ -16,5 +17,5 @@ interface NodeNameResolverInterface
/**
* @param TNode $node
*/
public function resolve(Node $node) : ?string;
public function resolve(Node $node, ?Scope $scope) : ?string;
}

10
packages/NodeNameResolver/NodeNameResolver.php
View File

@ -10,6 +10,7 @@ use PhpParser\Node\Expr\StaticCall;
use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt\ClassLike;
use PHPStan\Analyser\Scope;
use Rector\CodingStyle\Naming\ClassNaming;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\NodeAnalyzer\CallAnalyzer;
@ -137,7 +138,8 @@ final class NodeNameResolver
}
$this->invalidNameNodeReporter->reportInvalidNodeForName($node);
}
$resolvedName = $this->resolveNodeName($node);
$scope = $node->getAttribute(AttributeKey::SCOPE);
$resolvedName = $this->resolveNodeName($node, $scope);
if ($resolvedName !== null) {
return $resolvedName;
}
@ -234,13 +236,13 @@ final class NodeNameResolver
}
return $this->isStringName($resolvedName, $desiredName);
}
private function resolveNodeName(Node $node) : ?string
private function resolveNodeName(Node $node, ?Scope $scope) : ?string
{
$nodeClass = \get_class($node);
if (\array_key_exists($nodeClass, $this->nodeNameResolversByClass)) {
$resolver = $this->nodeNameResolversByClass[$nodeClass];
if ($resolver instanceof NodeNameResolverInterface) {
return $resolver->resolve($node);
return $resolver->resolve($node, $scope);
}
return null;
}
@ -249,7 +251,7 @@ final class NodeNameResolver
continue;
}
$this->nodeNameResolversByClass[$nodeClass] = $nodeNameResolver;
return $nodeNameResolver->resolve($node);
return $nodeNameResolver->resolve($node, $scope);
}
$this->nodeNameResolversByClass[$nodeClass] = null;
return null;

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

@ -5,6 +5,7 @@ namespace Rector\NodeNameResolver\NodeNameResolver;
use PhpParser\Node;
use PhpParser\Node\Expr\ClassConstFetch;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202305\Symfony\Contracts\Service\Attribute\Required;
@ -31,7 +32,7 @@ final class ClassConstFetchNameResolver implements NodeNameResolverInterface
/**
* @param ClassConstFetch $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
$class = $this->nodeNameResolver->getName($node->class);
$name = $this->nodeNameResolver->getName($node->name);

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

@ -5,6 +5,7 @@ namespace Rector\NodeNameResolver\NodeNameResolver;
use PhpParser\Node;
use PhpParser\Node\Stmt\ClassConst;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202305\Symfony\Contracts\Service\Attribute\Required;
@ -31,7 +32,7 @@ final class ClassConstNameResolver implements NodeNameResolverInterface
/**
* @param ClassConst $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
if ($node->consts === []) {
return null;

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

@ -7,6 +7,7 @@ use PhpParser\Node;
use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\Stmt\ClassLike;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202305\Symfony\Contracts\Service\Attribute\Required;
@ -33,7 +34,7 @@ final class ClassNameResolver implements NodeNameResolverInterface
/**
* @param ClassLike $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
if ($node->namespacedName instanceof Name) {
return $node->namespacedName->toString();

3
packages/NodeNameResolver/NodeNameResolver/EmptyNameResolver.php
View File

@ -5,6 +5,7 @@ namespace Rector\NodeNameResolver\NodeNameResolver;
use PhpParser\Node;
use PhpParser\Node\Expr\Empty_;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
/**
* @implements NodeNameResolverInterface<Empty_>
@ -18,7 +19,7 @@ final class EmptyNameResolver implements NodeNameResolverInterface
/**
* @param Empty_ $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
return 'empty';
}

3
packages/NodeNameResolver/NodeNameResolver/FuncCallNameResolver.php
View File

@ -7,6 +7,7 @@ use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Name\FullyQualified;
use PHPStan\Analyser\Scope;
use PHPStan\Reflection\ReflectionProvider;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeTypeResolver\Node\AttributeKey;
@ -34,7 +35,7 @@ final class FuncCallNameResolver implements NodeNameResolverInterface
*
* @param FuncCall $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
if ($node->name instanceof Expr) {
return null;

3
packages/NodeNameResolver/NodeNameResolver/FunctionNameResolver.php
View File

@ -20,10 +20,9 @@ final class FunctionNameResolver implements NodeNameResolverInterface
/**
* @param Function_ $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
$bareName = (string) $node->name;
$scope = $node->getAttribute(AttributeKey::SCOPE);
if (!$scope instanceof Scope) {
return $bareName;
}

5
packages/NodeNameResolver/NodeNameResolver/NameNameResolver.php
View File

@ -7,6 +7,7 @@ use PhpParser\Node;
use PhpParser\Node\Expr\FuncCall;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeTypeResolver\Node\AttributeKey;
/**
@ -30,12 +31,12 @@ final class NameNameResolver implements NodeNameResolverInterface
/**
* @param Name $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
// possible function parent
$parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
if ($parentNode instanceof FuncCall) {
return $this->funcCallNameResolver->resolve($parentNode);
return $this->funcCallNameResolver->resolve($parentNode, $scope);
}
$resolvedName = $node->getAttribute(AttributeKey::RESOLVED_NAME);
if ($resolvedName instanceof FullyQualified) {

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

@ -5,6 +5,7 @@ namespace Rector\NodeNameResolver\NodeNameResolver;
use PhpParser\Node;
use PhpParser\Node\Param;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202305\Symfony\Contracts\Service\Attribute\Required;
@ -31,7 +32,7 @@ final class ParamNameResolver implements NodeNameResolverInterface
/**
* @param Param $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
return $this->nodeNameResolver->getName($node->var);
}

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

@ -5,6 +5,7 @@ namespace Rector\NodeNameResolver\NodeNameResolver;
use PhpParser\Node;
use PhpParser\Node\Stmt\Property;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202305\Symfony\Contracts\Service\Attribute\Required;
@ -31,7 +32,7 @@ final class PropertyNameResolver implements NodeNameResolverInterface
/**
* @param Property $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
if ($node->props === []) {
return null;

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

@ -5,6 +5,7 @@ namespace Rector\NodeNameResolver\NodeNameResolver;
use PhpParser\Node;
use PhpParser\Node\Stmt\Use_;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeNameResolver\NodeNameResolver;
use RectorPrefix202305\Symfony\Contracts\Service\Attribute\Required;
@ -31,7 +32,7 @@ final class UseNameResolver implements NodeNameResolverInterface
/**
* @param Use_ $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
if ($node->uses === []) {
return null;

3
packages/NodeNameResolver/NodeNameResolver/VariableNameResolver.php
View File

@ -7,6 +7,7 @@ use PhpParser\Node;
use PhpParser\Node\Expr;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\Variable;
use PHPStan\Analyser\Scope;
use Rector\NodeNameResolver\Contract\NodeNameResolverInterface;
use Rector\NodeTypeResolver\Node\AttributeKey;
/**
@ -21,7 +22,7 @@ final class VariableNameResolver implements NodeNameResolverInterface
/**
* @param Variable $node
*/
public function resolve(Node $node) : ?string
public function resolve(Node $node, ?Scope $scope) : ?string
{
$parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
// skip $some->$dynamicMethodName()

2
rules/Php82/Rector/New_/FilesystemIteratorSkipDotsRector.php
View File

@ -90,6 +90,6 @@ final class FilesystemIteratorSkipDotsRector extends AbstractRector implements M
// can be anything
return \true;
}
return $this->classConstFetchNameResolver->resolve($expr) === 'FilesystemIterator::SKIP_DOTS';
return $this->classConstFetchNameResolver->resolve($expr, null) === 'FilesystemIterator::SKIP_DOTS';
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '3f0753eca0da687f51d0c4ad1c09e689bd813e43';
public const PACKAGE_VERSION = 'e6fd26353fa114ac92ba4b0c9b572f508b850e7f';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-09 14:43:22';
public const RELEASE_DATE = '2023-05-09 18:34:12';
/**
* @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 ComposerAutoloaderInitbc4b2d5befad476b0fe481a3b755391d::getLoader();
return ComposerAutoloaderInitb4ca30e2c376abfca468e95676dcf6a8::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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

12
vendor/composer/installed.json vendored
View File

@ -869,17 +869,17 @@
},
{
"name": "phpstan\/phpstan",
"version": "1.10.14",
"version_normalized": "1.10.14.0",
"version": "1.10.15",
"version_normalized": "1.10.15.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/phpstan\/phpstan.git",
"reference": "d232901b09e67538e5c86a724be841bea5768a7c"
"reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/d232901b09e67538e5c86a724be841bea5768a7c",
"reference": "d232901b09e67538e5c86a724be841bea5768a7c",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpstan\/zipball\/762c4dac4da6f8756eebb80e528c3a47855da9bd",
"reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd",
"shasum": ""
},
"require": {
@ -888,7 +888,7 @@
"conflict": {
"phpstan\/phpstan-shim": "*"
},
"time": "2023-04-19T13:47:27+00:00",
"time": "2023-05-09T15:28:01+00:00",
"bin": [
"phpstan",
"phpstan.phar"

2
vendor/composer/installed.php vendored
View File

File diff suppressed because one or more lines are too long

1
vendor/phpstan/phpstan/bootstrap.php vendored
View File

@ -21,7 +21,6 @@ final class PharAutoloader
self::$composerAutoloader = (require 'phar://' . __DIR__ . '/phpstan.phar/vendor/autoload.php');
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/jetbrains/phpstorm-stubs/PhpStormStubsMap.php';
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/react/async/src/functions_include.php';
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/react/promise-stream/src/functions_include.php';
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/react/promise-timer/src/functions_include.php';
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/react/promise/src/functions_include.php';
require_once 'phar://' . __DIR__ . '/phpstan.phar/vendor/ringcentral/psr7/src/functions_include.php';

BIN
vendor/phpstan/phpstan/phpstan.phar vendored
View File

Binary file not shown.

26
vendor/phpstan/phpstan/phpstan.phar.asc vendored
View File

@ -1,16 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmQ/8NYACgkQUcZzBf/C
5cDBxQ/8CltFbRHz08q3mvi2OHjja2EmUsKvV4GMges9EkImL+tVOKW256520LgM
Vs64r9DBvdzUuCq1CjJNnRgqtHJNlK5CSoZGCKx8oyFuVGa3NjgxM4CuM+FP8oU7
sLBmJjbzVFmguYvXEx5R5JI03JC/qj+ZyhSiopogb0Bg/WA83jL3RBqHEJIFV1IS
FJDW9TEzN7uMG1qNIFmLVvUY17gz7LOw673pyu2R+jNzqHubWfeG7+2lTBQ6GPbT
YLhFB5LCph2x3YAxz6bTcFpXWCfXQYqfoX/ihVsnDb9p9/OzQp0XBE8dtJND3H9T
Xim/NmzRrcVX+v8AIeVpw8s5yPtVTUCkl468T0UEwE66fJqteFOWDDmuSVPn51iH
/7UMNDR8XWOkjM4UU2VRhRhEhXq3efMm1M0nE/wKQ1pbGwTVqrEJnRrLHU6dbCDB
Nl+XwhWykSN5Yo8DqK0RMx4jQ0K2vpUUiUhoqeXk9YbEr8it4TEUMR2JkhX+mrzL
AfEV9b7CathpsFZf0G1xhO0dETtzz4vtnjHLqMUsXM7T8G92S33OOtMVmyo7fwHv
WNPlYMW14d593GJLj8sN737PLpbLKojNeE5wapnK2sNeXMVY6Ty00WeyUeJUsFbc
nhw4pdoS8uEimLMKppzqXeEdKnB0JHvUetv3THB++nt/vVLueKI=
=LZN5
iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmRaZmcACgkQUcZzBf/C
5cAn/Q//fbWiR/qaSvlHpk73KH7iDfoHwNvRrHSQODZdMa4PGiEbL+SXsKnRxFDo
kEJZwgU5qi3WMflt7Ml3dYDlQDgoDerdaiySYFoBcv1NXDWKoF7+Egy1AHxpfNq+
FMCkZNR2ulSaYUCofM4GkTNap4yVkPCy289ZU6yUmRnJxF+hh/CFfdVPAPbwh/a6
UqV3R2ENJZSbtA1pzSTBpUPQGQ9qcsqngKyNyxk1hEd9opdMg2eSFvO1e1ZZm/Tk
Kgh5wCbsbSJuRPGO4vbiybTeO/qXPDlHV6oA5SHnjJ4H24phCsHdyJHHvLQmrUeR
BKHgnH1y/b5J9cgr9OgEQJK9TMHHd6dii9//Qp+0rUZIDZ4Ym2lDSA/Vn/D9GoV3
zo4QYzW3TvE3QMdnLcX/ZtaLliPdDYIaYUXOiyaYwLFGVxSWZWOC5IN0G0bLJb39
Ca/z839nkWdMqg68q/oHC2Nk/v/KZnKg1RlRjYhj53T6nr0JDEiaYMyETSOIFsVX
AcCQnLLwMndUAibJAyORDnTk+ipg0SecFoPvvhea1BtlTfhSDIlrT4OPKZ5nExzd
nR/zGbIH8lCvsBc+hq+Kgodtfs5nauwEOwlVUwet26xL1YKOd0jxz+Zp6tgk0wba
cMf5L9fm85j83DQYr7Ukaaj81kmMujRWDo/dRojKhUlJUrNnjXA=
=jTtX
-----END PGP SIGNATURE-----