octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-02 09:20:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit b4120a8850

Browse Source 
b4120a8850 [DX] Use direct method on node, instead of token position (#2340)
This commit is contained in:
Tomas Votruba 2022-05-21 12:10:19 +00:00
parent a073a51536
commit 71be1e7075
10 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -2907,6 +2907,7 @@ return array(
'Rector\\Strict\\Rector\\Ternary\\DisallowedShortTernaryRuleFixerRector' => $baseDir . '/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php',
'Rector\\Symfony\\ApplicationMetadata\\ListenerServiceDefinitionProvider' => $vendorDir . '/rector/rector-symfony/src/ApplicationMetadata/ListenerServiceDefinitionProvider.php',
'Rector\\Symfony\\Bridge\\NodeAnalyzer\\ControllerMethodAnalyzer' => $vendorDir . '/rector/rector-symfony/src/Bridge/NodeAnalyzer/ControllerMethodAnalyzer.php',
'Rector\\Symfony\\Bridge\\Symfony\\ContainerServiceProvider' => $vendorDir . '/rector/rector-symfony/src/Bridge/Symfony/ContainerServiceProvider.php',
'Rector\\Symfony\\BundleClassResolver' => $vendorDir . '/rector/rector-symfony/src/BundleClassResolver.php',
'Rector\\Symfony\\Command\\ConvertSymfonyRoutesCommand' => $vendorDir . '/rector/rector-symfony/src/Command/ConvertSymfonyRoutesCommand.php',
'Rector\\Symfony\\Contract\\EventReferenceToMethodNameInterface' => $vendorDir . '/rector/rector-symfony/src/Contract/EventReferenceToMethodNameInterface.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInitcb1126ed796f59d1e42052b8be743a4c
class ComposerAutoloaderInit6775ca6a598e68456cc39a6405f2a40a
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInitcb1126ed796f59d1e42052b8be743a4c
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInitcb1126ed796f59d1e42052b8be743a4c', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit6775ca6a598e68456cc39a6405f2a40a', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInitcb1126ed796f59d1e42052b8be743a4c', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit6775ca6a598e68456cc39a6405f2a40a', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInitcb1126ed796f59d1e42052b8be743a4c::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit6775ca6a598e68456cc39a6405f2a40a::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInitcb1126ed796f59d1e42052b8be743a4c::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit6775ca6a598e68456cc39a6405f2a40a::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequirecb1126ed796f59d1e42052b8be743a4c($fileIdentifier, $file);
composerRequire6775ca6a598e68456cc39a6405f2a40a($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInitcb1126ed796f59d1e42052b8be743a4c
* @param string $file
* @return void
*/
function composerRequirecb1126ed796f59d1e42052b8be743a4c($fileIdentifier, $file)
function composerRequire6775ca6a598e68456cc39a6405f2a40a($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInitcb1126ed796f59d1e42052b8be743a4c
class ComposerStaticInit6775ca6a598e68456cc39a6405f2a40a
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -3276,6 +3276,7 @@ class ComposerStaticInitcb1126ed796f59d1e42052b8be743a4c
'Rector\\Strict\\Rector\\Ternary\\DisallowedShortTernaryRuleFixerRector' => __DIR__ . '/../..' . '/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php',
'Rector\\Symfony\\ApplicationMetadata\\ListenerServiceDefinitionProvider' => __DIR__ . '/..' . '/rector/rector-symfony/src/ApplicationMetadata/ListenerServiceDefinitionProvider.php',
'Rector\\Symfony\\Bridge\\NodeAnalyzer\\ControllerMethodAnalyzer' => __DIR__ . '/..' . '/rector/rector-symfony/src/Bridge/NodeAnalyzer/ControllerMethodAnalyzer.php',
'Rector\\Symfony\\Bridge\\Symfony\\ContainerServiceProvider' => __DIR__ . '/..' . '/rector/rector-symfony/src/Bridge/Symfony/ContainerServiceProvider.php',
'Rector\\Symfony\\BundleClassResolver' => __DIR__ . '/..' . '/rector/rector-symfony/src/BundleClassResolver.php',
'Rector\\Symfony\\Command\\ConvertSymfonyRoutesCommand' => __DIR__ . '/..' . '/rector/rector-symfony/src/Command/ConvertSymfonyRoutesCommand.php',
'Rector\\Symfony\\Contract\\EventReferenceToMethodNameInterface' => __DIR__ . '/..' . '/rector/rector-symfony/src/Contract/EventReferenceToMethodNameInterface.php',
@ -3908,9 +3909,9 @@ class ComposerStaticInitcb1126ed796f59d1e42052b8be743a4c
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInitcb1126ed796f59d1e42052b8be743a4c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitcb1126ed796f59d1e42052b8be743a4c::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitcb1126ed796f59d1e42052b8be743a4c::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit6775ca6a598e68456cc39a6405f2a40a::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit6775ca6a598e68456cc39a6405f2a40a::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit6775ca6a598e68456cc39a6405f2a40a::$classMap;
}, null, ClassLoader::class);
}

8
vendor/composer/installed.json vendored
View File

@ -2644,12 +2644,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-symfony.git",
"reference": "7336858650e30df56c27f62b1711a62877a2612e"
"reference": "f1189f5d8bd3e231c4e881e16835f3f124af5fc2"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/7336858650e30df56c27f62b1711a62877a2612e",
"reference": "7336858650e30df56c27f62b1711a62877a2612e",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-symfony\/zipball\/f1189f5d8bd3e231c4e881e16835f3f124af5fc2",
"reference": "f1189f5d8bd3e231c4e881e16835f3f124af5fc2",
"shasum": ""
},
"require": {
@ -2678,7 +2678,7 @@
"symplify\/rule-doc-generator": "^10.2",
"symplify\/vendor-patches": "^10.2"
},
"time": "2022-05-21T11:50:07+00:00",
"time": "2022-05-21T12:03:06+00:00",
"default-branch": true,
"type": "rector-extension",
"extra": {

2
vendor/composer/installed.php vendored
View File

File diff suppressed because one or more lines are too long

2
vendor/rector/extension-installer/src/GeneratedConfig.php vendored
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 43ca394'), '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 4a907ed'), '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 784271e'), '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 2e0f600'), '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 5f84d90'), '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 e544f2a'), '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 5a33940'), '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 7336858'), 'ssch/typo3-rector' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/ssch/typo3-rector', 'relative_install_path' => '../../../ssch/typo3-rector', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 1e75e86'));
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 43ca394'), '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 4a907ed'), '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 784271e'), '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 2e0f600'), '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 5f84d90'), '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 e544f2a'), '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 5a33940'), '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 f1189f5'), 'ssch/typo3-rector' => array('install_path' => '/home/runner/work/rector-src/rector-src/vendor/ssch/typo3-rector', 'relative_install_path' => '../../../ssch/typo3-rector', 'extra' => array('includes' => array(0 => 'config/config.php')), 'version' => 'dev-main 1e75e86'));
private function __construct()
{
}

33
vendor/rector/rector-symfony/src/Bridge/Symfony/ContainerServiceProvider.php vendored Normal file
View File

@ -0,0 +1,33 @@
<?php
declare (strict_types=1);
namespace Rector\Symfony\Bridge\Symfony;
use Rector\Core\Configuration\RectorConfigProvider;
use Rector\Core\Exception\ShouldNotHappenException;
use RectorPrefix20220521\Webmozart\Assert\Assert;
final class ContainerServiceProvider
{
/**
* @readonly
* @var \Rector\Core\Configuration\RectorConfigProvider
*/
private $rectorConfigProvider;
public function __construct(\Rector\Core\Configuration\RectorConfigProvider $rectorConfigProvider)
{
$this->rectorConfigProvider = $rectorConfigProvider;
}
public function provideByName(string $serviceName) : object
{
$symfonyContainerPhp = $this->rectorConfigProvider->getSymfonyContainerPhp();
\RectorPrefix20220521\Webmozart\Assert\Assert::fileExists($symfonyContainerPhp);
$container = (require_once $symfonyContainerPhp);
// this allows older Symfony versions, e.g. 2.8 did not have the PSR yet
\RectorPrefix20220521\Webmozart\Assert\Assert::isInstanceOf($container, 'Symfony\\Component\\DependencyInjection\\Container');
if (!$container->has($serviceName)) {
$errorMessage = \sprintf('Symfony container has no service "%s", maybe it is private', 'router');
throw new \Rector\Core\Exception\ShouldNotHappenException($errorMessage);
}
return $container->get($serviceName);
}
}

24
vendor/rector/rector-symfony/src/Command/ConvertSymfonyRoutesCommand.php vendored
View File

@ -4,9 +4,7 @@ declare (strict_types=1);
namespace Rector\Symfony\Command;
use RectorPrefix20220521\Nette\Utils\Json;
use RectorPrefix20220521\Psr\Container\ContainerInterface;
use Rector\Core\Configuration\RectorConfigProvider;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Symfony\Bridge\Symfony\ContainerServiceProvider;
use RectorPrefix20220521\Symfony\Component\Console\Command\Command;
use RectorPrefix20220521\Symfony\Component\Console\Input\InputInterface;
use RectorPrefix20220521\Symfony\Component\Console\Output\OutputInterface;
@ -15,12 +13,12 @@ final class ConvertSymfonyRoutesCommand extends \RectorPrefix20220521\Symfony\Co
{
/**
* @readonly
* @var \Rector\Core\Configuration\RectorConfigProvider
* @var \Rector\Symfony\Bridge\Symfony\ContainerServiceProvider
*/
private $rectorConfigProvider;
public function __construct(\Rector\Core\Configuration\RectorConfigProvider $rectorConfigProvider)
private $containerServiceProvider;
public function __construct(\Rector\Symfony\Bridge\Symfony\ContainerServiceProvider $containerServiceProvider)
{
$this->rectorConfigProvider = $rectorConfigProvider;
$this->containerServiceProvider = $containerServiceProvider;
parent::__construct();
}
protected function configure() : void
@ -30,17 +28,7 @@ final class ConvertSymfonyRoutesCommand extends \RectorPrefix20220521\Symfony\Co
}
protected function execute(\RectorPrefix20220521\Symfony\Component\Console\Input\InputInterface $input, \RectorPrefix20220521\Symfony\Component\Console\Output\OutputInterface $output) : int
{
// @todo extract method
$symfonyContainerPhp = $this->rectorConfigProvider->getSymfonyContainerPhp();
\RectorPrefix20220521\Webmozart\Assert\Assert::fileExists($symfonyContainerPhp);
$container = (require_once $symfonyContainerPhp);
// this allows older Symfony versions, e.g. 2.8 did not have the PSR yet
\RectorPrefix20220521\Webmozart\Assert\Assert::isInstanceOf($container, 'Symfony\\Component\\DependencyInjection\\Container');
/** @var ContainerInterface $container */
if (!$container->has('router')) {
throw new \Rector\Core\Exception\ShouldNotHappenException(\sprintf('Symfony container has no service "%s", maybe it is private', 'router'));
}
$router = $container->get('router');
$router = $this->containerServiceProvider->provideByName('router');
\RectorPrefix20220521\Webmozart\Assert\Assert::isInstanceOf($router, 'Symfony\\Component\\Routing\\RouterInterface');
$routeCollection = $router->getRouteCollection();
$routes = \array_map(static function ($route) : array {

10
vendor/scoper-autoload.php vendored
View File

@ -9,8 +9,8 @@ $loader = require_once __DIR__.'/autoload.php';
if (!class_exists('AutoloadIncluder', false) && !interface_exists('AutoloadIncluder', false) && !trait_exists('AutoloadIncluder', false)) {
spl_autoload_call('RectorPrefix20220521\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInitcb1126ed796f59d1e42052b8be743a4c', false) && !interface_exists('ComposerAutoloaderInitcb1126ed796f59d1e42052b8be743a4c', false) && !trait_exists('ComposerAutoloaderInitcb1126ed796f59d1e42052b8be743a4c', false)) {
spl_autoload_call('RectorPrefix20220521\ComposerAutoloaderInitcb1126ed796f59d1e42052b8be743a4c');
if (!class_exists('ComposerAutoloaderInit6775ca6a598e68456cc39a6405f2a40a', false) && !interface_exists('ComposerAutoloaderInit6775ca6a598e68456cc39a6405f2a40a', false) && !trait_exists('ComposerAutoloaderInit6775ca6a598e68456cc39a6405f2a40a', false)) {
spl_autoload_call('RectorPrefix20220521\ComposerAutoloaderInit6775ca6a598e68456cc39a6405f2a40a');
}
if (!class_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !interface_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false) && !trait_exists('Helmich\TypoScriptParser\Parser\AST\Statement', false)) {
spl_autoload_call('RectorPrefix20220521\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220521\print_node(...func_get_args());
}
}
if (!function_exists('composerRequirecb1126ed796f59d1e42052b8be743a4c')) {
function composerRequirecb1126ed796f59d1e42052b8be743a4c() {
return \RectorPrefix20220521\composerRequirecb1126ed796f59d1e42052b8be743a4c(...func_get_args());
if (!function_exists('composerRequire6775ca6a598e68456cc39a6405f2a40a')) {
function composerRequire6775ca6a598e68456cc39a6405f2a40a() {
return \RectorPrefix20220521\composerRequire6775ca6a598e68456cc39a6405f2a40a(...func_get_args());
}
}
if (!function_exists('scanPath')) {