From 1601ba78b80ec94666e9d95d2decbb8c59de0a9c Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Tue, 10 Aug 2021 09:59:44 +0000 Subject: [PATCH] Updated Rector to commit 0a0af8c0e0140427dca9ea182b1a350b8cacc443 https://github.com/rectorphp/rector-src/commit/0a0af8c0e0140427dca9ea182b1a350b8cacc443 [Core] Handle printParsedStmstAndTokens on isDryRun disabled with blades format (#636) --- src/Application/VersionResolver.php | 4 ++-- src/PhpParser/Printer/FormatPerservingPrinter.php | 3 ++- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/scoper-autoload.php | 10 +++++----- 6 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index c06b892d45f..07f9c52fd52 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = '028dcb15e4ce3af9a1651b25a9d945ba962907f1'; + public const PACKAGE_VERSION = '0a0af8c0e0140427dca9ea182b1a350b8cacc443'; /** * @var string */ - public const RELEASE_DATE = '2021-08-10 09:00:44'; + public const RELEASE_DATE = '2021-08-10 09:45:47'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20210810\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/src/PhpParser/Printer/FormatPerservingPrinter.php b/src/PhpParser/Printer/FormatPerservingPrinter.php index 60a4b862c54..8a78d6458e2 100644 --- a/src/PhpParser/Printer/FormatPerservingPrinter.php +++ b/src/PhpParser/Printer/FormatPerservingPrinter.php @@ -46,7 +46,8 @@ final class FormatPerservingPrinter } public function printParsedStmstAndTokens(\Rector\Core\ValueObject\Application\File $file) : string { - return $this->printToFile($file->getSmartFileInfo(), $file->getNewStmts(), $file->getOldStmts(), $file->getOldTokens()); + $newStmts = $this->resolveNewStmts($file); + return $this->printToFile($file->getSmartFileInfo(), $newStmts, $file->getOldStmts(), $file->getOldTokens()); } /** * @return Stmt[]|mixed[] diff --git a/vendor/autoload.php b/vendor/autoload.php index 12565c5d5f4..3c4ede57a9e 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit987d14e065d6387463191932df1726f3::getLoader(); +return ComposerAutoloaderInitfbd7c5add9d8138f9f672e62d43f427f::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 4c972f92e6e..94503a045a6 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit987d14e065d6387463191932df1726f3 +class ComposerAutoloaderInitfbd7c5add9d8138f9f672e62d43f427f { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInit987d14e065d6387463191932df1726f3 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit987d14e065d6387463191932df1726f3', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitfbd7c5add9d8138f9f672e62d43f427f', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInit987d14e065d6387463191932df1726f3', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitfbd7c5add9d8138f9f672e62d43f427f', '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\ComposerStaticInit987d14e065d6387463191932df1726f3::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitfbd7c5add9d8138f9f672e62d43f427f::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInit987d14e065d6387463191932df1726f3 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit987d14e065d6387463191932df1726f3::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitfbd7c5add9d8138f9f672e62d43f427f::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire987d14e065d6387463191932df1726f3($fileIdentifier, $file); + composerRequirefbd7c5add9d8138f9f672e62d43f427f($fileIdentifier, $file); } return $loader; } } -function composerRequire987d14e065d6387463191932df1726f3($fileIdentifier, $file) +function composerRequirefbd7c5add9d8138f9f672e62d43f427f($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 9d3cd66f9a9..dad7016a90d 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit987d14e065d6387463191932df1726f3 +class ComposerStaticInitfbd7c5add9d8138f9f672e62d43f427f { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3849,9 +3849,9 @@ class ComposerStaticInit987d14e065d6387463191932df1726f3 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit987d14e065d6387463191932df1726f3::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit987d14e065d6387463191932df1726f3::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit987d14e065d6387463191932df1726f3::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitfbd7c5add9d8138f9f672e62d43f427f::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitfbd7c5add9d8138f9f672e62d43f427f::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitfbd7c5add9d8138f9f672e62d43f427f::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index f7de7a203a6..26fb9cdd0a7 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('RectorPrefix20210810\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInit987d14e065d6387463191932df1726f3', false) && !interface_exists('ComposerAutoloaderInit987d14e065d6387463191932df1726f3', false) && !trait_exists('ComposerAutoloaderInit987d14e065d6387463191932df1726f3', false)) { - spl_autoload_call('RectorPrefix20210810\ComposerAutoloaderInit987d14e065d6387463191932df1726f3'); +if (!class_exists('ComposerAutoloaderInitfbd7c5add9d8138f9f672e62d43f427f', false) && !interface_exists('ComposerAutoloaderInitfbd7c5add9d8138f9f672e62d43f427f', false) && !trait_exists('ComposerAutoloaderInitfbd7c5add9d8138f9f672e62d43f427f', false)) { + spl_autoload_call('RectorPrefix20210810\ComposerAutoloaderInitfbd7c5add9d8138f9f672e62d43f427f'); } if (!class_exists('AjaxLogin', false) && !interface_exists('AjaxLogin', false) && !trait_exists('AjaxLogin', false)) { spl_autoload_call('RectorPrefix20210810\AjaxLogin'); @@ -3305,9 +3305,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20210810\print_node(...func_get_args()); } } -if (!function_exists('composerRequire987d14e065d6387463191932df1726f3')) { - function composerRequire987d14e065d6387463191932df1726f3() { - return \RectorPrefix20210810\composerRequire987d14e065d6387463191932df1726f3(...func_get_args()); +if (!function_exists('composerRequirefbd7c5add9d8138f9f672e62d43f427f')) { + function composerRequirefbd7c5add9d8138f9f672e62d43f427f() { + return \RectorPrefix20210810\composerRequirefbd7c5add9d8138f9f672e62d43f427f(...func_get_args()); } } if (!function_exists('parseArgs')) {