Updated Rector to commit de008767d91ad6cd5ed77bdc259454665e4bbde9

de008767d9 Replace static with self for private constants (#3178)
This commit is contained in:
Tomas Votruba 2022-12-12 14:06:38 +00:00
parent 7924f6944c
commit 5a40891bc0
8 changed files with 23 additions and 22 deletions

2
vendor/autoload.php vendored
View File

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

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit69ca48a6fd0e1398ed1e26f928726fec
class ComposerAutoloaderInit314f9626f269cfac8261df18b48b68e2
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit69ca48a6fd0e1398ed1e26f928726fec
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit69ca48a6fd0e1398ed1e26f928726fec', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit314f9626f269cfac8261df18b48b68e2', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit69ca48a6fd0e1398ed1e26f928726fec', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit314f9626f269cfac8261df18b48b68e2', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit69ca48a6fd0e1398ed1e26f928726fec::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit314f9626f269cfac8261df18b48b68e2::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit69ca48a6fd0e1398ed1e26f928726fec::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit314f9626f269cfac8261df18b48b68e2::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire69ca48a6fd0e1398ed1e26f928726fec($fileIdentifier, $file);
composerRequire314f9626f269cfac8261df18b48b68e2($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit69ca48a6fd0e1398ed1e26f928726fec
* @param string $file
* @return void
*/
function composerRequire69ca48a6fd0e1398ed1e26f928726fec($fileIdentifier, $file)
function composerRequire314f9626f269cfac8261df18b48b68e2($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 ComposerStaticInit69ca48a6fd0e1398ed1e26f928726fec
class ComposerStaticInit314f9626f269cfac8261df18b48b68e2
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -3027,9 +3027,9 @@ class ComposerStaticInit69ca48a6fd0e1398ed1e26f928726fec
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit69ca48a6fd0e1398ed1e26f928726fec::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit69ca48a6fd0e1398ed1e26f928726fec::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit69ca48a6fd0e1398ed1e26f928726fec::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit314f9626f269cfac8261df18b48b68e2::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit314f9626f269cfac8261df18b48b68e2::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit314f9626f269cfac8261df18b48b68e2::$classMap;
}, null, ClassLoader::class);
}

View File

@ -2058,12 +2058,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
"reference": "f77e49313ef90366441b9c0bb38943c14cdda46d"
"reference": "2142ee12ff1e6fbef11ef9d86c778fc9e30a8a74"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/f77e49313ef90366441b9c0bb38943c14cdda46d",
"reference": "f77e49313ef90366441b9c0bb38943c14cdda46d",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/2142ee12ff1e6fbef11ef9d86c778fc9e30a8a74",
"reference": "2142ee12ff1e6fbef11ef9d86c778fc9e30a8a74",
"shasum": ""
},
"require": {
@ -2093,7 +2093,7 @@
"symplify\/rule-doc-generator": "^11.1",
"symplify\/vendor-patches": "^11.1"
},
"time": "2022-12-07T13:31:03+00:00",
"time": "2022-12-12T13:57:47+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-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 6163431'), '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 b1ca6d7'), 'rector/rector-php-parser' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-php-parser', 'relative_install_path' => '../../rector-php-parser', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 9ea5f62'), '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 2520dbc'), '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 f77e493'));
public const EXTENSIONS = array('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 6163431'), '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 b1ca6d7'), 'rector/rector-php-parser' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/rector/rector-php-parser', 'relative_install_path' => '../../rector-php-parser', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 9ea5f62'), '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 2520dbc'), '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 2142ee1'));
private function __construct()
{
}

View File

@ -43,5 +43,6 @@ return static function (RectorConfig $rectorConfig) : void {
new MethodCallRename('Symfony\\Component\\Mime\\Email', 'attachPart', 'addPart'),
]);
// @see https://github.com/symfony/symfony/pull/46094
$rectorConfig->ruleWithConfiguration(RenameClassConstFetchRector::class, [new RenameClassAndConstFetch('Symfony\\Component\\Security\\Core\\Security', 'ACCESS_DENIED_ERROR', 'Symfony\\Bundle\\SecurityBundle\\Security', 'ACCESS_DENIED_ERROR'), new RenameClassAndConstFetch('Symfony\\Component\\Security\\Core\\Security', 'AUTHENTICATION_ERROR', 'Symfony\\Bundle\\SecurityBundle\\Security', 'AUTHENTICATION_ERROR'), new RenameClassAndConstFetch('Symfony\\Component\\Security\\Core\\Security', 'LAST_USERNAME', 'Symfony\\Bundle\\SecurityBundle\\Security', 'LAST_USERNAME'), new RenameClassAndConstFetch('Symfony\\Component\\Security\\Core\\Security', 'MAX_USERNAME_LENGTH', 'Symfony\\Component\\Security\\Http\\Authenticator\\Passport\\Badge\\UserBadge', 'MAX_USERNAME_LENGTH')]);
// @see https://github.com/symfony/symfony/pull/48554
$rectorConfig->ruleWithConfiguration(RenameClassConstFetchRector::class, [new RenameClassAndConstFetch('Symfony\\Component\\Security\\Core\\Security', 'ACCESS_DENIED_ERROR', 'Symfony\\Component\\Security\\Http\\SecurityRequestAttributes', 'ACCESS_DENIED_ERROR'), new RenameClassAndConstFetch('Symfony\\Component\\Security\\Core\\Security', 'AUTHENTICATION_ERROR', 'Symfony\\Component\\Security\\Http\\SecurityRequestAttributes', 'AUTHENTICATION_ERROR'), new RenameClassAndConstFetch('Symfony\\Component\\Security\\Core\\Security', 'LAST_USERNAME', 'Symfony\\Component\\Security\\Http\\SecurityRequestAttributes', 'LAST_USERNAME'), new RenameClassAndConstFetch('Symfony\\Component\\Security\\Core\\Security', 'MAX_USERNAME_LENGTH', 'Symfony\\Component\\Security\\Http\\Authenticator\\Passport\\Badge\\UserBadge', 'MAX_USERNAME_LENGTH')]);
};

View File

@ -30,7 +30,7 @@ final class FormBuilderSetDataMapperRector extends AbstractRector
* @readonly
* @var \PHPStan\Type\ObjectType
*/
private $dataMapperInterface;
private $objectType;
/**
* @readonly
* @var \PHPStan\Type\ObjectType
@ -38,7 +38,7 @@ final class FormBuilderSetDataMapperRector extends AbstractRector
private $dataMapperObjectType;
public function __construct()
{
$this->dataMapperInterface = new ObjectType(self::DATAMAPPER_INTERFACE);
$this->objectType = new ObjectType(self::DATAMAPPER_INTERFACE);
$this->dataMapperObjectType = new ObjectType(self::DATAMAPPER_CLASS);
}
public function getRuleDefinition() : RuleDefinition
@ -92,7 +92,7 @@ CODE_SAMPLE
$args = $node->getArgs();
$firstArg = $args[0];
$argumentValue = $firstArg->value;
if ($this->isObjectType($argumentValue, $this->dataMapperInterface) || $this->isObjectType($argumentValue, $this->dataMapperObjectType)) {
if ($this->isObjectType($argumentValue, $this->objectType) || $this->isObjectType($argumentValue, $this->dataMapperObjectType)) {
return null;
}
$propertyPathAccessor = new New_(new FullyQualified('Symfony\\Component\\Form\\Extension\\Core\\DataAccessor\\PropertyPathAccessor'));