mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-04-23 08:54:41 +02:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit db5f778f9f9fd94fe1271ce8fc3ef4c156fd88ad

Browse Source 
db5f778f9f [NodeAnalyzer] Remove parent lookup on ExprAnalyzer::isNonTypedFromParam() ()
This commit is contained in:
Tomas Votruba 2023-07-01 10:16:51 +00:00
parent 6981c70c9a
commit 33dbc6506f
5 changed files with 22 additions and 60 deletions

4
src/Application/VersionResolver.php

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '9ed8c21b127cdd45a28307d5fc41668f867f4ef4';
public const PACKAGE_VERSION = 'db5f778f9f9fd94fe1271ce8fc3ef4c156fd88ad';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-07-01 16:37:51';
public const RELEASE_DATE = '2023-07-01 17:11:21';
/**
* @var int
*/

58
src/NodeAnalyzer/ExprAnalyzer.php

@ -8,51 +8,24 @@ use PhpParser\Node\Expr\Array_;
use PhpParser\Node\Expr\ClassConstFetch;
use PhpParser\Node\Expr\ConstFetch;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Identifier;
use PhpParser\Node\Name;
use PhpParser\Node\Scalar;
use PhpParser\Node\Scalar\Encapsed;
use PHPStan\PhpDocParser\Ast\PhpDoc\ParamTagValueNode;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use PHPStan\Analyser\Scope;
use PHPStan\Type\MixedType;
use Rector\Core\Enum\ObjectReference;
use Rector\Core\NodeManipulator\ArrayManipulator;
use Rector\Core\PhpParser\Comparing\NodeComparator;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
final class ExprAnalyzer
{
/**
* @readonly
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
*/
private $nodeComparator;
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
/**
* @readonly
* @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
*/
private $phpDocInfoFactory;
/**
* @readonly
* @var \Rector\NodeNameResolver\NodeNameResolver
*/
private $nodeNameResolver;
/**
* @readonly
* @var \Rector\Core\NodeManipulator\ArrayManipulator
*/
private $arrayManipulator;
public function __construct(NodeComparator $nodeComparator, BetterNodeFinder $betterNodeFinder, PhpDocInfoFactory $phpDocInfoFactory, NodeNameResolver $nodeNameResolver, ArrayManipulator $arrayManipulator)
public function __construct(ArrayManipulator $arrayManipulator)
{
$this->nodeComparator = $nodeComparator;
$this->betterNodeFinder = $betterNodeFinder;
$this->phpDocInfoFactory = $phpDocInfoFactory;
$this->nodeNameResolver = $nodeNameResolver;
$this->arrayManipulator = $arrayManipulator;
}
public function isNonTypedFromParam(Expr $expr) : bool
@ -60,24 +33,13 @@ final class ExprAnalyzer
if (!$expr instanceof Variable) {
return \false;
}
$functionLike = $this->betterNodeFinder->findParentType($expr, FunctionLike::class);
if (!$functionLike instanceof FunctionLike) {
return \false;
$scope = $expr->getAttribute(AttributeKey::SCOPE);
if (!$scope instanceof Scope) {
// uncertainty when scope not yet filled/overlapped on just refactored
return \true;
}
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($functionLike);
$params = $functionLike->getParams();
foreach ($params as $param) {
if (!$this->nodeComparator->areNodesEqual($param->var, $expr)) {
continue;
}
$paramName = $this->nodeNameResolver->getName($param->var);
if ($paramName === null) {
continue;
}
$paramTag = $phpDocInfo->getParamTagValueByName($paramName);
return $paramTag instanceof ParamTagValueNode && $param->type === null;
}
return \false;
$nativeType = $scope->getNativeType($expr);
return $nativeType instanceof MixedType && !$nativeType->isExplicitMixed();
}
public function isDynamicExpr(Expr $expr) : bool
{

2
vendor/autoload.php vendored

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

10
vendor/composer/autoload_real.php vendored

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit7ec21f5e9f40dfb555d6ad2547745c1b
class ComposerAutoloaderInit533c55dc12dd998311d9070ac4e9bdaa
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit7ec21f5e9f40dfb555d6ad2547745c1b
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit7ec21f5e9f40dfb555d6ad2547745c1b', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit533c55dc12dd998311d9070ac4e9bdaa', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit7ec21f5e9f40dfb555d6ad2547745c1b', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit533c55dc12dd998311d9070ac4e9bdaa', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit7ec21f5e9f40dfb555d6ad2547745c1b::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit533c55dc12dd998311d9070ac4e9bdaa::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit7ec21f5e9f40dfb555d6ad2547745c1b::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit533c55dc12dd998311d9070ac4e9bdaa::$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

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit7ec21f5e9f40dfb555d6ad2547745c1b
class ComposerStaticInit533c55dc12dd998311d9070ac4e9bdaa
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3099,9 +3099,9 @@ class ComposerStaticInit7ec21f5e9f40dfb555d6ad2547745c1b
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit7ec21f5e9f40dfb555d6ad2547745c1b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit7ec21f5e9f40dfb555d6ad2547745c1b::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit7ec21f5e9f40dfb555d6ad2547745c1b::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit533c55dc12dd998311d9070ac4e9bdaa::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit533c55dc12dd998311d9070ac4e9bdaa::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit533c55dc12dd998311d9070ac4e9bdaa::$classMap;
}, null, ClassLoader::class);
}