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

Updated Rector to commit 651616a14b47aadfd467da1dded6c420f1ef3f01

Browse Source 
651616a14b [NodeTypeResolver] Reduce parent lookup on ParamTypeResolver (#4435)
This commit is contained in:
Tomas Votruba 2023-07-08 14:38:41 +00:00
parent 811311089b
commit 47fc2f5153
5 changed files with 15 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
packages/NodeTypeResolver/NodeTypeResolver/ParamTypeResolver.php
View File

@ -4,24 +4,17 @@ declare (strict_types=1);
namespace Rector\NodeTypeResolver\NodeTypeResolver;
use PhpParser\Node;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\FunctionLike;
use PhpParser\Node\Identifier;
use PhpParser\Node\Param;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\NodeTraverser;
use PHPStan\Type\MixedType;
use PHPStan\Type\Type;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\NodeTypeResolver;
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
use Rector\StaticTypeMapper\StaticTypeMapper;
use RectorPrefix202307\Symfony\Contracts\Service\Attribute\Required;
/**
* @see \Rector\Tests\NodeTypeResolver\PerNodeTypeResolver\ParamTypeResolver\ParamTypeResolverTest
@ -30,11 +23,6 @@ use RectorPrefix202307\Symfony\Contracts\Service\Attribute\Required;
*/
final class ParamTypeResolver implements NodeTypeResolverInterface
{
/**
* @readonly
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
*/
private $simpleCallableNodeTraverser;
/**
* @readonly
* @var \Rector\NodeNameResolver\NodeNameResolver
@ -45,33 +33,21 @@ final class ParamTypeResolver implements NodeTypeResolverInterface
* @var \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory
*/
private $phpDocInfoFactory;
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
/**
* @var \Rector\NodeTypeResolver\NodeTypeResolver
*/
private $nodeTypeResolver;
/**
* @var \Rector\StaticTypeMapper\StaticTypeMapper
*/
private $staticTypeMapper;
public function __construct(SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeNameResolver $nodeNameResolver, PhpDocInfoFactory $phpDocInfoFactory, BetterNodeFinder $betterNodeFinder)
public function __construct(NodeNameResolver $nodeNameResolver, PhpDocInfoFactory $phpDocInfoFactory)
{
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
$this->nodeNameResolver = $nodeNameResolver;
$this->phpDocInfoFactory = $phpDocInfoFactory;
$this->betterNodeFinder = $betterNodeFinder;
}
/**
* @required
*/
public function autowire(NodeTypeResolver $nodeTypeResolver, StaticTypeMapper $staticTypeMapper) : void
public function autowire(NodeTypeResolver $nodeTypeResolver) : void
{
$this->nodeTypeResolver = $nodeTypeResolver;
$this->staticTypeMapper = $staticTypeMapper;
}
/**
* @return array<class-string<Node>>
@ -89,10 +65,6 @@ final class ParamTypeResolver implements NodeTypeResolverInterface
if (!$paramType instanceof MixedType) {
return $paramType;
}
$firstVariableUseType = $this->resolveFromFirstVariableUse($node);
if (!$firstVariableUseType instanceof MixedType) {
return $firstVariableUseType;
}
return $this->resolveFromFunctionDocBlock($node);
}
private function resolveFromParamType(Param $param) : Type
@ -100,31 +72,7 @@ final class ParamTypeResolver implements NodeTypeResolverInterface
if ($param->type === null) {
return new MixedType();
}
if ($param->type instanceof Identifier) {
return new MixedType();
}
return $this->staticTypeMapper->mapPhpParserNodePHPStanType($param->type);
}
private function resolveFromFirstVariableUse(Param $param) : Type
{
$classMethod = $this->betterNodeFinder->findParentType($param, ClassMethod::class);
if (!$classMethod instanceof ClassMethod) {
return new MixedType();
}
$paramName = $this->nodeNameResolver->getName($param);
$paramStaticType = new MixedType();
// special case for param inside method/function
$this->simpleCallableNodeTraverser->traverseNodesWithCallable((array) $classMethod->stmts, function (Node $node) use($paramName, &$paramStaticType) : ?int {
if (!$node instanceof Variable) {
return null;
}
if (!$this->nodeNameResolver->isName($node, $paramName)) {
return null;
}
$paramStaticType = $this->nodeTypeResolver->getType($node);
return NodeTraverser::STOP_TRAVERSAL;
});
return $paramStaticType;
return $this->nodeTypeResolver->getType($param->type);
}
private function resolveFromFunctionDocBlock(Param $param) : Type
{

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '6daf93e54524b24be9b2d79edca98d97b6c2ae32';
public const PACKAGE_VERSION = '651616a14b47aadfd467da1dded6c420f1ef3f01';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-07-07 23:08:13';
public const RELEASE_DATE = '2023-07-08 21:34:18';
/**
* @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 ComposerAutoloaderInitd6b1e04b58199092f6cb30dfac43e3ec::getLoader();
return ComposerAutoloaderInit34da40be8ce4894e423bef751c423d56::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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