Updated Rector to commit cf8cbcd4cb

cf8cbcd4cb [Core] Refactor CreatedByRuleDecorator to only set CREATED_BY_RULE on target Node when class is equals (#2573)
This commit is contained in:
Tomas Votruba 2022-06-26 13:53:02 +00:00
parent 2e275ef1ff
commit 0522de2970
8 changed files with 29 additions and 26 deletions

View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '78d110af4c8dc8df0b335cbbc857087cd260b55a';
public const PACKAGE_VERSION = 'cf8cbcd4cb6a55961800f3d664c6098307c0e0df';
/**
* @var string
*/
public const RELEASE_DATE = '2022-06-26 13:43:47';
public const RELEASE_DATE = '2022-06-26 15:48:00';
/**
* @var int
*/

View File

@ -16,7 +16,9 @@ final class CreatedByRuleDecorator
$node = [$node];
}
foreach ($node as $singleNode) {
$this->createByRule($singleNode, $rectorClass);
if (\get_class($singleNode) === \get_class($originalNode)) {
$this->createByRule($singleNode, $rectorClass);
}
}
$this->createByRule($originalNode, $rectorClass);
}

2
vendor/autoload.php vendored
View File

@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInite8e0c158773724458547a61937887466::getLoader();
return ComposerAutoloaderInit2282349bbfc88aa52224525a7ce869fe::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInite8e0c158773724458547a61937887466
class ComposerAutoloaderInit2282349bbfc88aa52224525a7ce869fe
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInite8e0c158773724458547a61937887466
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInite8e0c158773724458547a61937887466', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit2282349bbfc88aa52224525a7ce869fe', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInite8e0c158773724458547a61937887466', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit2282349bbfc88aa52224525a7ce869fe', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInite8e0c158773724458547a61937887466::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit2282349bbfc88aa52224525a7ce869fe::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInite8e0c158773724458547a61937887466::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit2282349bbfc88aa52224525a7ce869fe::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequiree8e0c158773724458547a61937887466($fileIdentifier, $file);
composerRequire2282349bbfc88aa52224525a7ce869fe($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInite8e0c158773724458547a61937887466
* @param string $file
* @return void
*/
function composerRequiree8e0c158773724458547a61937887466($fileIdentifier, $file)
function composerRequire2282349bbfc88aa52224525a7ce869fe($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 ComposerStaticInite8e0c158773724458547a61937887466
class ComposerStaticInit2282349bbfc88aa52224525a7ce869fe
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3407,9 +3407,9 @@ class ComposerStaticInite8e0c158773724458547a61937887466
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInite8e0c158773724458547a61937887466::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInite8e0c158773724458547a61937887466::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInite8e0c158773724458547a61937887466::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit2282349bbfc88aa52224525a7ce869fe::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit2282349bbfc88aa52224525a7ce869fe::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit2282349bbfc88aa52224525a7ce869fe::$classMap;
}, null, ClassLoader::class);
}

View File

@ -755,17 +755,17 @@
},
{
"name": "phpstan\/phpdoc-parser",
"version": "1.6.3",
"version_normalized": "1.6.3.0",
"version": "1.6.4",
"version_normalized": "1.6.4.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/phpstan\/phpdoc-parser.git",
"reference": "4a07085f74cb1f3fc7103efa537d9f00ebb74ec7"
"reference": "135607f9ccc297d6923d49c2bcf309f509413215"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/4a07085f74cb1f3fc7103efa537d9f00ebb74ec7",
"reference": "4a07085f74cb1f3fc7103efa537d9f00ebb74ec7",
"url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/135607f9ccc297d6923d49c2bcf309f509413215",
"reference": "135607f9ccc297d6923d49c2bcf309f509413215",
"shasum": ""
},
"require": {
@ -780,7 +780,7 @@
"phpunit\/phpunit": "^9.5",
"symfony\/process": "^5.2"
},
"time": "2022-06-14T11:40:08+00:00",
"time": "2022-06-26T13:09:08+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -797,7 +797,7 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https:\/\/github.com\/phpstan\/phpdoc-parser\/issues",
"source": "https:\/\/github.com\/phpstan\/phpdoc-parser\/tree\/1.6.3"
"source": "https:\/\/github.com\/phpstan\/phpdoc-parser\/tree\/1.6.4"
},
"install-path": "..\/phpstan\/phpdoc-parser"
},

File diff suppressed because one or more lines are too long

View File

@ -136,6 +136,9 @@ class PhpDocParser
case '@template-covariant':
case '@phpstan-template-covariant':
case '@psalm-template-covariant':
case '@template-contravariant':
case '@phpstan-template-contravariant':
case '@psalm-template-contravariant':
$tagValue = $this->parseTemplateTagValue($tokens);
break;
case '@extends':
@ -328,9 +331,7 @@ class PhpDocParser
{
$importedAlias = $tokens->currentTokenValue();
$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
if (!$tokens->tryConsumeTokenValue('from')) {
throw new \PHPStan\PhpDocParser\Parser\ParserException($tokens->currentTokenValue(), $tokens->currentTokenType(), $tokens->currentTokenOffset(), Lexer::TOKEN_IDENTIFIER);
}
$tokens->consumeTokenValue(Lexer::TOKEN_IDENTIFIER, 'from');
$importedFrom = $tokens->currentTokenValue();
$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
$importedAs = null;