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

Updated Rector to commit f4bc6c38446ac98e625a9c11c070e9829b4c6118

Browse Source 
f4bc6c3844 [TypeDeclaration] Make anonymous class return specific type, if implements (#2738)
This commit is contained in:
Tomas Votruba 2022-08-06 15:04:36 +00:00
parent 0fb8d7623f
commit fda0b6ec7b
8 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packages/NodeTypeResolver/NodeTypeResolver/NewTypeResolver.php
View File

@ -12,12 +12,12 @@ use PHPStan\Type\MixedType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\ObjectWithoutClassType;
use PHPStan\Type\Type;
use PHPStan\Type\UnionType;
use Rector\Core\Enum\ObjectReference;
use Rector\Core\NodeAnalyzer\ClassAnalyzer;
use Rector\NodeNameResolver\NodeNameResolver;
use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\NodeTypeResolver\PHPStan\ObjectWithoutClassTypeWithParentTypes;
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
/**
* @implements NodeTypeResolverInterface<New_>
@ -73,23 +73,19 @@ final class NewTypeResolver implements NodeTypeResolverInterface
if (!$new->class instanceof Class_) {
return new ObjectWithoutClassType();
}
$types = [];
$directParentTypes = [];
/** @var Class_ $class */
$class = $new->class;
if ($class->extends !== null) {
$parentClass = (string) $class->extends;
$types[] = new FullyQualifiedObjectType($parentClass);
$directParentTypes[] = new FullyQualifiedObjectType($parentClass);
}
foreach ($class->implements as $implement) {
$parentClass = (string) $implement;
$types[] = new FullyQualifiedObjectType($parentClass);
$directParentTypes[] = new FullyQualifiedObjectType($parentClass);
}
if (\count($types) > 1) {
$unionType = new UnionType($types);
return new ObjectWithoutClassType($unionType);
}
if (\count($types) === 1) {
return new ObjectWithoutClassType($types[0]);
if ($directParentTypes !== []) {
return new ObjectWithoutClassTypeWithParentTypes($directParentTypes);
}
return new ObjectWithoutClassType();
}

31
packages/NodeTypeResolver/PHPStan/ObjectWithoutClassTypeWithParentTypes.php Normal file
View File

@ -0,0 +1,31 @@
<?php
declare (strict_types=1);
namespace Rector\NodeTypeResolver\PHPStan;
use PHPStan\Type\ObjectWithoutClassType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeWithClassName;
final class ObjectWithoutClassTypeWithParentTypes extends ObjectWithoutClassType
{
/**
* @var TypeWithClassName[]
* @readonly
*/
private $parentTypes;
/**
* @param TypeWithClassName[] $parentTypes
*/
public function __construct(array $parentTypes, ?Type $subtractedType = null)
{
$this->parentTypes = $parentTypes;
parent::__construct($subtractedType);
}
/**
* @return TypeWithClassName[]
*/
public function getParentTypes() : array
{
return $this->parentTypes;
}
}

10
packages/PHPStanStaticTypeMapper/TypeMapper/ObjectWithoutClassTypeMapper.php
View File

@ -5,6 +5,7 @@ namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
use PhpParser\Node;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use PHPStan\Type\Generic\TemplateObjectWithoutClassType;
@ -13,6 +14,7 @@ use PHPStan\Type\Type;
use Rector\BetterPhpDocParser\ValueObject\Type\EmptyGenericTypeNode;
use Rector\Core\Php\PhpVersionProvider;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\NodeTypeResolver\PHPStan\ObjectWithoutClassTypeWithParentTypes;
use Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface;
use Rector\StaticTypeMapper\ValueObject\Type\ParentObjectWithoutClassType;
/**
@ -55,6 +57,14 @@ final class ObjectWithoutClassTypeMapper implements TypeMapperInterface
*/
public function mapToPhpParserNode(Type $type, string $typeKind) : ?Node
{
// special case for anonymous classes that implement another type
if ($type instanceof ObjectWithoutClassTypeWithParentTypes) {
$parentTypes = $type->getParentTypes();
if (\count($parentTypes) === 1) {
$parentType = $parentTypes[0];
return new FullyQualified($parentType->getClassName());
}
}
if (!$this->phpVersionProvider->isAtLeastPhpVersion(PhpVersionFeature::OBJECT_TYPE)) {
return null;
}

4
src/Application/VersionResolver.php
View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'ea3a69918c8d314b5ef889e51c76612d849ccd2c';
public const PACKAGE_VERSION = 'f4bc6c38446ac98e625a9c11c070e9829b4c6118';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-08-06 11:51:16';
public const RELEASE_DATE = '2022-08-06 14:58:33';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -2250,6 +2250,7 @@ return array(
'Rector\\NodeTypeResolver\\NodeTypeResolver\\VariableTypeResolver' => $baseDir . '/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\FunctionLikeParamArgPositionNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/NodeVisitor/FunctionLikeParamArgPositionNodeVisitor.php',
'Rector\\NodeTypeResolver\\Node\\AttributeKey' => $baseDir . '/packages/NodeTypeResolver/Node/AttributeKey.php',
'Rector\\NodeTypeResolver\\PHPStan\\ObjectWithoutClassTypeWithParentTypes' => $baseDir . '/packages/NodeTypeResolver/PHPStan/ObjectWithoutClassTypeWithParentTypes.php',
'Rector\\NodeTypeResolver\\PHPStan\\ParametersAcceptorSelectorVariantsWrapper' => $baseDir . '/packages/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php',
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\RemoveDeepChainMethodCallNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/RemoveDeepChainMethodCallNodeVisitor.php',
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\PHPStanNodeScopeResolver' => $baseDir . '/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit59f3843ab5de7f7ebfa867af59ee01ed
class ComposerAutoloaderInitd90b4ec59f62e67b44c43ee6790bda2a
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit59f3843ab5de7f7ebfa867af59ee01ed
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit59f3843ab5de7f7ebfa867af59ee01ed', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitd90b4ec59f62e67b44c43ee6790bda2a', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit59f3843ab5de7f7ebfa867af59ee01ed', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitd90b4ec59f62e67b44c43ee6790bda2a', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit59f3843ab5de7f7ebfa867af59ee01ed::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitd90b4ec59f62e67b44c43ee6790bda2a::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit59f3843ab5de7f7ebfa867af59ee01ed::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitd90b4ec59f62e67b44c43ee6790bda2a::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire59f3843ab5de7f7ebfa867af59ee01ed($fileIdentifier, $file);
composerRequired90b4ec59f62e67b44c43ee6790bda2a($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit59f3843ab5de7f7ebfa867af59ee01ed
* @param string $file
* @return void
*/
function composerRequire59f3843ab5de7f7ebfa867af59ee01ed($fileIdentifier, $file)
function composerRequired90b4ec59f62e67b44c43ee6790bda2a($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit59f3843ab5de7f7ebfa867af59ee01ed
class ComposerStaticInitd90b4ec59f62e67b44c43ee6790bda2a
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -2557,6 +2557,7 @@ class ComposerStaticInit59f3843ab5de7f7ebfa867af59ee01ed
'Rector\\NodeTypeResolver\\NodeTypeResolver\\VariableTypeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeResolver/VariableTypeResolver.php',
'Rector\\NodeTypeResolver\\NodeVisitor\\FunctionLikeParamArgPositionNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeVisitor/FunctionLikeParamArgPositionNodeVisitor.php',
'Rector\\NodeTypeResolver\\Node\\AttributeKey' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/Node/AttributeKey.php',
'Rector\\NodeTypeResolver\\PHPStan\\ObjectWithoutClassTypeWithParentTypes' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/ObjectWithoutClassTypeWithParentTypes.php',
'Rector\\NodeTypeResolver\\PHPStan\\ParametersAcceptorSelectorVariantsWrapper' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php',
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\RemoveDeepChainMethodCallNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/RemoveDeepChainMethodCallNodeVisitor.php',
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\PHPStanNodeScopeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php',
@ -3408,9 +3409,9 @@ class ComposerStaticInit59f3843ab5de7f7ebfa867af59ee01ed
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit59f3843ab5de7f7ebfa867af59ee01ed::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit59f3843ab5de7f7ebfa867af59ee01ed::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit59f3843ab5de7f7ebfa867af59ee01ed::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitd90b4ec59f62e67b44c43ee6790bda2a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitd90b4ec59f62e67b44c43ee6790bda2a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitd90b4ec59f62e67b44c43ee6790bda2a::$classMap;
}, null, ClassLoader::class);
}