From 2a5f710b51431a32e6f794c7100502eb742c2b46 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Mon, 18 Oct 2021 08:52:38 +0000 Subject: [PATCH] Updated Rector to commit adb6e3cd10a628ad262cf12054a17538802c678d https://github.com/rectorphp/rector-src/commit/adb6e3cd10a628ad262cf12054a17538802c678d [Php73] Skip undetected namespaced constant on SensitiveConstantNameRector (#1017) --- .../Expression/DowngradeMatchToSwitchRector.php | 5 +---- src/Application/VersionResolver.php | 4 ++-- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/scoper-autoload.php | 10 +++++----- 6 files changed, 20 insertions(+), 23 deletions(-) diff --git a/rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php b/rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php index 13f8661cdbf..e8133252fe8 100644 --- a/rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php +++ b/rules/DowngradePhp80/Rector/Expression/DowngradeMatchToSwitchRector.php @@ -8,7 +8,6 @@ use PhpParser\Node\Expr; use PhpParser\Node\Expr\ArrayItem; use PhpParser\Node\Expr\Assign; use PhpParser\Node\Expr\Match_; -use PhpParser\Node\Expr\Throw_; use PhpParser\Node\MatchArm; use PhpParser\Node\Stmt; use PhpParser\Node\Stmt\Break_; @@ -144,9 +143,7 @@ CODE_SAMPLE private function createSwitchStmts($node, \PhpParser\Node\MatchArm $matchArm) : array { $stmts = []; - if ($matchArm->body instanceof \PhpParser\Node\Expr\Throw_) { - $stmts[] = new \PhpParser\Node\Stmt\Expression($matchArm->body); - } elseif ($node instanceof \PhpParser\Node\Stmt\Expression) { + if ($node instanceof \PhpParser\Node\Stmt\Expression) { /** @var Assign $assign */ $assign = $node->expr; $stmts[] = new \PhpParser\Node\Stmt\Expression(new \PhpParser\Node\Expr\Assign($assign->var, $matchArm->body)); diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 8a04e546cb0..88cd32980e9 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = '33e5cab8d53facaa6753fc26b755e9ce3634d940'; + public const PACKAGE_VERSION = 'adb6e3cd10a628ad262cf12054a17538802c678d'; /** * @var string */ - public const RELEASE_DATE = '2021-10-18 10:39:54'; + public const RELEASE_DATE = '2021-10-18 10:38:42'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20211018\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index 5d523963065..4a1b34a9a95 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit8193b9e5f56d640c7a2fabeefad87937::getLoader(); +return ComposerAutoloaderInitc5cd63453346b74b173061524bf2fe7d::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index f31546ddeec..53b59dbec4a 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit8193b9e5f56d640c7a2fabeefad87937 +class ComposerAutoloaderInitc5cd63453346b74b173061524bf2fe7d { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInit8193b9e5f56d640c7a2fabeefad87937 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit8193b9e5f56d640c7a2fabeefad87937', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitc5cd63453346b74b173061524bf2fe7d', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInit8193b9e5f56d640c7a2fabeefad87937', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitc5cd63453346b74b173061524bf2fe7d', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit8193b9e5f56d640c7a2fabeefad87937::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitc5cd63453346b74b173061524bf2fe7d::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInit8193b9e5f56d640c7a2fabeefad87937 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit8193b9e5f56d640c7a2fabeefad87937::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitc5cd63453346b74b173061524bf2fe7d::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire8193b9e5f56d640c7a2fabeefad87937($fileIdentifier, $file); + composerRequirec5cd63453346b74b173061524bf2fe7d($fileIdentifier, $file); } return $loader; } } -function composerRequire8193b9e5f56d640c7a2fabeefad87937($fileIdentifier, $file) +function composerRequirec5cd63453346b74b173061524bf2fe7d($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 7c9f9a04255..b1194bd9526 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit8193b9e5f56d640c7a2fabeefad87937 +class ComposerStaticInitc5cd63453346b74b173061524bf2fe7d { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3894,9 +3894,9 @@ class ComposerStaticInit8193b9e5f56d640c7a2fabeefad87937 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit8193b9e5f56d640c7a2fabeefad87937::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit8193b9e5f56d640c7a2fabeefad87937::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit8193b9e5f56d640c7a2fabeefad87937::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitc5cd63453346b74b173061524bf2fe7d::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitc5cd63453346b74b173061524bf2fe7d::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitc5cd63453346b74b173061524bf2fe7d::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 6e099c7b098..1371a5924fd 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -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('RectorPrefix20211018\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInit8193b9e5f56d640c7a2fabeefad87937', false) && !interface_exists('ComposerAutoloaderInit8193b9e5f56d640c7a2fabeefad87937', false) && !trait_exists('ComposerAutoloaderInit8193b9e5f56d640c7a2fabeefad87937', false)) { - spl_autoload_call('RectorPrefix20211018\ComposerAutoloaderInit8193b9e5f56d640c7a2fabeefad87937'); +if (!class_exists('ComposerAutoloaderInitc5cd63453346b74b173061524bf2fe7d', false) && !interface_exists('ComposerAutoloaderInitc5cd63453346b74b173061524bf2fe7d', false) && !trait_exists('ComposerAutoloaderInitc5cd63453346b74b173061524bf2fe7d', false)) { + spl_autoload_call('RectorPrefix20211018\ComposerAutoloaderInitc5cd63453346b74b173061524bf2fe7d'); } 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('RectorPrefix20211018\Helmich\TypoScriptParser\Parser\AST\Statement'); @@ -3306,9 +3306,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20211018\print_node(...func_get_args()); } } -if (!function_exists('composerRequire8193b9e5f56d640c7a2fabeefad87937')) { - function composerRequire8193b9e5f56d640c7a2fabeefad87937() { - return \RectorPrefix20211018\composerRequire8193b9e5f56d640c7a2fabeefad87937(...func_get_args()); +if (!function_exists('composerRequirec5cd63453346b74b173061524bf2fe7d')) { + function composerRequirec5cd63453346b74b173061524bf2fe7d() { + return \RectorPrefix20211018\composerRequirec5cd63453346b74b173061524bf2fe7d(...func_get_args()); } } if (!function_exists('parseArgs')) {