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

Updated Rector to commit 505986d21807ab6eb81ffcb3c63997357c3eb854

Browse Source 
505986d218 [Php81] Add Enum_ support when running on PHP 8.1 on AstResolver+ClassLikeAstResolver+RemoveEmptyMethodCallRector (#1373)
This commit is contained in:
Tomas Votruba 2021-12-03 10:14:42 +00:00
parent 9a96f2f5bf
commit 1f00ca7740
8 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rules/DeadCode/Rector/MethodCall/RemoveEmptyMethodCallRector.php
View File

@ -12,6 +12,7 @@ use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Enum_;
use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\If_;
use PhpParser\Node\Stmt\Interface_;
@ -125,7 +126,7 @@ CODE_SAMPLE
return $scope;
}
/**
* @param \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_ $classLike
* @param \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Enum_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_ $classLike
*/
private function shouldSkipClassMethod($classLike, \PhpParser\Node\Expr\MethodCall $methodCall, \PHPStan\Type\TypeWithClassName $typeWithClassName) : bool
{

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'ef0cd8b345c3031b612a9660dee3a5afc0bd7aa2';
public const PACKAGE_VERSION = '505986d21807ab6eb81ffcb3c63997357c3eb854';
/**
* @var string
*/
public const RELEASE_DATE = '2021-12-03 10:51:06';
public const RELEASE_DATE = '2021-12-03 16:58:09';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20211203\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

7
src/PhpParser/AstResolver.php
View File

@ -12,6 +12,7 @@ use PhpParser\Node\Param;
use PhpParser\Node\Stmt;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Enum_;
use PhpParser\Node\Stmt\Function_;
use PhpParser\Node\Stmt\Interface_;
use PhpParser\Node\Stmt\Property;
@ -102,7 +103,7 @@ final class AstResolver
$this->classLikeAstResolver = $classLikeAstResolver;
}
/**
* @return \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_|null
* @return \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Enum_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_|null
*/
public function resolveClassFromName(string $className)
{
@ -113,7 +114,7 @@ final class AstResolver
return $this->resolveClassFromClassReflection($classReflection, $className);
}
/**
* @return \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_|null
* @return \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Enum_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_|null
*/
public function resolveClassFromObjectType(\PHPStan\Type\TypeWithClassName $typeWithClassName)
{
@ -222,7 +223,7 @@ final class AstResolver
return $this->resolveClassMethod($callerStaticType->getClassName(), $methodName);
}
/**
* @return \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_|null
* @return \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Enum_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_|null
*/
public function resolveClassFromClassReflection(\PHPStan\Reflection\ClassReflection $classReflection, string $className)
{

3
src/PhpParser/ClassLikeAstResolver.php
View File

@ -5,6 +5,7 @@ namespace Rector\Core\PhpParser;
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\ClassLike;
use PhpParser\Node\Stmt\Enum_;
use PhpParser\Node\Stmt\Interface_;
use PhpParser\Node\Stmt\Trait_;
use PHPStan\Reflection\ClassReflection;
@ -34,7 +35,7 @@ final class ClassLikeAstResolver
$this->betterNodeFinder = $betterNodeFinder;
}
/**
* @return \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_|null
* @return \PhpParser\Node\Stmt\Class_|\PhpParser\Node\Stmt\Enum_|\PhpParser\Node\Stmt\Interface_|\PhpParser\Node\Stmt\Trait_|null
*/
public function resolveClassFromClassReflection(\PHPStan\Reflection\ClassReflection $classReflection, string $className)
{

2
vendor/autoload.php vendored
View File

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

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit51859d4f6a861fd7b34e071e09eef895
class ComposerAutoloaderInit097c32e45209a43c00de6d8e98b46e3a
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit51859d4f6a861fd7b34e071e09eef895
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit51859d4f6a861fd7b34e071e09eef895', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit097c32e45209a43c00de6d8e98b46e3a', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit51859d4f6a861fd7b34e071e09eef895', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit097c32e45209a43c00de6d8e98b46e3a', '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\ComposerStaticInit51859d4f6a861fd7b34e071e09eef895::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit097c32e45209a43c00de6d8e98b46e3a::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,19 +42,19 @@ class ComposerAutoloaderInit51859d4f6a861fd7b34e071e09eef895
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit51859d4f6a861fd7b34e071e09eef895::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit097c32e45209a43c00de6d8e98b46e3a::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire51859d4f6a861fd7b34e071e09eef895($fileIdentifier, $file);
composerRequire097c32e45209a43c00de6d8e98b46e3a($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire51859d4f6a861fd7b34e071e09eef895($fileIdentifier, $file)
function composerRequire097c32e45209a43c00de6d8e98b46e3a($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 ComposerStaticInit51859d4f6a861fd7b34e071e09eef895
class ComposerStaticInit097c32e45209a43c00de6d8e98b46e3a
{
public static $files = array (
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
@ -3795,9 +3795,9 @@ class ComposerStaticInit51859d4f6a861fd7b34e071e09eef895
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit51859d4f6a861fd7b34e071e09eef895::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit51859d4f6a861fd7b34e071e09eef895::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit51859d4f6a861fd7b34e071e09eef895::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit097c32e45209a43c00de6d8e98b46e3a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit097c32e45209a43c00de6d8e98b46e3a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit097c32e45209a43c00de6d8e98b46e3a::$classMap;
}, null, ClassLoader::class);
}

10
vendor/scoper-autoload.php vendored
View File

@ -12,8 +12,8 @@ if (!class_exists('GenerateChangelogCommand', false) && !interface_exists('Gener
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20211203\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit51859d4f6a861fd7b34e071e09eef895', false) && !interface_exists('ComposerAutoloaderInit51859d4f6a861fd7b34e071e09eef895', false) && !trait_exists('ComposerAutoloaderInit51859d4f6a861fd7b34e071e09eef895', false)) {
spl_autoload_call('RectorPrefix20211203\ComposerAutoloaderInit51859d4f6a861fd7b34e071e09eef895');
if (!class_exists('ComposerAutoloaderInit097c32e45209a43c00de6d8e98b46e3a', false) && !interface_exists('ComposerAutoloaderInit097c32e45209a43c00de6d8e98b46e3a', false) && !trait_exists('ComposerAutoloaderInit097c32e45209a43c00de6d8e98b46e3a', false)) {
spl_autoload_call('RectorPrefix20211203\ComposerAutoloaderInit097c32e45209a43c00de6d8e98b46e3a');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20211203\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -81,9 +81,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20211203\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire51859d4f6a861fd7b34e071e09eef895')) {
function composerRequire51859d4f6a861fd7b34e071e09eef895() {
return \RectorPrefix20211203\composerRequire51859d4f6a861fd7b34e071e09eef895(...func_get_args());
if (!function_exists('composerRequire097c32e45209a43c00de6d8e98b46e3a')) {
function composerRequire097c32e45209a43c00de6d8e98b46e3a() {
return \RectorPrefix20211203\composerRequire097c32e45209a43c00de6d8e98b46e3a(...func_get_args());
}
}
if (!function_exists('scanPath')) {