Updated Rector to commit a784b3da67

a784b3da67 [TypeDeclaration] Use ReflectionResolver when possible on ControllerRenderMethodAnalyzer (#2284)
This commit is contained in:
Tomas Votruba 2022-05-11 12:03:36 +00:00
parent 3c86fb4a76
commit a2b4ae0362
8 changed files with 24 additions and 26 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 ComposerAutoloaderInit7dc64c0a599b8ff04dde5909f8e2622b::getLoader();
return ComposerAutoloaderInitf9f1dfa2f263ec9b3521e37502b6a255::getLoader();

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit7dc64c0a599b8ff04dde5909f8e2622b
class ComposerAutoloaderInitf9f1dfa2f263ec9b3521e37502b6a255
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit7dc64c0a599b8ff04dde5909f8e2622b
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit7dc64c0a599b8ff04dde5909f8e2622b', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitf9f1dfa2f263ec9b3521e37502b6a255', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit7dc64c0a599b8ff04dde5909f8e2622b', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitf9f1dfa2f263ec9b3521e37502b6a255', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit7dc64c0a599b8ff04dde5909f8e2622b::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitf9f1dfa2f263ec9b3521e37502b6a255::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit7dc64c0a599b8ff04dde5909f8e2622b::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInitf9f1dfa2f263ec9b3521e37502b6a255::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire7dc64c0a599b8ff04dde5909f8e2622b($fileIdentifier, $file);
composerRequiref9f1dfa2f263ec9b3521e37502b6a255($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit7dc64c0a599b8ff04dde5909f8e2622b
* @param string $file
* @return void
*/
function composerRequire7dc64c0a599b8ff04dde5909f8e2622b($fileIdentifier, $file)
function composerRequiref9f1dfa2f263ec9b3521e37502b6a255($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 ComposerStaticInit7dc64c0a599b8ff04dde5909f8e2622b
class ComposerStaticInitf9f1dfa2f263ec9b3521e37502b6a255
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -3889,9 +3889,9 @@ class ComposerStaticInit7dc64c0a599b8ff04dde5909f8e2622b
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit7dc64c0a599b8ff04dde5909f8e2622b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit7dc64c0a599b8ff04dde5909f8e2622b::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit7dc64c0a599b8ff04dde5909f8e2622b::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitf9f1dfa2f263ec9b3521e37502b6a255::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitf9f1dfa2f263ec9b3521e37502b6a255::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInitf9f1dfa2f263ec9b3521e37502b6a255::$classMap;
}, null, ClassLoader::class);
}

View File

@ -2431,12 +2431,12 @@
"source": {
"type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-nette.git",
"reference": "e048bfd229fdccad610177fdc8a53782002487c0"
"reference": "b3c88444703682d98168d99021aadc24a88ea51c"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-nette\/zipball\/e048bfd229fdccad610177fdc8a53782002487c0",
"reference": "e048bfd229fdccad610177fdc8a53782002487c0",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-nette\/zipball\/b3c88444703682d98168d99021aadc24a88ea51c",
"reference": "b3c88444703682d98168d99021aadc24a88ea51c",
"shasum": ""
},
"require": {
@ -2469,7 +2469,7 @@
"symplify\/rule-doc-generator": "^10.2",
"symplify\/vendor-patches": "^10.2"
},
"time": "2022-05-09T08:02:15+00:00",
"time": "2022-05-11T11:53:31+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 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 135530e'), '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 352a13b'), '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 e048bfd'), '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 666c8d7'), '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 642ada3'), '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 7d524c8'));
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 135530e'), '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 352a13b'), '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 b3c8844'), '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 666c8d7'), '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 642ada3'), '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 7d524c8'));
private function __construct()
{
}

View File

@ -9,7 +9,6 @@ use PhpParser\Node\Stmt\ClassMethod;
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo;
use Rector\Core\Rector\AbstractRector;
use Rector\DeadCode\PhpDoc\TagRemover\ParamTagRemover;
use Rector\NodeTypeResolver\Node\AttributeKey;
use Rector\PHPStanStaticTypeMapper\Enum\TypeKind;
use Rector\TypeDeclaration\NodeAnalyzer\ControllerRenderMethodAnalyzer;
use Rector\TypeDeclaration\TypeInferer\ParamTypeInferer;
@ -88,8 +87,7 @@ CODE_SAMPLE
if (!$phpDocInfo instanceof \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfo) {
return null;
}
$scope = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE);
if (!$this->controllerRenderMethodAnalyzer->isRenderMethod($node, $scope)) {
if (!$this->controllerRenderMethodAnalyzer->isRenderMethod($node)) {
return null;
}
// $node->getParams()

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('RectorPrefix20220511\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit7dc64c0a599b8ff04dde5909f8e2622b', false) && !interface_exists('ComposerAutoloaderInit7dc64c0a599b8ff04dde5909f8e2622b', false) && !trait_exists('ComposerAutoloaderInit7dc64c0a599b8ff04dde5909f8e2622b', false)) {
spl_autoload_call('RectorPrefix20220511\ComposerAutoloaderInit7dc64c0a599b8ff04dde5909f8e2622b');
if (!class_exists('ComposerAutoloaderInitf9f1dfa2f263ec9b3521e37502b6a255', false) && !interface_exists('ComposerAutoloaderInitf9f1dfa2f263ec9b3521e37502b6a255', false) && !trait_exists('ComposerAutoloaderInitf9f1dfa2f263ec9b3521e37502b6a255', false)) {
spl_autoload_call('RectorPrefix20220511\ComposerAutoloaderInitf9f1dfa2f263ec9b3521e37502b6a255');
}
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('RectorPrefix20220511\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220511\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire7dc64c0a599b8ff04dde5909f8e2622b')) {
function composerRequire7dc64c0a599b8ff04dde5909f8e2622b() {
return \RectorPrefix20220511\composerRequire7dc64c0a599b8ff04dde5909f8e2622b(...func_get_args());
if (!function_exists('composerRequiref9f1dfa2f263ec9b3521e37502b6a255')) {
function composerRequiref9f1dfa2f263ec9b3521e37502b6a255() {
return \RectorPrefix20220511\composerRequiref9f1dfa2f263ec9b3521e37502b6a255(...func_get_args());
}
}
if (!function_exists('scanPath')) {