From f9b27deac8145aeec1f0805178610093561f038d Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 20 Jun 2021 12:00:42 +0000 Subject: [PATCH] Updated Rector to commit d0e6a3bda67bfbf7f44b0fbec81ac592654726d6 https://github.com/rectorphp/rector-src/commit/d0e6a3bda67bfbf7f44b0fbec81ac592654726d6 [Core] Early assign ->getPathname() to variable for RemovedAndAddedFilesCollector::isFileRemoved() (#256) --- .github/workflows/publish_docker_images.yaml | 8 -------- .../FileSystem/RemovedAndAddedFilesCollector.php | 6 +++++- 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 +++++----- 7 files changed, 24 insertions(+), 28 deletions(-) diff --git a/.github/workflows/publish_docker_images.yaml b/.github/workflows/publish_docker_images.yaml index 75b2c65d9ae..d40be47eb91 100644 --- a/.github/workflows/publish_docker_images.yaml +++ b/.github/workflows/publish_docker_images.yaml @@ -29,14 +29,6 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - name: Update DockerHub overview - uses: peter-evans/dockerhub-description@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - repository: rector/rector - readme-filepath: ./docs/how_to_run_rector_in_docker.md - - name: Build images run: | DOCKER_TAGS="" diff --git a/src/Application/FileSystem/RemovedAndAddedFilesCollector.php b/src/Application/FileSystem/RemovedAndAddedFilesCollector.php index d346445c15e..f4b0cb8ce5f 100644 --- a/src/Application/FileSystem/RemovedAndAddedFilesCollector.php +++ b/src/Application/FileSystem/RemovedAndAddedFilesCollector.php @@ -30,8 +30,12 @@ final class RemovedAndAddedFilesCollector } public function isFileRemoved(\Symplify\SmartFileSystem\SmartFileInfo $smartFileInfo) : bool { + if ($this->removedFileInfos === []) { + return \false; + } + $pathname = $smartFileInfo->getPathname(); foreach ($this->removedFileInfos as $removedFileInfo) { - if ($removedFileInfo->getPathname() !== $smartFileInfo->getPathname()) { + if ($removedFileInfo->getPathname() !== $pathname) { continue; } return \true; diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index e5db6d5215d..5a686571c09 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = 'dc1d8625a1086779b8c235564128f214e0e1ee55'; + public const PACKAGE_VERSION = 'd0e6a3bda67bfbf7f44b0fbec81ac592654726d6'; /** * @var string */ - public const RELEASE_DATE = '2021-06-20 09:48:11'; + public const RELEASE_DATE = '2021-06-20 18:50:38'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20210620\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/vendor/autoload.php b/vendor/autoload.php index b3fe0118898..4b11fc6a7d5 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit80b5dee66b7c9e7cf8f48cd66046d004::getLoader(); +return ComposerAutoloaderInit89cfb7ae82a8dee409ae1d5957151652::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 4d8c9c2b686..0ad14929b0a 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit80b5dee66b7c9e7cf8f48cd66046d004 +class ComposerAutoloaderInit89cfb7ae82a8dee409ae1d5957151652 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInit80b5dee66b7c9e7cf8f48cd66046d004 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit80b5dee66b7c9e7cf8f48cd66046d004', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit89cfb7ae82a8dee409ae1d5957151652', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInit80b5dee66b7c9e7cf8f48cd66046d004', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit89cfb7ae82a8dee409ae1d5957151652', '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\ComposerStaticInit80b5dee66b7c9e7cf8f48cd66046d004::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit89cfb7ae82a8dee409ae1d5957151652::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInit80b5dee66b7c9e7cf8f48cd66046d004 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInit80b5dee66b7c9e7cf8f48cd66046d004::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit89cfb7ae82a8dee409ae1d5957151652::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire80b5dee66b7c9e7cf8f48cd66046d004($fileIdentifier, $file); + composerRequire89cfb7ae82a8dee409ae1d5957151652($fileIdentifier, $file); } return $loader; } } -function composerRequire80b5dee66b7c9e7cf8f48cd66046d004($fileIdentifier, $file) +function composerRequire89cfb7ae82a8dee409ae1d5957151652($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 e0f140ed45a..640da5de5ee 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit80b5dee66b7c9e7cf8f48cd66046d004 +class ComposerStaticInit89cfb7ae82a8dee409ae1d5957151652 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -3871,9 +3871,9 @@ class ComposerStaticInit80b5dee66b7c9e7cf8f48cd66046d004 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit80b5dee66b7c9e7cf8f48cd66046d004::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit80b5dee66b7c9e7cf8f48cd66046d004::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit80b5dee66b7c9e7cf8f48cd66046d004::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit89cfb7ae82a8dee409ae1d5957151652::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit89cfb7ae82a8dee409ae1d5957151652::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit89cfb7ae82a8dee409ae1d5957151652::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 6f96b03e64c..9cef441e1b6 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -21,8 +21,8 @@ if (!class_exists('SomeTestCase', false) && !interface_exists('SomeTestCase', fa if (!class_exists('CheckoutEntityFactory', false) && !interface_exists('CheckoutEntityFactory', false) && !trait_exists('CheckoutEntityFactory', false)) { spl_autoload_call('RectorPrefix20210620\CheckoutEntityFactory'); } -if (!class_exists('ComposerAutoloaderInit80b5dee66b7c9e7cf8f48cd66046d004', false) && !interface_exists('ComposerAutoloaderInit80b5dee66b7c9e7cf8f48cd66046d004', false) && !trait_exists('ComposerAutoloaderInit80b5dee66b7c9e7cf8f48cd66046d004', false)) { - spl_autoload_call('RectorPrefix20210620\ComposerAutoloaderInit80b5dee66b7c9e7cf8f48cd66046d004'); +if (!class_exists('ComposerAutoloaderInit89cfb7ae82a8dee409ae1d5957151652', false) && !interface_exists('ComposerAutoloaderInit89cfb7ae82a8dee409ae1d5957151652', false) && !trait_exists('ComposerAutoloaderInit89cfb7ae82a8dee409ae1d5957151652', false)) { + spl_autoload_call('RectorPrefix20210620\ComposerAutoloaderInit89cfb7ae82a8dee409ae1d5957151652'); } if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) { spl_autoload_call('RectorPrefix20210620\Doctrine\Inflector\Inflector'); @@ -3323,9 +3323,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20210620\print_node(...func_get_args()); } } -if (!function_exists('composerRequire80b5dee66b7c9e7cf8f48cd66046d004')) { - function composerRequire80b5dee66b7c9e7cf8f48cd66046d004() { - return \RectorPrefix20210620\composerRequire80b5dee66b7c9e7cf8f48cd66046d004(...func_get_args()); +if (!function_exists('composerRequire89cfb7ae82a8dee409ae1d5957151652')) { + function composerRequire89cfb7ae82a8dee409ae1d5957151652() { + return \RectorPrefix20210620\composerRequire89cfb7ae82a8dee409ae1d5957151652(...func_get_args()); } } if (!function_exists('parseArgs')) {