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

Updated Rector to commit 0adda9c2d86f49949242604d6f45311724175d36

Browse Source 
0adda9c2d8 [TypeDeclaration] Remove parent lookup on TrustedClassMethodPropertyTypeInferer (#4207)
This commit is contained in:
Tomas Votruba 2023-06-12 21:57:31 +00:00
parent c1782af768
commit d3744158b9
8 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictConstructorRector.php
View File

@ -108,7 +108,7 @@ CODE_SAMPLE
if (!$this->propertyTypeOverrideGuard->isLegal($property)) {
continue;
}
$propertyType = $this->trustedClassMethodPropertyTypeInferer->inferProperty($property, $constructClassMethod);
$propertyType = $this->trustedClassMethodPropertyTypeInferer->inferProperty($node, $property, $constructClassMethod);
if ($this->shouldSkipPropertyType($propertyType)) {
continue;
}

2
rules/TypeDeclaration/Rector/Property/TypedPropertyFromStrictSetUpRector.php
View File

@ -84,7 +84,7 @@ CODE_SAMPLE
if (!$property->isPrivate()) {
continue;
}
$propertyType = $this->trustedClassMethodPropertyTypeInferer->inferProperty($property, $setUpClassMethod);
$propertyType = $this->trustedClassMethodPropertyTypeInferer->inferProperty($node, $property, $setUpClassMethod);
$propertyTypeNode = $this->staticTypeMapper->mapPHPStanTypeToPhpParserNode($propertyType, TypeKind::PROPERTY);
if (!$propertyTypeNode instanceof Node) {
continue;

29
rules/TypeDeclaration/TypeInferer/PropertyTypeInferer/TrustedClassMethodPropertyTypeInferer.php
View File

@ -10,7 +10,7 @@ use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\NullableType;
use PhpParser\Node\Param;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Property;
use PhpParser\NodeTraverser;
@ -23,7 +23,6 @@ use PHPStan\Type\TypeCombinator;
use PHPStan\Type\UnionType;
use Rector\Core\NodeAnalyzer\ParamAnalyzer;
use Rector\Core\NodeManipulator\ClassMethodPropertyFetchManipulator;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\NodeTypeResolver;
@ -74,11 +73,6 @@ final class TrustedClassMethodPropertyTypeInferer
* @var \Rector\NodeTypeResolver\NodeTypeResolver
*/
private $nodeTypeResolver;
/**
* @readonly
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
*/
private $betterNodeFinder;
/**
* @readonly
* @var \Rector\Core\NodeAnalyzer\ParamAnalyzer
@ -94,7 +88,7 @@ final class TrustedClassMethodPropertyTypeInferer
* @var \Rector\NodeTypeResolver\TypeComparator\TypeComparator
*/
private $typeComparator;
public function __construct(ClassMethodPropertyFetchManipulator $classMethodPropertyFetchManipulator, ReflectionProvider $reflectionProvider, NodeNameResolver $nodeNameResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, TypeFactory $typeFactory, StaticTypeMapper $staticTypeMapper, NodeTypeResolver $nodeTypeResolver, BetterNodeFinder $betterNodeFinder, ParamAnalyzer $paramAnalyzer, AssignToPropertyTypeInferer $assignToPropertyTypeInferer, TypeComparator $typeComparator)
public function __construct(ClassMethodPropertyFetchManipulator $classMethodPropertyFetchManipulator, ReflectionProvider $reflectionProvider, NodeNameResolver $nodeNameResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, TypeFactory $typeFactory, StaticTypeMapper $staticTypeMapper, NodeTypeResolver $nodeTypeResolver, ParamAnalyzer $paramAnalyzer, AssignToPropertyTypeInferer $assignToPropertyTypeInferer, TypeComparator $typeComparator)
{
$this->classMethodPropertyFetchManipulator = $classMethodPropertyFetchManipulator;
$this->reflectionProvider = $reflectionProvider;
@ -103,22 +97,17 @@ final class TrustedClassMethodPropertyTypeInferer
$this->typeFactory = $typeFactory;
$this->staticTypeMapper = $staticTypeMapper;
$this->nodeTypeResolver = $nodeTypeResolver;
$this->betterNodeFinder = $betterNodeFinder;
$this->paramAnalyzer = $paramAnalyzer;
$this->assignToPropertyTypeInferer = $assignToPropertyTypeInferer;
$this->typeComparator = $typeComparator;
}
public function inferProperty(Property $property, ClassMethod $classMethod) : Type
public function inferProperty(Class_ $class, Property $property, ClassMethod $classMethod) : Type
{
$classLike = $this->betterNodeFinder->findParentType($property, ClassLike::class);
if (!$classLike instanceof ClassLike) {
return new MixedType();
}
$propertyName = $this->nodeNameResolver->getName($property);
// 1. direct property = param assign
$param = $this->classMethodPropertyFetchManipulator->findParamAssignToPropertyName($classMethod, $propertyName);
if ($param instanceof Param) {
return $this->resolveTypeFromParam($param, $classMethod, $propertyName, $property, $classLike);
return $this->resolveTypeFromParam($param, $classMethod, $propertyName, $property, $class);
}
// 2. different assign
/** @var Expr[] $assignedExprs */
@ -131,11 +120,11 @@ final class TrustedClassMethodPropertyTypeInferer
return new MixedType();
}
$resolvedType = \count($resolvedTypes) === 1 ? $resolvedTypes[0] : TypeCombinator::union(...$resolvedTypes);
return $this->resolveType($property, $propertyName, $classLike, $resolvedType);
return $this->resolveType($property, $propertyName, $class, $resolvedType);
}
private function resolveType(Property $property, string $propertyName, ClassLike $classLike, Type $resolvedType) : Type
private function resolveType(Property $property, string $propertyName, Class_ $class, Type $resolvedType) : Type
{
$exactType = $this->assignToPropertyTypeInferer->inferPropertyInClassLike($property, $propertyName, $classLike);
$exactType = $this->assignToPropertyTypeInferer->inferPropertyInClassLike($property, $propertyName, $class);
if (!$exactType instanceof UnionType) {
return $resolvedType;
}
@ -236,12 +225,12 @@ final class TrustedClassMethodPropertyTypeInferer
}
return null;
}
private function resolveTypeFromParam(Param $param, ClassMethod $classMethod, string $propertyName, Property $property, ClassLike $classLike) : Type
private function resolveTypeFromParam(Param $param, ClassMethod $classMethod, string $propertyName, Property $property, Class_ $class) : Type
{
if ($param->type === null) {
return new MixedType();
}
$resolvedType = $this->resolveFromParamType($param, $classMethod, $propertyName);
return $this->resolveType($property, $propertyName, $classLike, $resolvedType);
return $this->resolveType($property, $propertyName, $class, $resolvedType);
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '0a36378788fcf58a41deecab7fb9b3228f077264';
public const PACKAGE_VERSION = '0adda9c2d86f49949242604d6f45311724175d36';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-06-13 03:07:07';
public const RELEASE_DATE = '2023-06-13 04:53:34';
/**
* @var int
*/

2
src/Kernel/RectorKernel.php
View File

@ -15,7 +15,7 @@ final class RectorKernel
/**
* @var string
*/
private const CACHE_KEY = 'v116';
private const CACHE_KEY = 'v118';
/**
* @var \Symfony\Component\DependencyInjection\ContainerInterface|null
*/

2
vendor/autoload.php vendored
View File

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

10
vendor/composer/autoload_real.php vendored
View File

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