Updated Rector to commit 764416672a588c4bd80084a853973773f9835690

764416672a Fix InlineArrayReturnAssignRector and ChangeReadOnlyPropertyWithDefaultValueToConstantRector collision (#2700)
This commit is contained in:
Tomas Votruba 2022-07-21 21:45:25 +00:00
parent be073d8e55
commit e383186790
11 changed files with 25 additions and 25 deletions

View File

@ -5,8 +5,6 @@ namespace Rector\PhpAttribute;
use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
use Rector\Core\Php\PhpVersionProvider;
use Rector\Core\ValueObject\PhpVersionFeature;
use Rector\Php80\ValueObject\AnnotationToAttribute;
final class UnwrapableAnnotationAnalyzer
{

View File

@ -37,9 +37,11 @@ final class ClassConstantFactory
$const = new Const_($constantName, $defaultValue);
$classConst = new ClassConst([$const]);
$classConst->flags = $property->flags & ~Class_::MODIFIER_STATIC;
$const->setAttribute(AttributeKey::PARENT_NODE, $classConst);
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($property);
$phpDocInfo->markAsChanged();
$classConst->setAttribute(AttributeKey::PHP_DOC_INFO, $phpDocInfo);
$classConst->setAttribute(AttributeKey::PARENT_NODE, $property->getAttribute(AttributeKey::PARENT_NODE));
return $classConst;
}
}

View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = '1000cd51c57f7672d7e87c312cada4150bd98dd6';
public const PACKAGE_VERSION = '764416672a588c4bd80084a853973773f9835690';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-07-21 23:22:20';
public const RELEASE_DATE = '2022-07-21 21:39:52';
/**
* @var int
*/

View File

@ -250,7 +250,7 @@ final class ValueResolver
if ($class === ObjectReference::SELF) {
$classLike = $this->betterNodeFinder->findParentType($classConstFetch, ClassLike::class);
if (!$classLike instanceof ClassLike) {
throw new ShouldNotHappenException();
throw new ShouldNotHappenException('Complete class parent node for to class const fetch, so "self" references is resolvable to a class name');
}
$class = (string) $this->nodeNameResolver->getName($classLike);
}

2
vendor/autoload.php vendored
View File

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

View File

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

View File

@ -1923,12 +1923,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
"reference": "6fb9363fc06bf6901bcd1dc375317942ec310272"
"reference": "9b1e906d867982b8f726f2dfd39c6e53986e863e"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/6fb9363fc06bf6901bcd1dc375317942ec310272",
"reference": "6fb9363fc06bf6901bcd1dc375317942ec310272",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/9b1e906d867982b8f726f2dfd39c6e53986e863e",
"reference": "9b1e906d867982b8f726f2dfd39c6e53986e863e",
"shasum": ""
},
"require": {
@ -1945,7 +1945,7 @@
"phpstan\/phpstan-webmozart-assert": "^1.0",
"phpunit\/phpunit": "^9.5",
"rector\/phpstan-rules": "^0.5",
"rector\/rector-src": "dev-main#89af657",
"rector\/rector-src": "dev-main",
"symplify\/easy-coding-standard": "^11.0",
"symplify\/monorepo-builder": "^11.0",
"symplify\/phpstan-extensions": "^11.0",
@ -1953,7 +1953,7 @@
"symplify\/rule-doc-generator": "^11.0",
"symplify\/vendor-patches": "^11.0"
},
"time": "2022-07-21T19:18:48+00:00",
"time": "2022-07-21T21:36:03+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
*/
final class GeneratedConfig
{
public const EXTENSIONS = array('rector/rector-cakephp' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-cakephp', 'relative_install_path' => '../../rector-cakephp', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main ec96616'), 'rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 6fb9363'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 7ee4e58'), 'rector/rector-generator' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-generator', 'relative_install_path' => '../../rector-generator', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main be4b95a'), 'rector/rector-laravel' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-laravel', 'relative_install_path' => '../../rector-laravel', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 987bdb4'), 'rector/rector-nette' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette', 'relative_install_path' => '../../rector-nette', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main e5b2693'), 'rector/rector-phpoffice' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpoffice', 'relative_install_path' => '../../rector-phpoffice', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main c7d2f5f'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main d876ff2'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 5e47d42'));
public const EXTENSIONS = array('rector/rector-cakephp' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-cakephp', 'relative_install_path' => '../../rector-cakephp', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main ec96616'), 'rector/rector-doctrine' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-doctrine', 'relative_install_path' => '../../rector-doctrine', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 9b1e906'), 'rector/rector-downgrade-php' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-downgrade-php', 'relative_install_path' => '../../rector-downgrade-php', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 7ee4e58'), 'rector/rector-generator' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-generator', 'relative_install_path' => '../../rector-generator', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main be4b95a'), 'rector/rector-laravel' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-laravel', 'relative_install_path' => '../../rector-laravel', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 987bdb4'), 'rector/rector-nette' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-nette', 'relative_install_path' => '../../rector-nette', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main e5b2693'), 'rector/rector-phpoffice' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpoffice', 'relative_install_path' => '../../rector-phpoffice', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main c7d2f5f'), 'rector/rector-phpunit' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-phpunit', 'relative_install_path' => '../../rector-phpunit', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main d876ff2'), 'rector/rector-symfony' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-symfony', 'relative_install_path' => '../../rector-symfony', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 5e47d42'));
private function __construct()
{
}

View File

@ -15,7 +15,7 @@
"symplify\/phpstan-extensions": "^11.0",
"symplify\/easy-coding-standard": "^11.0",
"symplify\/rule-doc-generator": "^11.0",
"rector\/rector-src": "dev-main#89af657",
"rector\/rector-src": "dev-main",
"doctrine\/orm": "^2.10",
"symplify\/monorepo-builder": "^11.0",
"phpstan\/phpstan-webmozart-assert": "^1.0",