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

Updated Rector to commit e740a93886

Browse Source 
e740a93886 [TypeDeclaration] Handle return self and static on ReturnTypeFromReturnNewRector (#603)
This commit is contained in:
Tomas Votruba 2021-08-05 21:39:36 +00:00
parent 2ece2f3537
commit 2011249f26
6 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
packages/NodeTypeResolver/PHPStan/Type/TypeFactory.php
View File

@ -16,13 +16,17 @@ use PHPStan\Type\IntegerType;
use PHPStan\Type\MixedType;
use PHPStan\Type\ObjectType;
use PHPStan\Type\StringType;
use PHPStan\Type\ThisType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeTraverser;
use PHPStan\Type\TypeUtils;
use PHPStan\Type\VerbosityLevel;
use Rector\Core\Php\PhpVersionProvider;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\StaticTypeMapper\TypeFactory\UnionTypeFactory;
use Rector\StaticTypeMapper\ValueObject\Type\AliasedObjectType;
use Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType;
use Rector\StaticTypeMapper\ValueObject\Type\SelfObjectType;
use Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType;
final class TypeFactory
{
@ -30,9 +34,14 @@ final class TypeFactory
* @var \Rector\StaticTypeMapper\TypeFactory\UnionTypeFactory
*/
private $unionTypeFactory;
public function __construct(\Rector\StaticTypeMapper\TypeFactory\UnionTypeFactory $unionTypeFactory)
/**
* @var \Rector\Core\Php\PhpVersionProvider
*/
private $phpVersionProvider;
public function __construct(\Rector\StaticTypeMapper\TypeFactory\UnionTypeFactory $unionTypeFactory, \Rector\Core\Php\PhpVersionProvider $phpVersionProvider)
{
$this->unionTypeFactory = $unionTypeFactory;
$this->phpVersionProvider = $phpVersionProvider;
}
/**
* @param Type[] $types
@ -142,6 +151,17 @@ final class TypeFactory
private function normalizeObjectTypes(\PHPStan\Type\Type $type) : \PHPStan\Type\Type
{
return \PHPStan\Type\TypeTraverser::map($type, function (\PHPStan\Type\Type $traversedType, callable $traverseCallback) : Type {
if ($this->isStatic($traversedType) && $this->phpVersionProvider->isAtLeastPhpVersion(\Rector\Core\ValueObject\PhpVersionFeature::STATIC_RETURN_TYPE)) {
/** @var ObjectType $traversedType */
return new \PHPStan\Type\ThisType($traversedType->getClassName());
}
if ($this->isStatic($traversedType)) {
return new \PHPStan\Type\MixedType();
}
if ($this->isSelf($traversedType)) {
/** @var ObjectType $traversedType */
return new \Rector\StaticTypeMapper\ValueObject\Type\SelfObjectType($traversedType->getClassName());
}
if ($traversedType instanceof \Rector\StaticTypeMapper\ValueObject\Type\ShortenedObjectType) {
return new \Rector\StaticTypeMapper\ValueObject\Type\FullyQualifiedObjectType($traversedType->getFullyQualifiedName());
}
@ -151,4 +171,12 @@ final class TypeFactory
return $traverseCallback($traversedType);
});
}
private function isStatic(\PHPStan\Type\Type $type) : bool
{
return $type instanceof \PHPStan\Type\ObjectType && $type->getClassName() === 'static';
}
private function isSelf(\PHPStan\Type\Type $type) : bool
{
return $type instanceof \PHPStan\Type\ObjectType && $type->getClassName() === 'self';
}
}

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '7c937fa45102ed0ece7194b1d64da787de199a7d';
public const PACKAGE_VERSION = 'e740a9388692804ea204b694459bdf1e1885165e';
/**
* @var string
*/
public const RELEASE_DATE = '2021-08-05 17:03:26';
public const RELEASE_DATE = '2021-08-05 23:29:21';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20210805\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit0dda2fa47ac01c7c5b95771ff65b8748::getLoader();
return ComposerAutoloaderInit7e2943b220da5e813f88b6249aae331c::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit0dda2fa47ac01c7c5b95771ff65b8748
class ComposerAutoloaderInit7e2943b220da5e813f88b6249aae331c
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit0dda2fa47ac01c7c5b95771ff65b8748
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit0dda2fa47ac01c7c5b95771ff65b8748', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit7e2943b220da5e813f88b6249aae331c', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit0dda2fa47ac01c7c5b95771ff65b8748', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit7e2943b220da5e813f88b6249aae331c', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit0dda2fa47ac01c7c5b95771ff65b8748::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit7e2943b220da5e813f88b6249aae331c::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit0dda2fa47ac01c7c5b95771ff65b8748
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit0dda2fa47ac01c7c5b95771ff65b8748::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit7e2943b220da5e813f88b6249aae331c::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire0dda2fa47ac01c7c5b95771ff65b8748($fileIdentifier, $file);
composerRequire7e2943b220da5e813f88b6249aae331c($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire0dda2fa47ac01c7c5b95771ff65b8748($fileIdentifier, $file)
function composerRequire7e2943b220da5e813f88b6249aae331c($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

8
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit0dda2fa47ac01c7c5b95771ff65b8748
class ComposerStaticInit7e2943b220da5e813f88b6249aae331c
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3846,9 +3846,9 @@ class ComposerStaticInit0dda2fa47ac01c7c5b95771ff65b8748
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit0dda2fa47ac01c7c5b95771ff65b8748::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0dda2fa47ac01c7c5b95771ff65b8748::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0dda2fa47ac01c7c5b95771ff65b8748::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit7e2943b220da5e813f88b6249aae331c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit7e2943b220da5e813f88b6249aae331c::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit7e2943b220da5e813f88b6249aae331c::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20210805\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit0dda2fa47ac01c7c5b95771ff65b8748', false) && !interface_exists('ComposerAutoloaderInit0dda2fa47ac01c7c5b95771ff65b8748', false) && !trait_exists('ComposerAutoloaderInit0dda2fa47ac01c7c5b95771ff65b8748', false)) {
spl_autoload_call('RectorPrefix20210805\ComposerAutoloaderInit0dda2fa47ac01c7c5b95771ff65b8748');
if (!class_exists('ComposerAutoloaderInit7e2943b220da5e813f88b6249aae331c', false) && !interface_exists('ComposerAutoloaderInit7e2943b220da5e813f88b6249aae331c', false) && !trait_exists('ComposerAutoloaderInit7e2943b220da5e813f88b6249aae331c', false)) {
spl_autoload_call('RectorPrefix20210805\ComposerAutoloaderInit7e2943b220da5e813f88b6249aae331c');
}
if (!class_exists('AjaxLogin', false) && !interface_exists('AjaxLogin', false) && !trait_exists('AjaxLogin', false)) {
spl_autoload_call('RectorPrefix20210805\AjaxLogin');
@ -3305,9 +3305,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20210805\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire0dda2fa47ac01c7c5b95771ff65b8748')) {
function composerRequire0dda2fa47ac01c7c5b95771ff65b8748() {
return \RectorPrefix20210805\composerRequire0dda2fa47ac01c7c5b95771ff65b8748(...func_get_args());
if (!function_exists('composerRequire7e2943b220da5e813f88b6249aae331c')) {
function composerRequire7e2943b220da5e813f88b6249aae331c() {
return \RectorPrefix20210805\composerRequire7e2943b220da5e813f88b6249aae331c(...func_get_args());
}
}
if (!function_exists('parseArgs')) {