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

Updated Rector to commit 8b48059c347d98d191478504da236c4c2ba1e667

Browse Source 
8b48059c34 [NodeTypeResolver] Simplify NodeTypeResolver: remove IdentifierTypeResolver dependency (#3733)
This commit is contained in:
Tomas Votruba 2023-05-05 08:16:16 +00:00
parent 4628b8b0cd
commit 1e2a0a6217
6 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/NodeTypeResolver/NodeTypeResolver.php
View File

@ -39,7 +39,6 @@ use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\NodeTypeCorrector\AccessoryNonEmptyStringTypeCorrector;
use Rector\NodeTypeResolver\NodeTypeCorrector\GenericClassStringTypeCorrector;
use Rector\NodeTypeResolver\NodeTypeCorrector\HasOffsetTypeCorrector;
use Rector\NodeTypeResolver\NodeTypeResolver\IdentifierTypeResolver;
use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
use Rector\TypeDeclaration\PHPStan\ObjectTypeSpecifier;
@ -79,11 +78,6 @@ final class NodeTypeResolver
* @var \Rector\NodeTypeResolver\NodeTypeCorrector\AccessoryNonEmptyStringTypeCorrector
*/
private $accessoryNonEmptyStringTypeCorrector;
/**
* @readonly
* @var \Rector\NodeTypeResolver\NodeTypeResolver\IdentifierTypeResolver
*/
private $identifierTypeResolver;
/**
* @readonly
* @var \Rector\Core\Configuration\RenamedClassesDataCollector
@ -92,7 +86,7 @@ final class NodeTypeResolver
/**
* @param NodeTypeResolverInterface[] $nodeTypeResolvers
*/
public function __construct(ObjectTypeSpecifier $objectTypeSpecifier, ClassAnalyzer $classAnalyzer, GenericClassStringTypeCorrector $genericClassStringTypeCorrector, ReflectionProvider $reflectionProvider, HasOffsetTypeCorrector $hasOffsetTypeCorrector, AccessoryNonEmptyStringTypeCorrector $accessoryNonEmptyStringTypeCorrector, IdentifierTypeResolver $identifierTypeResolver, RenamedClassesDataCollector $renamedClassesDataCollector, array $nodeTypeResolvers)
public function __construct(ObjectTypeSpecifier $objectTypeSpecifier, ClassAnalyzer $classAnalyzer, GenericClassStringTypeCorrector $genericClassStringTypeCorrector, ReflectionProvider $reflectionProvider, HasOffsetTypeCorrector $hasOffsetTypeCorrector, AccessoryNonEmptyStringTypeCorrector $accessoryNonEmptyStringTypeCorrector, RenamedClassesDataCollector $renamedClassesDataCollector, array $nodeTypeResolvers)
{
$this->objectTypeSpecifier = $objectTypeSpecifier;
$this->classAnalyzer = $classAnalyzer;
@ -100,7 +94,6 @@ final class NodeTypeResolver
$this->reflectionProvider = $reflectionProvider;
$this->hasOffsetTypeCorrector = $hasOffsetTypeCorrector;
$this->accessoryNonEmptyStringTypeCorrector = $accessoryNonEmptyStringTypeCorrector;
$this->identifierTypeResolver = $identifierTypeResolver;
$this->renamedClassesDataCollector = $renamedClassesDataCollector;
foreach ($nodeTypeResolvers as $nodeTypeResolver) {
foreach ($nodeTypeResolver->getNodeClasses() as $nodeClass) {
@ -188,16 +181,9 @@ final class NodeTypeResolver
return new NullType();
}
}
if ($node instanceof Identifier) {
return $this->identifierTypeResolver->resolve($node);
}
return new MixedType();
}
if (!$node instanceof Expr) {
// scalar type, e.g. from param type name
if ($node instanceof Identifier) {
return $this->identifierTypeResolver->resolve($node);
}
return new MixedType();
}
// skip anonymous classes, ref https://github.com/rectorphp/rector/issues/1574

28
packages/NodeTypeResolver/NodeTypeResolver/IdentifierTypeResolver.php
View File

@ -3,29 +3,43 @@
declare (strict_types=1);
namespace Rector\NodeTypeResolver\NodeTypeResolver;
use PhpParser\Node;
use PhpParser\Node\Identifier;
use PHPStan\Type\BooleanType;
use PHPStan\Type\FloatType;
use PHPStan\Type\IntegerType;
use PHPStan\Type\MixedType;
use PHPStan\Type\StringType;
final class IdentifierTypeResolver
use PHPStan\Type\Type;
use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
/**
* @implements NodeTypeResolverInterface<Identifier>
*/
final class IdentifierTypeResolver implements NodeTypeResolverInterface
{
/**
* @return \PHPStan\Type\StringType|\PHPStan\Type\BooleanType|\PHPStan\Type\IntegerType|\PHPStan\Type\FloatType|\PHPStan\Type\MixedType
* @return array<class-string<Node>>
*/
public function resolve(Identifier $identifier)
public function getNodeClasses() : array
{
if ($identifier->toLowerString() === 'string') {
return [Identifier::class];
}
/**
* @param Identifier $node
* @return StringType|BooleanType|IntegerType|FloatType|MixedType
*/
public function resolve(Node $node) : Type
{
if ($node->toLowerString() === 'string') {
return new StringType();
}
if ($identifier->toLowerString() === 'bool') {
if ($node->toLowerString() === 'bool') {
return new BooleanType();
}
if ($identifier->toLowerString() === 'int') {
if ($node->toLowerString() === 'int') {
return new IntegerType();
}
if ($identifier->toLowerString() === 'float') {
if ($node->toLowerString() === 'float') {
return new FloatType();
}
return new MixedType();

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '657ec2e5af81361107cafc9c842b1d9cdf4ed760';
public const PACKAGE_VERSION = '8b48059c347d98d191478504da236c4c2ba1e667';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-05-04 19:10:46';
public const RELEASE_DATE = '2023-05-05 09:12:04';
/**
* @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 ComposerAutoloaderInit364511933f4b935fc8c78793d3b6b961::getLoader();
return ComposerAutoloaderInita3d85d0220e4ded852f7ff0a91ee1f48::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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