mirror of
https://github.com/rectorphp/rector.git
synced 2025-04-20 15:31:58 +02:00
Updated Rector to commit cf1d254200cd2d456b701e201c625c8245e123d7
cf1d254200 Make use of toPhpDocNode() - take #11 (#4574)This commit is contained in:
Tomas Votruba
parent
2d8f90877a
commit
e785af2045
@ -1,59 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\PHPStanStaticTypeMapper\TypeMapper;
|
||||
|
||||
use PHPStan\PhpDocParser\Ast\Type\ArrayShapeItemNode;
|
||||
use PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode;
|
||||
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
|
||||
use PHPStan\Reflection\ReflectionProvider;
|
||||
use PHPStan\Type\ArrayType;
|
||||
use PHPStan\Type\Constant\ConstantArrayType;
|
||||
use PHPStan\Type\Constant\ConstantStringType;
|
||||
use PHPStan\Type\MixedType;
|
||||
use PHPStan\Type\NeverType;
|
||||
use Rector\PHPStanStaticTypeMapper\PHPStanStaticTypeMapper;
|
||||
final class ArrayShapeTypeMapper
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\PHPStanStaticTypeMapper\PHPStanStaticTypeMapper
|
||||
*/
|
||||
private $phpStanStaticTypeMapper;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \PHPStan\Reflection\ReflectionProvider
|
||||
*/
|
||||
private $reflectionProvider;
|
||||
public function __construct(PHPStanStaticTypeMapper $phpStanStaticTypeMapper, ReflectionProvider $reflectionProvider)
|
||||
{
|
||||
$this->phpStanStaticTypeMapper = $phpStanStaticTypeMapper;
|
||||
$this->reflectionProvider = $reflectionProvider;
|
||||
}
|
||||
/**
|
||||
* @return \PHPStan\PhpDocParser\Ast\Type\ArrayShapeNode|\PHPStan\Type\ArrayType|null
|
||||
*/
|
||||
public function mapConstantArrayType(ConstantArrayType $constantArrayType)
|
||||
{
|
||||
// empty array
|
||||
if ($constantArrayType->getKeyType() instanceof NeverType) {
|
||||
return new ArrayType(new MixedType(), new MixedType());
|
||||
}
|
||||
$arrayShapeItemNodes = [];
|
||||
foreach ($constantArrayType->getKeyTypes() as $index => $keyType) {
|
||||
// not real array shape
|
||||
if (!$keyType instanceof ConstantStringType) {
|
||||
return null;
|
||||
}
|
||||
$keyValue = $keyType->getValue();
|
||||
if ($this->reflectionProvider->hasClass($keyValue)) {
|
||||
return null;
|
||||
}
|
||||
$keyDocTypeNode = new IdentifierTypeNode($keyValue);
|
||||
$valueType = $constantArrayType->getValueTypes()[$index];
|
||||
$valueDocTypeNode = $this->phpStanStaticTypeMapper->mapToPHPStanPhpDocTypeNode($valueType);
|
||||
$arrayShapeItemNodes[] = new ArrayShapeItemNode($keyDocTypeNode, $constantArrayType->isOptionalKey($index), $valueDocTypeNode);
|
||||
}
|
||||
return new ArrayShapeNode($arrayShapeItemNodes);
|
||||
}
|
||||
}
|
||||
@ -58,22 +58,17 @@ final class ArrayTypeMapper implements TypeMapperInterface
|
||||
* @var \Rector\TypeDeclaration\NodeTypeAnalyzer\DetailedTypeAnalyzer
|
||||
*/
|
||||
private $detailedTypeAnalyzer;
|
||||
/**
|
||||
* @var \Rector\PHPStanStaticTypeMapper\TypeMapper\ArrayShapeTypeMapper
|
||||
*/
|
||||
private $arrayShapeTypeMapper;
|
||||
// To avoid circular dependency
|
||||
/**
|
||||
* @required
|
||||
*/
|
||||
public function autowire(PHPStanStaticTypeMapper $phpStanStaticTypeMapper, UnionTypeCommonTypeNarrower $unionTypeCommonTypeNarrower, ReflectionProvider $reflectionProvider, GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer, DetailedTypeAnalyzer $detailedTypeAnalyzer, \Rector\PHPStanStaticTypeMapper\TypeMapper\ArrayShapeTypeMapper $arrayShapeTypeMapper) : void
|
||||
public function autowire(PHPStanStaticTypeMapper $phpStanStaticTypeMapper, UnionTypeCommonTypeNarrower $unionTypeCommonTypeNarrower, ReflectionProvider $reflectionProvider, GenericClassStringTypeNormalizer $genericClassStringTypeNormalizer, DetailedTypeAnalyzer $detailedTypeAnalyzer) : void
|
||||
{
|
||||
$this->phpStanStaticTypeMapper = $phpStanStaticTypeMapper;
|
||||
$this->unionTypeCommonTypeNarrower = $unionTypeCommonTypeNarrower;
|
||||
$this->reflectionProvider = $reflectionProvider;
|
||||
$this->genericClassStringTypeNormalizer = $genericClassStringTypeNormalizer;
|
||||
$this->detailedTypeAnalyzer = $detailedTypeAnalyzer;
|
||||
$this->arrayShapeTypeMapper = $arrayShapeTypeMapper;
|
||||
}
|
||||
/**
|
||||
* @return class-string<Type>
|
||||
@ -94,10 +89,7 @@ final class ArrayTypeMapper implements TypeMapperInterface
|
||||
return $this->createArrayTypeNodeFromUnionType($itemType);
|
||||
}
|
||||
if ($type instanceof ConstantArrayType) {
|
||||
$arrayShapeNode = $this->arrayShapeTypeMapper->mapConstantArrayType($type);
|
||||
if ($arrayShapeNode instanceof TypeNode) {
|
||||
return $arrayShapeNode;
|
||||
}
|
||||
return $type->toPhpDocNode();
|
||||
}
|
||||
if ($itemType instanceof ArrayType && $this->isGenericArrayCandidate($itemType)) {
|
||||
return $this->createGenericArrayType($type, \true);
|
||||
|
||||
@ -157,7 +157,8 @@ CODE_SAMPLE
|
||||
if ($arrayType instanceof ConstantArrayType && \count($arrayType->getValueTypes()) !== 1) {
|
||||
return;
|
||||
}
|
||||
$this->phpDocTypeChanger->changeReturnType($node, $phpDocInfo, $arrayType);
|
||||
$narrowArrayType = new ArrayType(new MixedType(), $arrayType->getItemType());
|
||||
$this->phpDocTypeChanger->changeReturnType($node, $phpDocInfo, $narrowArrayType);
|
||||
}
|
||||
/**
|
||||
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_|\PhpParser\Node\Expr\Closure $functionLike
|
||||
|
||||
@ -19,12 +19,12 @@ final class VersionResolver
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = '4a5616878c580138a26e1eedf63c15fa8e0dcda8';
|
||||
public const PACKAGE_VERSION = 'cf1d254200cd2d456b701e201c625c8245e123d7';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2023-07-21 22:04:23';
|
||||
public const RELEASE_DATE = '2023-07-21 21:22:04';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
||||
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
||||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit0bd702157337d6816a8a4f640272d70d::getLoader();
|
||||
return ComposerAutoloaderInitb63a1b8738a0a6a381527028c21db5be::getLoader();
|
||||
|
||||
1
vendor/composer/autoload_classmap.php
vendored
1
vendor/composer/autoload_classmap.php
vendored
@ -2023,7 +2023,6 @@ return array(
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\AccessoryNonEmptyStringTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNonEmptyStringTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\AccessoryNonFalsyStringTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNonFalsyStringTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\AccessoryNumericStringTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNumericStringTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ArrayShapeTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/ArrayShapeTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ArrayTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\BooleanTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\CallableTypeMapper' => $baseDir . '/packages/PHPStanStaticTypeMapper/TypeMapper/CallableTypeMapper.php',
|
||||
|
||||
10
vendor/composer/autoload_real.php
vendored
10
vendor/composer/autoload_real.php
vendored
@ -2,7 +2,7 @@
|
||||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit0bd702157337d6816a8a4f640272d70d
|
||||
class ComposerAutoloaderInitb63a1b8738a0a6a381527028c21db5be
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
@ -22,17 +22,17 @@ class ComposerAutoloaderInit0bd702157337d6816a8a4f640272d70d
|
||||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit0bd702157337d6816a8a4f640272d70d', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInitb63a1b8738a0a6a381527028c21db5be', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit0bd702157337d6816a8a4f640272d70d', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInitb63a1b8738a0a6a381527028c21db5be', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit0bd702157337d6816a8a4f640272d70d::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInitb63a1b8738a0a6a381527028c21db5be::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit0bd702157337d6816a8a4f640272d70d::$files;
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInitb63a1b8738a0a6a381527028c21db5be::$files;
|
||||
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
||||
|
||||
9
vendor/composer/autoload_static.php
vendored
9
vendor/composer/autoload_static.php
vendored
@ -4,7 +4,7 @@
|
||||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit0bd702157337d6816a8a4f640272d70d
|
||||
class ComposerStaticInitb63a1b8738a0a6a381527028c21db5be
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
@ -2277,7 +2277,6 @@ class ComposerStaticInit0bd702157337d6816a8a4f640272d70d
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\AccessoryNonEmptyStringTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNonEmptyStringTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\AccessoryNonFalsyStringTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNonFalsyStringTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\AccessoryNumericStringTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/AccessoryNumericStringTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ArrayShapeTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/ArrayShapeTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\ArrayTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/ArrayTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\BooleanTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/BooleanTypeMapper.php',
|
||||
'Rector\\PHPStanStaticTypeMapper\\TypeMapper\\CallableTypeMapper' => __DIR__ . '/../..' . '/packages/PHPStanStaticTypeMapper/TypeMapper/CallableTypeMapper.php',
|
||||
@ -3021,9 +3020,9 @@ class ComposerStaticInit0bd702157337d6816a8a4f640272d70d
|
||||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit0bd702157337d6816a8a4f640272d70d::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit0bd702157337d6816a8a4f640272d70d::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit0bd702157337d6816a8a4f640272d70d::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInitb63a1b8738a0a6a381527028c21db5be::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInitb63a1b8738a0a6a381527028c21db5be::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInitb63a1b8738a0a6a381527028c21db5be::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user