mirror_php/rector
1
0
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2025-03-22 00:09:54 +01:00
Code Issues Projects Releases Wiki Activity

Updated Rector to commit a459f5ac61ecfd01d680ef5ffb825471ad3cb11b

Browse Source 
a459f5ac61 [StaticTypeMapper] Remove #[Required] on UnionTypeMapper (#4695)
This commit is contained in:
Tomas Votruba 2023-08-07 04:54:00 +00:00
parent 820a69e070
commit 16793c8988
5 changed files with 41 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
packages/StaticTypeMapper/PhpDocParser/UnionTypeMapper.php
View File

@ -5,13 +5,14 @@ namespace Rector\StaticTypeMapper\PhpDocParser;
use PhpParser\Node;
use PHPStan\Analyser\NameScope;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
use PHPStan\Type\Type;
use Rector\NodeTypeResolver\PHPStan\Type\TypeFactory;
use Rector\StaticTypeMapper\Contract\PhpDocParser\PhpDocTypeMapperInterface;
use Rector\StaticTypeMapper\PhpDoc\PhpDocTypeMapper;
use RectorPrefix202308\Symfony\Contracts\Service\Attribute\Required;
use PHPStan\PhpDoc\TypeNodeResolver;
use PHPStan\PhpDocParser\Ast\Type\IntersectionTypeNode;
/**
* @implements PhpDocTypeMapperInterface<UnionTypeNode>
*/
@ -23,24 +24,31 @@ final class UnionTypeMapper implements PhpDocTypeMapperInterface
*/
private $typeFactory;
/**
* @var \Rector\StaticTypeMapper\PhpDoc\PhpDocTypeMapper
* @readonly
* @var \Rector\StaticTypeMapper\PhpDocParser\IdentifierTypeMapper
*/
private $phpDocTypeMapper;
public function __construct(TypeFactory $typeFactory)
private $identifierTypeMapper;
/**
* @readonly
* @var \Rector\StaticTypeMapper\PhpDocParser\IntersectionTypeMapper
*/
private $intersectionTypeMapper;
/**
* @readonly
* @var \PHPStan\PhpDoc\TypeNodeResolver
*/
private $typeNodeResolver;
public function __construct(TypeFactory $typeFactory, \Rector\StaticTypeMapper\PhpDocParser\IdentifierTypeMapper $identifierTypeMapper, \Rector\StaticTypeMapper\PhpDocParser\IntersectionTypeMapper $intersectionTypeMapper, TypeNodeResolver $typeNodeResolver)
{
$this->typeFactory = $typeFactory;
$this->identifierTypeMapper = $identifierTypeMapper;
$this->intersectionTypeMapper = $intersectionTypeMapper;
$this->typeNodeResolver = $typeNodeResolver;
}
public function getNodeType() : string
{
return UnionTypeNode::class;
}
/**
* @required
*/
public function autowire(PhpDocTypeMapper $phpDocTypeMapper) : void
{
$this->phpDocTypeMapper = $phpDocTypeMapper;
}
/**
* @param UnionTypeNode $typeNode
*/
@ -48,7 +56,15 @@ final class UnionTypeMapper implements PhpDocTypeMapperInterface
{
$unionedTypes = [];
foreach ($typeNode->types as $unionedTypeNode) {
$unionedTypes[] = $this->phpDocTypeMapper->mapToPHPStanType($unionedTypeNode, $node, $nameScope);
if ($unionedTypeNode instanceof IdentifierTypeNode) {
$unionedTypes[] = $this->identifierTypeMapper->mapToPHPStanType($unionedTypeNode, $node, $nameScope);
continue;
}
if ($unionedTypeNode instanceof IntersectionTypeNode) {
$unionedTypes[] = $this->intersectionTypeMapper->mapToPHPStanType($unionedTypeNode, $node, $nameScope);
continue;
}
$unionedTypes[] = $this->typeNodeResolver->resolve($unionedTypeNode, $nameScope);
}
// to prevent missing class error, e.g. in tests
return $this->typeFactory->createMixedPassedOrUnionTypeAndKeepConstant($unionedTypes);

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'a95f628548976913ef6dd480c8f07897ec4140c4';
public const PACKAGE_VERSION = 'a459f5ac61ecfd01d680ef5ffb825471ad3cb11b';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-08-07 11:26:25';
public const RELEASE_DATE = '2023-08-07 11:50:07';
/**
* @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 ComposerAutoloaderInit0969bc93ad809140cc9963cbbc3d8fc5::getLoader();
return ComposerAutoloaderInitb53137707652d6dda531d4f6cd59324f::getLoader();

10
vendor/composer/autoload_real.php vendored
View File

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