octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-06-27 21:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 0f67baaea0

Browse Source 
7e575a7ce0 [Parallel] Using RectorConfigsResolver to use set bootstrap config 0f67baaea0 Merge pull request #1637 from rectorphp/bootstrap-config
This commit is contained in:
Tomas Votruba 2022-01-04 22:51:50 +00:00
parent 74a8bc1aba
commit aa590a1dc3
11 changed files with 66 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Parallel/Command/WorkerCommandLineFactory.php
View File

@ -74,10 +74,6 @@ final class WorkerCommandLineFactory
// disable colors, breaks json_decode() otherwise
// @see https://github.com/symfony/symfony/issues/1238
$workerCommandArray[] = '--no-ansi';
if ($input->hasOption(\Rector\Core\Configuration\Option::CONFIG)) {
$workerCommandArray[] = '--config';
$workerCommandArray[] = $input->getOption(\Rector\Core\Configuration\Option::CONFIG);
}
return \implode(' ', $workerCommandArray);
}
private function shouldSkipOption(\RectorPrefix20220104\Symfony\Component\Console\Input\InputInterface $input, string $optionName) : bool

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'a66be5920506820182d0208d20f02e5e8a4096d7';
public const PACKAGE_VERSION = '0f67baaea03e4e012a0d0d08bb644e42164b8b79';
/**
* @var string
*/
public const RELEASE_DATE = '2022-01-05 01:20:57';
public const RELEASE_DATE = '2022-01-05 05:44:30';
public static function resolvePackageVersion() : string
{
$process = new \RectorPrefix20220104\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);

4
src/Configuration/ConfigurationFactory.php
View File

