Updated Rector to commit 8e753106800cd314b736e0c54e88be715c63cb25

8e75310680 Little cleanup (#2810)
This commit is contained in:
Tomas Votruba 2022-08-20 20:57:03 +00:00
parent 402dbe5a36
commit 53770fa84f
11 changed files with 41 additions and 40 deletions

View File

@ -10,6 +10,7 @@ use Rector\BetterPhpDocParser\PhpDoc\DoctrineAnnotationTagValueNode;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\BetterPhpDocParser\PhpDocParser\ClassAnnotationMatcher;
use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode;
use Rector\BetterPhpDocParser\ValueObject\PhpDocAttributeKey;
final class PhpDocClassRenamer
{
/**
@ -59,7 +60,7 @@ final class PhpDocClassRenamer
}
$classNameArrayItemNode->value = $newClass;
// trigger reprint
$classNameArrayItemNode->setAttribute('orig_node', null);
$classNameArrayItemNode->setAttribute(PhpDocAttributeKey::ORIG_NODE, null);
break;
}
}
@ -91,7 +92,7 @@ final class PhpDocClassRenamer
continue;
}
$classNameArrayItemNode->value = Strings::replace($classNameArrayItemNode->value, '#\\b' . \preg_quote($oldClass, '#') . '\\b#', $newClass);
$classNameArrayItemNode->setAttribute('orig_node', null);
$classNameArrayItemNode->setAttribute(PhpDocAttributeKey::ORIG_NODE, null);
}
$currentTypeArrayItemNode = $doctrineAnnotationTagValueNode->getValue('type');
if (!$currentTypeArrayItemNode instanceof ArrayItemNode) {
@ -120,7 +121,7 @@ final class PhpDocClassRenamer
continue;
}
$targetEntityArrayItemNode->value = $newClass;
$targetEntityArrayItemNode->setAttribute('orig_node', null);
$targetEntityArrayItemNode->setAttribute(PhpDocAttributeKey::ORIG_NODE, null);
}
}
}

View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'a33b200e615b9451ba091e2724ab707f39198da7';
public const PACKAGE_VERSION = '8e753106800cd314b736e0c54e88be715c63cb25';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2022-08-20 22:44:59';
public const RELEASE_DATE = '2022-08-20 20:50:54';
/**
* @var int
*/

2
vendor/autoload.php vendored
View File

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

View File

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

View File

@ -1852,12 +1852,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
"reference": "e1dba76992666c6fc9da35c3832ba56a6e1b28ec"
"reference": "bab14ac969407e3a78ff7515d2bd4c8eefa1a7e9"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/e1dba76992666c6fc9da35c3832ba56a6e1b28ec",
"reference": "e1dba76992666c6fc9da35c3832ba56a6e1b28ec",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/bab14ac969407e3a78ff7515d2bd4c8eefa1a7e9",
"reference": "bab14ac969407e3a78ff7515d2bd4c8eefa1a7e9",
"shasum": ""
},
"require": {
@ -1876,13 +1876,13 @@
"rector\/phpstan-rules": "^0.5.15",
"rector\/rector-src": "dev-main",
"symplify\/easy-coding-standard": "^11.0",
"symplify\/monorepo-builder": "^11.0",
"symplify\/phpstan-extensions": "^11.0",
"symplify\/phpstan-rules": "^11.0",
"symplify\/rule-doc-generator": "^11.0",
"symplify\/vendor-patches": "^11.0"
"symplify\/monorepo-builder": "^11.1",
"symplify\/phpstan-extensions": "^11.1",
"symplify\/phpstan-rules": "^11.1",
"symplify\/rule-doc-generator": "^11.1",
"symplify\/vendor-patches": "^11.1"
},
"time": "2022-08-20T20:00:45+00:00",
"time": "2022-08-20T20:50:59+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {
@ -2267,12 +2267,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
"reference": "b689a4e48af872b4d0dcd3945a3ebf6262efdb5e"
"reference": "ef4b9355148fefeca939b760aae968de93a51f78"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/b689a4e48af872b4d0dcd3945a3ebf6262efdb5e",
"reference": "b689a4e48af872b4d0dcd3945a3ebf6262efdb5e",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/ef4b9355148fefeca939b760aae968de93a51f78",
"reference": "ef4b9355148fefeca939b760aae968de93a51f78",
"shasum": ""
},
"require": {
@ -2290,7 +2290,7 @@
"phpstan\/phpstan-webmozart-assert": "^1.2",
"phpunit\/phpunit": "^9.5",
"rector\/phpstan-rules": "^0.5.16",
"rector\/rector-src": "dev-main#b216950",
"rector\/rector-src": "dev-main",
"symfony\/routing": "^6.1",
"symfony\/security-core": "^6.1",
"symfony\/security-http": "^6.1",
@ -2301,7 +2301,7 @@
"symplify\/rule-doc-generator": "^11.1",
"symplify\/vendor-patches": "^11.1"
},
"time": "2022-08-20T20:19:06+00:00",
"time": "2022-08-20T20:49:11+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 c2ec06c'), '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 e1dba76'), '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 efc7ddf'), '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 38440b9'), '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 20edb95'), '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 3638a66'), '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 0e0e399'), '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 b689a4e'));
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 c2ec06c'), '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 bab14ac'), '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 efc7ddf'), '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 38440b9'), '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 20edb95'), '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 3638a66'), '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 0e0e399'), '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 ef4b935'));
private function __construct()
{
}

View File

@ -11,16 +11,16 @@
"rector\/phpstan-rules": "^0.5.15",
"phpstan\/phpstan": "^1.8.2",
"phpunit\/phpunit": "^9.5",
"symplify\/phpstan-rules": "^11.0",
"symplify\/phpstan-extensions": "^11.0",
"symplify\/phpstan-rules": "^11.1",
"symplify\/phpstan-extensions": "^11.1",
"symplify\/easy-coding-standard": "^11.0",
"symplify\/rule-doc-generator": "^11.0",
"symplify\/rule-doc-generator": "^11.1",
"rector\/rector-src": "dev-main",
"doctrine\/orm": "^2.10",
"symplify\/monorepo-builder": "^11.0",
"symplify\/monorepo-builder": "^11.1",
"phpstan\/phpstan-webmozart-assert": "^1.0",
"phpstan\/phpstan-strict-rules": "^1.1",
"symplify\/vendor-patches": "^11.0"
"symplify\/vendor-patches": "^11.1"
},
"autoload": {
"psr-4": {

View File

@ -102,7 +102,7 @@ CODE_SAMPLE
}
$slugFields = $doctrineAnnotationTagValueNode->getValue('fields');
if ($slugFields instanceof CurlyListNode) {
$slugFields = $slugFields->getValuesWithExplicitSilentAndWithoutQuotes();
$slugFields = $slugFields->getValuesWithSilentKey();
}
$this->removeNode($property);
$matchedProperty = $property;

View File

@ -15,7 +15,7 @@
"phpstan\/phpstan-webmozart-assert": "^1.2",
"phpunit\/phpunit": "^9.5",
"rector\/phpstan-rules": "^0.5.16",
"rector\/rector-src": "dev-main#b216950",
"rector\/rector-src": "dev-main",
"symfony\/routing": "^6.1",
"symfony\/security-core": "^6.1",
"symfony\/security-http": "^6.1",