Updated Rector to commit 28ed5cf916

28ed5cf916 [automated] Re-Generate Nodes/Rectors Documentation (#2479)
This commit is contained in:
Tomas Votruba 2022-06-12 14:01:14 +00:00
parent 7a181db4ce
commit a1d7c79c1b
9 changed files with 70 additions and 19 deletions

2
vendor/autoload.php vendored
View File

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

View File

@ -2794,6 +2794,7 @@ return array(
'Rector\\Symfony\\NodeFactory\\BareLogoutClassMethodFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/BareLogoutClassMethodFactory.php',
'Rector\\Symfony\\NodeFactory\\EventReferenceFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/EventReferenceFactory.php',
'Rector\\Symfony\\NodeFactory\\FormType\\BuildFormOptionAssignsFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/FormType/BuildFormOptionAssignsFactory.php',
'Rector\\Symfony\\NodeFactory\\FormType\\ConfigureDefaultsFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/FormType/ConfigureDefaultsFactory.php',
'Rector\\Symfony\\NodeFactory\\GetSubscribedEventsClassMethodFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/GetSubscribedEventsClassMethodFactory.php',
'Rector\\Symfony\\NodeFactory\\InvokableControllerClassFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/InvokableControllerClassFactory.php',
'Rector\\Symfony\\NodeFactory\\InvokableControllerNameFactory' => $vendorDir . '/rector/rector-symfony/src/NodeFactory/InvokableControllerNameFactory.php',

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit47bfae53c533fdd39ebb83bc6ae54952
class ComposerAutoloaderInitce304557a03ed74efcfbea7c64bdecfe
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit47bfae53c533fdd39ebb83bc6ae54952
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit47bfae53c533fdd39ebb83bc6ae54952', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitce304557a03ed74efcfbea7c64bdecfe', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit47bfae53c533fdd39ebb83bc6ae54952', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitce304557a03ed74efcfbea7c64bdecfe', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit47bfae53c533fdd39ebb83bc6ae54952::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitce304557a03ed74efcfbea7c64bdecfe::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit47bfae53c533fdd39ebb83bc6ae54952::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitce304557a03ed74efcfbea7c64bdecfe::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire47bfae53c533fdd39ebb83bc6ae54952($fileIdentifier, $file);
composerRequirece304557a03ed74efcfbea7c64bdecfe($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit47bfae53c533fdd39ebb83bc6ae54952
* @param string $file
* @return void
*/
function composerRequire47bfae53c533fdd39ebb83bc6ae54952($fileIdentifier, $file)
function composerRequirece304557a03ed74efcfbea7c64bdecfe($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 ComposerStaticInit47bfae53c533fdd39ebb83bc6ae54952
class ComposerStaticInitce304557a03ed74efcfbea7c64bdecfe
{
public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3095,6 +3095,7 @@ class ComposerStaticInit47bfae53c533fdd39ebb83bc6ae54952
'Rector\\Symfony\\NodeFactory\\BareLogoutClassMethodFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/BareLogoutClassMethodFactory.php',
'Rector\\Symfony\\NodeFactory\\EventReferenceFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/EventReferenceFactory.php',
'Rector\\Symfony\\NodeFactory\\FormType\\BuildFormOptionAssignsFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/FormType/BuildFormOptionAssignsFactory.php',
'Rector\\Symfony\\NodeFactory\\FormType\\ConfigureDefaultsFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/FormType/ConfigureDefaultsFactory.php',
'Rector\\Symfony\\NodeFactory\\GetSubscribedEventsClassMethodFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/GetSubscribedEventsClassMethodFactory.php',
'Rector\\Symfony\\NodeFactory\\InvokableControllerClassFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/InvokableControllerClassFactory.php',
'Rector\\Symfony\\NodeFactory\\InvokableControllerNameFactory' => __DIR__ . '/..' . '/rector/rector-symfony/src/NodeFactory/InvokableControllerNameFactory.php',
@ -3396,9 +3397,9 @@ class ComposerStaticInit47bfae53c533fdd39ebb83bc6ae54952
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit47bfae53c533fdd39ebb83bc6ae54952::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit47bfae53c533fdd39ebb83bc6ae54952::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit47bfae53c533fdd39ebb83bc6ae54952::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitce304557a03ed74efcfbea7c64bdecfe::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitce304557a03ed74efcfbea7c64bdecfe::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitce304557a03ed74efcfbea7c64bdecfe::$classMap;
}, null, ClassLoader::class);
}

View File

@ -2347,12 +2347,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
"reference": "b77392f892061519caeb3c533a957bcfb08bf440"
"reference": "2071c162dad26428f8bb7e809f88e36ed7691b96"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/b77392f892061519caeb3c533a957bcfb08bf440",
"reference": "b77392f892061519caeb3c533a957bcfb08bf440",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/2071c162dad26428f8bb7e809f88e36ed7691b96",
"reference": "2071c162dad26428f8bb7e809f88e36ed7691b96",
"shasum": ""
},
"require": {
@ -2381,7 +2381,7 @@
"symplify\/rule-doc-generator": "^10.2",
"symplify\/vendor-patches": "^10.2"
},
"time": "2022-06-11T13:01:13+00:00",
"time": "2022-06-12T13:33:49+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 f84ea17'), '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 b695bf6'), '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 623c9e2'), '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 1194b1b'), '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 f29fa56'), '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 15ee440'), '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 2646247'), '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 b77392f'));
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 f84ea17'), '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 b695bf6'), '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 623c9e2'), '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 1194b1b'), '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 f29fa56'), '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 15ee440'), '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 2646247'), '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 2071c16'));
private function __construct()
{
}

View File

@ -0,0 +1,39 @@
<?php
declare (strict_types=1);
namespace Rector\Symfony\NodeFactory\FormType;
use PhpParser\Node\Arg;
use PhpParser\Node\Expr\Array_;
use PhpParser\Node\Expr\ArrayItem;
use PhpParser\Node\Expr\ConstFetch;
use PhpParser\Node\Expr\MethodCall;
use PhpParser\Node\Expr\Variable;
use PhpParser\Node\Name;
use PhpParser\Node\Name\FullyQualified;
use PhpParser\Node\Param;
use PhpParser\Node\Scalar\String_;
use PhpParser\Node\Stmt\ClassMethod;
use PhpParser\Node\Stmt\Expression;
use Rector\Core\ValueObject\Visibility;
final class ConfigureDefaultsFactory
{
/**
* @param string[] $paramNames
*/
public function create(array $paramNames) : ClassMethod
{
$configureOptionsClassMethod = new ClassMethod('configureOptions');
$configureOptionsClassMethod->flags = Visibility::PUBLIC;
$optionsResolverVariable = new Variable('optionsResolver');
$configureOptionsClassMethod->params[] = new Param($optionsResolverVariable, null, new FullyQualified('Symfony\\Component\\OptionsResolver\\OptionsResolver'));
$arrayItems = [];
foreach ($paramNames as $paramName) {
$arrayItems[] = new ArrayItem(new ConstFetch(new Name('null')), new String_($paramName));
}
$array = new Array_($arrayItems);
$methodCall = new MethodCall($optionsResolverVariable, 'setDefaults', [new Arg($array)]);
$configureOptionsClassMethod->stmts[] = new Expression($methodCall);
return $configureOptionsClassMethod;
}
}

View File

@ -13,6 +13,7 @@ use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\Rector\AbstractRector;
use Rector\Core\ValueObject\MethodName;
use Rector\Symfony\NodeFactory\FormType\BuildFormOptionAssignsFactory;
use Rector\Symfony\NodeFactory\FormType\ConfigureDefaultsFactory;
use Rector\Symfony\NodeRemover\ConstructorDependencyRemover;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@ -33,10 +34,16 @@ final class FormTypeWithDependencyToOptionsRector extends AbstractRector
* @var \Rector\Symfony\NodeRemover\ConstructorDependencyRemover
*/
private $constructorDependencyRemover;
public function __construct(BuildFormOptionAssignsFactory $buildFormOptionAssignsFactory, ConstructorDependencyRemover $constructorDependencyRemover)
/**
* @readonly
* @var \Rector\Symfony\NodeFactory\FormType\ConfigureDefaultsFactory
*/
private $configureDefaultsFactory;
public function __construct(BuildFormOptionAssignsFactory $buildFormOptionAssignsFactory, ConstructorDependencyRemover $constructorDependencyRemover, ConfigureDefaultsFactory $configureDefaultsFactory)
{
$this->buildFormOptionAssignsFactory = $buildFormOptionAssignsFactory;
$this->constructorDependencyRemover = $constructorDependencyRemover;
$this->configureDefaultsFactory = $configureDefaultsFactory;
}
public function getRuleDefinition() : RuleDefinition
{
@ -128,6 +135,9 @@ CODE_SAMPLE
// 3. cleanup ctor
$this->constructorDependencyRemover->removeParamsByName($constructorClassMethod, $paramNames);
$this->replacePropertyFetchesByVariables($buildFormClassMethod, $paramNames);
// 4. add configure options class method
$classMethod = $this->configureDefaultsFactory->create($paramNames);
$node->stmts[] = $classMethod;
return $node;
}
/**