From c89dcb82eafba2f7f0976fb5f62b32616eb02cb9 Mon Sep 17 00:00:00 2001 From: Tomas Votruba Date: Sun, 29 May 2022 20:07:14 +0000 Subject: [PATCH] Updated Rector to commit 366995d6f79a52bf55da5f522979be0f8830d803 https://github.com/rectorphp/rector-src/commit/366995d6f79a52bf55da5f522979be0f8830d803 try cwed --- src/Application/VersionResolver.php | 23 ++++++++++++++++------- vendor/autoload.php | 2 +- vendor/composer/autoload_real.php | 14 +++++++------- vendor/composer/autoload_static.php | 8 ++++---- vendor/scoper-autoload.php | 10 +++++----- 5 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index 1117f6ba279..ec9dc5c9b7a 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -6,7 +6,6 @@ namespace Rector\Core\Application; use DateTime; use Rector\Core\Exception\VersionException; -use Symfony\Component\Console\Command\Command; use Symfony\Component\Process\Process; /** @@ -32,12 +31,21 @@ final class VersionResolver */ private const GIT = 'git'; + /** + * @var int + */ + private const SUCCESS_CODE = 0; + public static function resolvePackageVersion(): string { - // resolve current tag - exec('git tag --points-at', $tagExecOutput, $tagExecResultCode); + // needed to keep exec() in the rector directory, not depending on cwd of run command of scoper + $repositoryDirectory = __DIR__ . '/../..'; - if ($tagExecResultCode !== Command::SUCCESS) { + // resolve current tag + $commandLine = sprintf('cd %s && git tag --points-at', $repositoryDirectory); + exec($commandLine, $tagExecOutput, $tagExecResultCode); + + if ($tagExecResultCode !== self::SUCCESS_CODE) { throw new VersionException( 'Ensure to run compile from composer git repository clone and that git binary is available.' ); @@ -50,9 +58,10 @@ final class VersionResolver } } - exec('git log --pretty="%H" -n1 HEAD', $commitHashExecOutput, $commitHashResultCode); + $commandLine = sprintf('cd %s && git log --pretty="%%H" -n1 HEAD', $repositoryDirectory); + exec($commandLine, $commitHashExecOutput, $commitHashResultCode); - if ($commitHashResultCode !== Command::SUCCESS) { + if ($commitHashResultCode !== 0) { throw new VersionException( 'Ensure to run compile from composer git repository clone and that git binary is available.' ); @@ -65,7 +74,7 @@ final class VersionResolver public static function resolverReleaseDateTime(): DateTime { $process = new Process([self::GIT, 'log', '-n1', '--pretty=%ci', 'HEAD'], __DIR__); - if ($process->run() !== Command::SUCCESS) { + if ($process->run() !== 0) { throw new VersionException( 'You must ensure to run compile from composer git repository clone and that git binary is available.' ); diff --git a/vendor/autoload.php b/vendor/autoload.php index 6f8bf9d1115..509c160c49f 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInit6a33387800a3c0a4a0fa933c1b7150f9::getLoader(); +return ComposerAutoloaderInit5df94a6b072062fca542af4e0f0cfef7::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 03046448865..6922394634a 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInit6a33387800a3c0a4a0fa933c1b7150f9 +class ComposerAutoloaderInit5df94a6b072062fca542af4e0f0cfef7 { private static $loader; @@ -22,19 +22,19 @@ class ComposerAutoloaderInit6a33387800a3c0a4a0fa933c1b7150f9 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInit6a33387800a3c0a4a0fa933c1b7150f9', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit5df94a6b072062fca542af4e0f0cfef7', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInit6a33387800a3c0a4a0fa933c1b7150f9', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit5df94a6b072062fca542af4e0f0cfef7', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInit6a33387800a3c0a4a0fa933c1b7150f9::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit5df94a6b072062fca542af4e0f0cfef7::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); - $includeFiles = \Composer\Autoload\ComposerStaticInit6a33387800a3c0a4a0fa933c1b7150f9::$files; + $includeFiles = \Composer\Autoload\ComposerStaticInit5df94a6b072062fca542af4e0f0cfef7::$files; foreach ($includeFiles as $fileIdentifier => $file) { - composerRequire6a33387800a3c0a4a0fa933c1b7150f9($fileIdentifier, $file); + composerRequire5df94a6b072062fca542af4e0f0cfef7($fileIdentifier, $file); } return $loader; @@ -46,7 +46,7 @@ class ComposerAutoloaderInit6a33387800a3c0a4a0fa933c1b7150f9 * @param string $file * @return void */ -function composerRequire6a33387800a3c0a4a0fa933c1b7150f9($fileIdentifier, $file) +function composerRequire5df94a6b072062fca542af4e0f0cfef7($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 71fd788f350..7b2f2672a93 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit6a33387800a3c0a4a0fa933c1b7150f9 +class ComposerStaticInit5df94a6b072062fca542af4e0f0cfef7 { public static $files = array ( '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php', @@ -3850,9 +3850,9 @@ class ComposerStaticInit6a33387800a3c0a4a0fa933c1b7150f9 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit6a33387800a3c0a4a0fa933c1b7150f9::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit6a33387800a3c0a4a0fa933c1b7150f9::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInit6a33387800a3c0a4a0fa933c1b7150f9::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit5df94a6b072062fca542af4e0f0cfef7::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit5df94a6b072062fca542af4e0f0cfef7::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInit5df94a6b072062fca542af4e0f0cfef7::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index 80a15c76e09..2cf7b778c59 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('RectorPrefix20220529\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInit6a33387800a3c0a4a0fa933c1b7150f9', false) && !interface_exists('ComposerAutoloaderInit6a33387800a3c0a4a0fa933c1b7150f9', false) && !trait_exists('ComposerAutoloaderInit6a33387800a3c0a4a0fa933c1b7150f9', false)) { - spl_autoload_call('RectorPrefix20220529\ComposerAutoloaderInit6a33387800a3c0a4a0fa933c1b7150f9'); +if (!class_exists('ComposerAutoloaderInit5df94a6b072062fca542af4e0f0cfef7', false) && !interface_exists('ComposerAutoloaderInit5df94a6b072062fca542af4e0f0cfef7', false) && !trait_exists('ComposerAutoloaderInit5df94a6b072062fca542af4e0f0cfef7', false)) { + spl_autoload_call('RectorPrefix20220529\ComposerAutoloaderInit5df94a6b072062fca542af4e0f0cfef7'); } 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('RectorPrefix20220529\Helmich\TypoScriptParser\Parser\AST\Statement'); @@ -59,9 +59,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20220529\print_node(...func_get_args()); } } -if (!function_exists('composerRequire6a33387800a3c0a4a0fa933c1b7150f9')) { - function composerRequire6a33387800a3c0a4a0fa933c1b7150f9() { - return \RectorPrefix20220529\composerRequire6a33387800a3c0a4a0fa933c1b7150f9(...func_get_args()); +if (!function_exists('composerRequire5df94a6b072062fca542af4e0f0cfef7')) { + function composerRequire5df94a6b072062fca542af4e0f0cfef7() { + return \RectorPrefix20220529\composerRequire5df94a6b072062fca542af4e0f0cfef7(...func_get_args()); } } if (!function_exists('scanPath')) {