Updated Rector to commit 93b63b0a86e26cb9d15bcc61c3d840f703a1472c

93b63b0a86 [Php54][Php80] Handle no scope on LongArrayToShortArrayRector+AnnotationToAttributeRector (#2749)
This commit is contained in:
Tomas Votruba
2022-08-09 20:46:41 +00:00
parent 3d35b64c2e
commit dce47c75f3
9 changed files with 32 additions and 29 deletions

View File

@ -17,12 +17,12 @@ final class VersionResolver
* @api * @api
* @var string * @var string
*/ */
public const PACKAGE_VERSION = 'a80b3d359f321c0211d5d1aa36cdc265ec40af93'; public const PACKAGE_VERSION = '93b63b0a86e26cb9d15bcc61c3d840f703a1472c';
/** /**
* @api * @api
* @var string * @var string
*/ */
public const RELEASE_DATE = '2022-08-09 22:32:12'; public const RELEASE_DATE = '2022-08-09 22:41:26';
/** /**
* @var int * @var int
*/ */

View File

@ -31,6 +31,9 @@ final class ScopeAnalyzer
return \false; return \false;
} }
$parentNode = $node->getAttribute(AttributeKey::PARENT_NODE); $parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
return !$parentNode instanceof Node; if (!$parentNode instanceof Node) {
return \true;
}
return !$this->hasScope($parentNode);
} }
} }

2
vendor/autoload.php vendored
View File

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

View File

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

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInit5d187923c8dab1285c58b9078e458c85 class ComposerStaticInitc7565282728fbff9932fcad4a0741948
{ {
public static $files = array ( public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@ -3251,9 +3251,9 @@ class ComposerStaticInit5d187923c8dab1285c58b9078e458c85
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit5d187923c8dab1285c58b9078e458c85::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInitc7565282728fbff9932fcad4a0741948::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5d187923c8dab1285c58b9078e458c85::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInitc7565282728fbff9932fcad4a0741948::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5d187923c8dab1285c58b9078e458c85::$classMap; $loader->classMap = ComposerStaticInitc7565282728fbff9932fcad4a0741948::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }

View File

@ -1852,12 +1852,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git", "url": "https:\/\/github.com\/rectorphp\/rector-doctrine.git",
"reference": "d6ae1b14e6b54e3d0ae2f89842ea0f0c341384a9" "reference": "9781e776f068243ffb025f3d1346723cee7a2143"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/d6ae1b14e6b54e3d0ae2f89842ea0f0c341384a9", "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-doctrine\/zipball\/9781e776f068243ffb025f3d1346723cee7a2143",
"reference": "d6ae1b14e6b54e3d0ae2f89842ea0f0c341384a9", "reference": "9781e776f068243ffb025f3d1346723cee7a2143",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1882,7 +1882,7 @@
"symplify\/rule-doc-generator": "^11.0", "symplify\/rule-doc-generator": "^11.0",
"symplify\/vendor-patches": "^11.0" "symplify\/vendor-patches": "^11.0"
}, },
"time": "2022-08-09T19:20:01+00:00", "time": "2022-08-09T20:37:56+00:00",
"default-branch": true, "default-branch": true,
"type": "rector-extension", "type": "rector-extension",
"extra": { "extra": {
@ -1909,7 +1909,7 @@
"description": "Rector upgrades rules for Doctrine", "description": "Rector upgrades rules for Doctrine",
"support": { "support": {
"issues": "https:\/\/github.com\/rectorphp\/rector-doctrine\/issues", "issues": "https:\/\/github.com\/rectorphp\/rector-doctrine\/issues",
"source": "https:\/\/github.com\/rectorphp\/rector-doctrine\/tree\/0.11.42" "source": "https:\/\/github.com\/rectorphp\/rector-doctrine\/tree\/0.13.0"
}, },
"install-path": "..\/rector\/rector-doctrine" "install-path": "..\/rector\/rector-doctrine"
}, },
@ -2130,12 +2130,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https:\/\/github.com\/rectorphp\/rector-phpoffice.git", "url": "https:\/\/github.com\/rectorphp\/rector-phpoffice.git",
"reference": "ad7cfce089576330f59a5512768d7eb43a4bd55e" "reference": "3638a6672dab07562bc4dd1bd0c18ced6763d0c2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpoffice\/zipball\/ad7cfce089576330f59a5512768d7eb43a4bd55e", "url": "https:\/\/api.github.com\/repos\/rectorphp\/rector-phpoffice\/zipball\/3638a6672dab07562bc4dd1bd0c18ced6763d0c2",
"reference": "ad7cfce089576330f59a5512768d7eb43a4bd55e", "reference": "3638a6672dab07562bc4dd1bd0c18ced6763d0c2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -2159,7 +2159,7 @@
"symplify\/rule-doc-generator": "^11.0.8", "symplify\/rule-doc-generator": "^11.0.8",
"symplify\/vendor-patches": "^11.0.8" "symplify\/vendor-patches": "^11.0.8"
}, },
"time": "2022-07-22T19:01:00+00:00", "time": "2022-08-09T20:40:27+00:00",
"default-branch": true, "default-branch": true,
"type": "rector-extension", "type": "rector-extension",
"extra": { "extra": {
@ -2186,7 +2186,7 @@
"description": "Rector upgrades rules for PHP Office", "description": "Rector upgrades rules for PHP Office",
"support": { "support": {
"issues": "https:\/\/github.com\/rectorphp\/rector-phpoffice\/issues", "issues": "https:\/\/github.com\/rectorphp\/rector-phpoffice\/issues",
"source": "https:\/\/github.com\/rectorphp\/rector-phpoffice\/tree\/main" "source": "https:\/\/github.com\/rectorphp\/rector-phpoffice\/tree\/0.13.2"
}, },
"install-path": "..\/rector\/rector-phpoffice" "install-path": "..\/rector\/rector-phpoffice"
}, },

File diff suppressed because one or more lines are too long

View File

@ -9,7 +9,7 @@ namespace Rector\RectorInstaller;
*/ */
final class GeneratedConfig 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 d6ae1b1'), '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 7ee4e58'), '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 ad7cfce'), '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 528d313'), '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 f88fb13')); 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 9781e77'), '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 7ee4e58'), '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 528d313'), '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 f88fb13'));
private function __construct() private function __construct()
{ {
} }

View File

@ -126,8 +126,8 @@ final class IssetDimFetchCleaner
} }
private function isRequiredIsset(Isset_ $isset, If_ $if) : bool private function isRequiredIsset(Isset_ $isset, If_ $if) : bool
{ {
$issetParent = $isset->getAttribute(AttributeKey::PARENT_NODE); $parrentNode = $isset->getAttribute(AttributeKey::PARENT_NODE);
if (!$issetParent instanceof BooleanNot) { if (!$parrentNode instanceof BooleanNot) {
return \false; return \false;
} }
return $this->betterNodeFinder->hasInstancesOf($if->stmts, [Throw_::class, ThrowStmt::class]); return $this->betterNodeFinder->hasInstancesOf($if->stmts, [Throw_::class, ThrowStmt::class]);