@ -4,6 +4,7 @@ declare (strict_types=1);
namespace Rector\Core\Configuration;
use Rector\ChangesReporting\Output\ConsoleOutputFormatter;
use Rector\Core\Bootstrap\RectorConfigsResolver;
use Rector\Core\ValueObject\Configuration;
use RectorPrefix20220104\Symfony\Component\Console\Input\InputInterface;
use RectorPrefix20220104\Symfony\Component\Console\Style\SymfonyStyle;
@ -48,7 +49,8 @@ final class ConfigurationFactory
$isParallel = $this->parameterProvider->provideBoolParameter(\Rector\Core\Configuration\Option::PARALLEL);
$parallelPort = (string) $input->getOption(\Rector\Core\Configuration\Option::PARALLEL_PORT);
$parallelIdentifier = (string) $input->getOption(\Rector\Core\Configuration\Option::PARALLEL_IDENTIFIER);
return new \Rector\Core\ValueObject\Configuration($isDryRun, $showProgressBar, $shouldClearCache, $outputFormat, $fileExtensions, $paths, $showDiffs, null, $parallelPort, $parallelIdentifier, $isParallel);
$rectorConfigsResolver = new \Rector\Core\Bootstrap\RectorConfigsResolver();
return new \Rector\Core\ValueObject\Configuration($isDryRun, $showProgressBar, $shouldClearCache, $outputFormat, $fileExtensions, $paths, $showDiffs, $rectorConfigsResolver->provide(), $parallelPort, $parallelIdentifier, $isParallel);
}
private function shouldShowProgressBar(\RectorPrefix20220104\Symfony\Component\Console\Input\InputInterface $input, string $outputFormat) : bool
{

2
vendor/autoload.php vendored
View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a::getLoader();
return ComposerAutoloaderInit40763ed52784837d4ca25dce00e166d7::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a
class ComposerAutoloaderInit40763ed52784837d4ca25dce00e166d7
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit40763ed52784837d4ca25dce00e166d7', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
spl_autoload_unregister(array('ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit40763ed52784837d4ca25dce00e166d7', '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\ComposerStaticInit61b8a44af15b3e9199577c335425602a::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit40763ed52784837d4ca25dce00e166d7::getInitializer($loader));
} else {
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
@ -42,12 +42,12 @@ class ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit61b8a44af15b3e9199577c335425602a::$files;
$includeFiles = Composer\Autoload\ComposerStaticInit40763ed52784837d4ca25dce00e166d7::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire61b8a44af15b3e9199577c335425602a($fileIdentifier, $file);
composerRequire40763ed52784837d4ca25dce00e166d7($fileIdentifier, $file);
}
return $loader;
@ -59,7 +59,7 @@ class ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a
* @param string $file
* @return void
*/
function composerRequire61b8a44af15b3e9199577c335425602a($fileIdentifier, $file)
function composerRequire40763ed52784837d4ca25dce00e166d7($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

8
vendor/composer/autoload_static.php vendored
View File

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

14
vendor/composer/installed.json vendored
View File

@ -227,17 +227,17 @@
},
{
"name": "composer\/xdebug-handler",
"version": "2.0.3",
"version_normalized": "2.0.3.0",
"version": "2.0.4",
"version_normalized": "2.0.4.0",
"source": {
"type": "git",
"url": "https:\/\/github.com\/composer\/xdebug-handler.git",
"reference": "6555461e76962fd0379c444c46fd558a0fcfb65e"
"reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a"
},
"dist": {
"type": "zip",
"url": "https:\/\/api.github.com\/repos\/composer\/xdebug-handler\/zipball\/6555461e76962fd0379c444c46fd558a0fcfb65e",
"reference": "6555461e76962fd0379c444c46fd558a0fcfb65e",
"url": "https:\/\/api.github.com\/repos\/composer\/xdebug-handler\/zipball\/0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
"reference": "0c1a3925ec58a4ec98e992b9c7d171e9e184be0a",
"shasum": ""
},
"require": {
@ -250,7 +250,7 @@
"phpstan\/phpstan-strict-rules": "^1.1",
"symfony\/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
},
"time": "2021-12-08T13:07:32+00:00",
"time": "2022-01-04T17:06:45+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@ -276,7 +276,7 @@
"support": {
"irc": "irc:\/\/irc.freenode.org\/composer",
"issues": "https:\/\/github.com\/composer\/xdebug-handler\/issues",
"source": "https:\/\/github.com\/composer\/xdebug-handler\/tree\/2.0.3"
"source": "https:\/\/github.com\/composer\/xdebug-handler\/tree\/2.0.4"
},
"funding": [
{

2
vendor/composer/installed.php vendored
View File

File diff suppressed because one or more lines are too long

6
vendor/composer/xdebug-handler/CHANGELOG.md vendored
View File

@ -1,5 +1,8 @@
## [Unreleased]
## [2.0.4] - 2022-01-04
* Fixed: allow calling `isXdebugActive` before class instantiation.
## [2.0.3] - 2021-12-08
* Added: support, type annotations and refactoring for stricter PHPStan analysis.
@ -94,7 +97,8 @@
* Break: the following class was renamed:
- `Composer\XdebugHandler` -> `Composer\XdebugHandler\XdebugHandler`
[Unreleased]: https://github.com/composer/xdebug-handler/compare/2.0.3...HEAD
[Unreleased]: https://github.com/composer/xdebug-handler/compare/2.0.4...HEAD
[2.0.4]: https://github.com/composer/xdebug-handler/compare/2.0.3...2.0.4
[2.0.3]: https://github.com/composer/xdebug-handler/compare/2.0.2...2.0.3
[2.0.2]: https://github.com/composer/xdebug-handler/compare/2.0.1...2.0.2
[2.0.1]: https://github.com/composer/xdebug-handler/compare/2.0.0...2.0.1

57
vendor/composer/xdebug-handler/src/XdebugHandler.php vendored
View File

@ -34,6 +34,10 @@ class XdebugHandler
private static $skipped;
/** @var bool */
private static $xdebugActive;
/** @var string|null */
private static $xdebugMode;
/** @var string|null */
private static $xdebugVersion;
/** @var bool */
private $cli;
/** @var string|null */
@ -42,10 +46,6 @@ class XdebugHandler
private $envAllowXdebug;
/** @var string */
private $envOriginalInis;
/** @var string|null */
private $loaded;
/** @var string|null */
private $mode;
/** @var bool */
private $persistent;
/** @var string|null */
@ -70,12 +70,7 @@ class XdebugHandler
self::$name = \strtoupper($envPrefix);
$this->envAllowXdebug = self::$name . self::SUFFIX_ALLOW;
$this->envOriginalInis = self::$name . self::SUFFIX_INIS;
if (\extension_loaded('xdebug')) {
$version = \phpversion('xdebug');
$this->loaded = $version !== \false ? $version : 'unknown';
$this->mode = $this->getXdebugMode($this->loaded);
}
self::$xdebugActive = $this->loaded !== null && $this->mode !== 'off';
self::setXdebugDetails();
self::$inRestart = \false;
if ($this->cli = \PHP_SAPI === 'cli') {
$this->debug = (string) \getenv(self::DEBUG);
@ -127,7 +122,7 @@ class XdebugHandler
*/
public function check()
{
$this->notify(\RectorPrefix20220104\Composer\XdebugHandler\Status::CHECK, $this->loaded . '|' . $this->mode);
$this->notify(\RectorPrefix20220104\Composer\XdebugHandler\Status::CHECK, self::$xdebugVersion . '|' . self::$xdebugMode);
$envArgs = \explode('|', (string) \getenv($this->envAllowXdebug));
if (!(bool) $envArgs[0] && $this->requiresRestart(self::$xdebugActive)) {
// Restart required
@ -143,7 +138,7 @@ class XdebugHandler
$this->notify(\RectorPrefix20220104\Composer\XdebugHandler\Status::RESTARTED);
\RectorPrefix20220104\Composer\XdebugHandler\Process::setEnv($this->envAllowXdebug);
self::$inRestart = \true;
if ($this->loaded === null) {
if (self::$xdebugVersion === null) {
// Skipped version is only set if Xdebug is not loaded
self::$skipped = $envArgs[1];
}
@ -218,6 +213,7 @@ class XdebugHandler
*/
public static function isXdebugActive()
{
self::setXdebugDetails();
return self::$xdebugActive;
}
/**
@ -408,7 +404,7 @@ class XdebugHandler
}
}
// Flag restarted process and save values for it to use
$envArgs = array(self::RESTART_ID, $this->loaded, (int) $scannedInis, \false === $scanDir ? '*' : $scanDir, \false === $phprc ? '*' : $phprc);
$envArgs = array(self::RESTART_ID, self::$xdebugVersion, (int) $scannedInis, \false === $scanDir ? '*' : $scanDir, \false === $phprc ? '*' : $phprc);
return \putenv($this->envAllowXdebug . '=' . \implode('|', $envArgs));
}
/**
@ -576,34 +572,43 @@ class XdebugHandler
}
}
/**
* Returns the Xdebug mode if available
* Sets static properties $xdebugActive, $xdebugVersion and $xdebugMode
*
* @param string $version
*
* @return string|null
* @return void
*/
private function getXdebugMode($version)
private static function setXdebugDetails()
{
if (\version_compare($version, '3.1', '>=')) {
if (self::$xdebugActive !== null) {
return;
}
self::$xdebugActive = \false;
if (!\extension_loaded('xdebug')) {
return;
}
$version = \phpversion('xdebug');
self::$xdebugVersion = $version !== \false ? $version : 'unknown';
if (\version_compare(self::$xdebugVersion, '3.1', '>=')) {
$modes = \xdebug_info('mode');
return \count($modes) === 0 ? 'off' : \implode(',', $modes);
self::$xdebugMode = \count($modes) === 0 ? 'off' : \implode(',', $modes);
self::$xdebugActive = self::$xdebugMode !== 'off';
return;
}
// See if xdebug.mode is supported in this version
$iniMode = \ini_get('xdebug.mode');
if ($iniMode === \false) {
return null;
return;
}
// Environment value wins but cannot be empty
$envMode = (string) \getenv('XDEBUG_MODE');
if ($envMode !== '') {
$mode = $envMode;
self::$xdebugMode = $envMode;
} else {
$mode = $iniMode !== '' ? $iniMode : 'off';
self::$xdebugMode = $iniMode !== '' ? $iniMode : 'off';
}
// An empty comma-separated list is treated as mode 'off'
if (\RectorPrefix20220104\Composer\Pcre\Preg::isMatch('/^,+$/', \str_replace(' ', '', $mode))) {
$mode = 'off';
if (\RectorPrefix20220104\Composer\Pcre\Preg::isMatch('/^,+$/', \str_replace(' ', '', self::$xdebugMode))) {
self::$xdebugMode = 'off';
}
return $mode;
self::$xdebugActive = self::$xdebugMode !== 'off';
}
}

10
vendor/scoper-autoload.php vendored
View File

@ -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('RectorPrefix20220104\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a', false) && !interface_exists('ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a', false) && !trait_exists('ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a', false)) {
spl_autoload_call('RectorPrefix20220104\ComposerAutoloaderInit61b8a44af15b3e9199577c335425602a');
if (!class_exists('ComposerAutoloaderInit40763ed52784837d4ca25dce00e166d7', false) && !interface_exists('ComposerAutoloaderInit40763ed52784837d4ca25dce00e166d7', false) && !trait_exists('ComposerAutoloaderInit40763ed52784837d4ca25dce00e166d7', false)) {
spl_autoload_call('RectorPrefix20220104\ComposerAutoloaderInit40763ed52784837d4ca25dce00e166d7');
}
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('RectorPrefix20220104\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -66,9 +66,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220104\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire61b8a44af15b3e9199577c335425602a')) {
function composerRequire61b8a44af15b3e9199577c335425602a() {
return \RectorPrefix20220104\composerRequire61b8a44af15b3e9199577c335425602a(...func_get_args());
if (!function_exists('composerRequire40763ed52784837d4ca25dce00e166d7')) {
function composerRequire40763ed52784837d4ca25dce00e166d7() {
return \RectorPrefix20220104\composerRequire40763ed52784837d4ca25dce00e166d7(...func_get_args());
}
}
if (!function_exists('scanPath')) {