Updated Rector to commit dbdcaa188c

dbdcaa188c [Php81] Skip override __construct from interface on NewInInitializerRector (#1913)
This commit is contained in:
Tomas Votruba 2022-03-07 18:55:56 +00:00
parent 644d49bcf9
commit a033b9c203
6 changed files with 27 additions and 23 deletions

View File

@ -42,6 +42,9 @@ final class ClassChildAnalyzer
{
return $this->resolveParentClassMethods($classReflection, $methodName) !== [];
}
/**
* Look both parent class and interface, yes, all PHP interface methods are abstract
*/
public function hasAbstractParentClassMethod(\PHPStan\Reflection\ClassReflection $classReflection, string $methodName) : bool
{
$parentClassMethods = $this->resolveParentClassMethods($classReflection, $methodName);
@ -76,16 +79,17 @@ final class ClassChildAnalyzer
private function resolveParentClassMethods(\PHPStan\Reflection\ClassReflection $classReflection, string $methodName) : array
{
$parentClassMethods = [];
foreach ($classReflection->getParents() as $parentClassReflections) {
if (!$parentClassReflections->hasMethod($methodName)) {
$parents = \array_merge($classReflection->getParents(), $classReflection->getInterfaces());
foreach ($parents as $parent) {
if (!$parent->hasMethod($methodName)) {
continue;
}
$methodReflection = $parentClassReflections->getNativeMethod($methodName);
$methodReflection = $parent->getNativeMethod($methodName);
if (!$methodReflection instanceof \PHPStan\Reflection\Php\PhpMethodReflection) {
continue;
}
$methodDeclaringMethodClass = $methodReflection->getDeclaringClass();
if ($methodDeclaringMethodClass->getName() === $parentClassReflections->getName()) {
if ($methodDeclaringMethodClass->getName() === $parent->getName()) {
$parentClassMethods[] = $methodReflection;
}
}

View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'c149cb40413fafa8885bfbe1b580c7013be99ac0';
public const PACKAGE_VERSION = 'dbdcaa188c139032272572f327fc13f1daab5f02';
/**
* @var string
*/
public const RELEASE_DATE = '2022-03-07 14:42:05';
public const RELEASE_DATE = '2022-03-07 19:48:25';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20220307\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 ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5::getLoader();
return ComposerAutoloaderInit1be2a0c83a060d046051e673b70b89fc::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5
class ComposerAutoloaderInit1be2a0c83a060d046051e673b70b89fc
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit1be2a0c83a060d046051e673b70b89fc', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit1be2a0c83a060d046051e673b70b89fc', '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\ComposerStaticInit9586ab8440689734b874fefc2e7b79e5::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit1be2a0c83a060d046051e673b70b89fc::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,12 +42,12 @@ class ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit9586ab8440689734b874fefc2e7b79e5::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit1be2a0c83a060d046051e673b70b89fc::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire9586ab8440689734b874fefc2e7b79e5($fileIdentifier, $file);
composerRequire1be2a0c83a060d046051e673b70b89fc($fileIdentifier, $file);
}
return $loader;
@ -59,7 +59,7 @@ class ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5
* @param string $file
* @return void
*/
function composerRequire9586ab8440689734b874fefc2e7b79e5($fileIdentifier, $file)
function composerRequire1be2a0c83a060d046051e673b70b89fc($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

View File

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

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('RectorPrefix20220307\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5', false) && !interface_exists('ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5', false) && !trait_exists('ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5', false)) {
spl_autoload_call('RectorPrefix20220307\ComposerAutoloaderInit9586ab8440689734b874fefc2e7b79e5');
if (!class_exists('ComposerAutoloaderInit1be2a0c83a060d046051e673b70b89fc', false) && !interface_exists('ComposerAutoloaderInit1be2a0c83a060d046051e673b70b89fc', false) && !trait_exists('ComposerAutoloaderInit1be2a0c83a060d046051e673b70b89fc', false)) {
spl_autoload_call('RectorPrefix20220307\ComposerAutoloaderInit1be2a0c83a060d046051e673b70b89fc');
}
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('RectorPrefix20220307\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220307\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire9586ab8440689734b874fefc2e7b79e5')) {
function composerRequire9586ab8440689734b874fefc2e7b79e5() {
return \RectorPrefix20220307\composerRequire9586ab8440689734b874fefc2e7b79e5(...func_get_args());
if (!function_exists('composerRequire1be2a0c83a060d046051e673b70b89fc')) {
function composerRequire1be2a0c83a060d046051e673b70b89fc() {
return \RectorPrefix20220307\composerRequire1be2a0c83a060d046051e673b70b89fc(...func_get_args());
}
}
if (!function_exists('scanPath')) {