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 ae45be1cf3

Browse Source 
ae45be1cf3 [DX] Add note warning about using old config (#2174)
This commit is contained in:
Tomas Votruba 2022-04-26 23:02:07 +00:00
parent e0d9ac9eb0
commit 127b77fdf0
10 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/parameters.php
View File

@ -22,7 +22,7 @@ return static function (\Rector\Config\RectorConfig $rectorConfig) : void {
$parameters->set(\Rector\Core\Configuration\Option::PARALLEL_TIMEOUT_IN_SECONDS, 120);
// FQN class importing
$rectorConfig->disableImportNames();
$parameters->set(\Rector\Core\Configuration\Option::IMPORT_SHORT_CLASSES, \true);
$rectorConfig->importShortClasses();
$parameters->set(\Rector\Core\Configuration\Option::NESTED_CHAIN_METHOD_CALL_LIMIT, 60);
$rectorConfig->skip([]);
$parameters->set(\Rector\Core\Configuration\Option::PHPSTAN_FOR_RECTOR_PATH, null);

10
packages/Config/RectorConfig.php
View File

@ -59,6 +59,16 @@ final class RectorConfig extends \Symfony\Component\DependencyInjection\Loader\C
$parameters = $this->parameters();
$parameters->set(\Rector\Core\Configuration\Option::AUTO_IMPORT_NAMES, \true);
}
public function importShortClasses() : void
{
$parameters = $this->parameters();
$parameters->set(\Rector\Core\Configuration\Option::IMPORT_SHORT_CLASSES, \true);
}
public function disableImportShortClasses() : void
{
$parameters = $this->parameters();
$parameters->set(\Rector\Core\Configuration\Option::IMPORT_SHORT_CLASSES, \false);
}
public function disableImportNames() : void
{
$parameters = $this->parameters();

2
rules/DogFood/Rector/Closure/UpgradeRectorConfigRector.php
View File

@ -29,7 +29,7 @@ final class UpgradeRectorConfigRector extends \Rector\Core\Rector\AbstractRector
/**
* @var array<string, string>
*/
private const PARAMETER_NAME_TO_METHOD_CALL_MAP = [\Rector\Core\Configuration\Option::PATHS => 'paths', \Rector\Core\Configuration\Option::SKIP => 'skip', \Rector\Core\Configuration\Option::AUTOLOAD_PATHS => 'autoloadPaths', \Rector\Core\Configuration\Option::BOOTSTRAP_FILES => 'bootstrapFiles', \Rector\Core\Configuration\Option::AUTO_IMPORT_NAMES => 'importNames', \Rector\Core\Configuration\Option::PARALLEL => 'parallel', \Rector\Core\Configuration\Option::PHPSTAN_FOR_RECTOR_PATH => 'phpstanConfig', \Rector\Core\Configuration\Option::PHP_VERSION_FEATURES => 'phpVersion'];
private const PARAMETER_NAME_TO_METHOD_CALL_MAP = [\Rector\Core\Configuration\Option::PATHS => 'paths', \Rector\Core\Configuration\Option::SKIP => 'skip', \Rector\Core\Configuration\Option::AUTOLOAD_PATHS => 'autoloadPaths', \Rector\Core\Configuration\Option::BOOTSTRAP_FILES => 'bootstrapFiles', \Rector\Core\Configuration\Option::IMPORT_SHORT_CLASSES => 'importShortClasses', \Rector\Core\Configuration\Option::AUTO_IMPORT_NAMES => 'importNames', \Rector\Core\Configuration\Option::PARALLEL => 'parallel', \Rector\Core\Configuration\Option::PHPSTAN_FOR_RECTOR_PATH => 'phpstanConfig', \Rector\Core\Configuration\Option::PHP_VERSION_FEATURES => 'phpVersion'];
/**
* @var string
*/

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = '7fb8254c2383a96e83040b4c3ce9ee330a0a8363';
public const PACKAGE_VERSION = 'ae45be1cf3ef4103d529423fcd4d41f2223ddb9a';
/**
* @var string
*/
public const RELEASE_DATE = '2022-04-27 05:37:07';
public const RELEASE_DATE = '2022-04-26 22:53:49';
/**
* @var string
*/

1
src/Configuration/Option.php
View File

@ -50,6 +50,7 @@ final class Option
*/
public const AUTO_IMPORT_NAMES = 'auto_import_names';
/**
* @deprecated Use @see \Rector\Config\RectorConfig::importShortClasses() instead
* @var string
*/
public const IMPORT_SHORT_CLASSES = 'import_short_classes';

13
src/DependencyInjection/RectorContainerFactory.php
View File

@ -3,11 +3,13 @@
declare (strict_types=1);
namespace Rector\Core\DependencyInjection;
use RectorPrefix20220426\Nette\Utils\FileSystem;
use RectorPrefix20220426\Psr\Container\ContainerInterface;
use Rector\Caching\Detector\ChangedFilesDetector;
use Rector\Core\Kernel\RectorKernel;
use Rector\Core\Stubs\PHPStanStubLoader;
use Rector\Core\ValueObject\Bootstrap\BootstrapConfigs;
use RectorPrefix20220426\Symfony\Component\Console\Style\SymfonyStyle;
final class RectorContainerFactory
{
public function createFromBootstrapConfigs(\Rector\Core\ValueObject\Bootstrap\BootstrapConfigs $bootstrapConfigs) : \RectorPrefix20220426\Psr\Container\ContainerInterface
@ -15,6 +17,17 @@ final class RectorContainerFactory
$container = $this->createFromConfigs($bootstrapConfigs->getConfigFiles());
$mainConfigFile = $bootstrapConfigs->getMainConfigFile();
if ($mainConfigFile !== null) {
// warning about old syntax before RectorConfig
$fileContents = \RectorPrefix20220426\Nette\Utils\FileSystem::read($mainConfigFile);
if (\strpos($fileContents, 'ContainerConfigurator $containerConfigurator') !== \false) {
/** @var SymfonyStyle $symfonyStyle */
$symfonyStyle = $container->get(\RectorPrefix20220426\Symfony\Component\Console\Style\SymfonyStyle::class);
// @todo add link to blog post after release
$warningMessage = \sprintf('Your "%s" config is using old syntax with "ContainerConfigurator".%sPlease upgrade to "RectorConfig" that allows better autocomplete and future standard.', $mainConfigFile, \PHP_EOL);
$symfonyStyle->warning($warningMessage);
// to make message noticable
\sleep(1);
}
/** @var ChangedFilesDetector $changedFilesDetector */
$changedFilesDetector = $container->get(\Rector\Caching\Detector\ChangedFilesDetector::class);
$changedFilesDetector->setFirstResolvedConfigFileInfo($mainConfigFile);

2
vendor/autoload.php vendored
View File

@ -9,4 +9,4 @@ if (PHP_VERSION_ID < 50600) {
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit7ed8cace56dfa2ceceb77d8cd52ac266::getLoader();
return ComposerAutoloaderInit413cd0b650f4108ea1c045dfc2621a86::getLoader();

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit7ed8cace56dfa2ceceb77d8cd52ac266
class ComposerAutoloaderInit413cd0b650f4108ea1c045dfc2621a86
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit7ed8cace56dfa2ceceb77d8cd52ac266
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit7ed8cace56dfa2ceceb77d8cd52ac266', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit413cd0b650f4108ea1c045dfc2621a86', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit7ed8cace56dfa2ceceb77d8cd52ac266', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit413cd0b650f4108ea1c045dfc2621a86', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit7ed8cace56dfa2ceceb77d8cd52ac266::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit413cd0b650f4108ea1c045dfc2621a86::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit7ed8cace56dfa2ceceb77d8cd52ac266::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit413cd0b650f4108ea1c045dfc2621a86::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire7ed8cace56dfa2ceceb77d8cd52ac266($fileIdentifier, $file);
composerRequire413cd0b650f4108ea1c045dfc2621a86($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit7ed8cace56dfa2ceceb77d8cd52ac266
* @param string $file
* @return void
*/
function composerRequire7ed8cace56dfa2ceceb77d8cd52ac266($fileIdentifier, $file)
function composerRequire413cd0b650f4108ea1c045dfc2621a86($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 ComposerStaticInit7ed8cace56dfa2ceceb77d8cd52ac266
class ComposerStaticInit413cd0b650f4108ea1c045dfc2621a86
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -3874,9 +3874,9 @@ class ComposerStaticInit7ed8cace56dfa2ceceb77d8cd52ac266
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit7ed8cace56dfa2ceceb77d8cd52ac266::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit7ed8cace56dfa2ceceb77d8cd52ac266::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit7ed8cace56dfa2ceceb77d8cd52ac266::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit413cd0b650f4108ea1c045dfc2621a86::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit413cd0b650f4108ea1c045dfc2621a86::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit413cd0b650f4108ea1c045dfc2621a86::$classMap;
}, null, ClassLoader::class);
}

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('RectorPrefix20220426\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit7ed8cace56dfa2ceceb77d8cd52ac266', false) && !interface_exists('ComposerAutoloaderInit7ed8cace56dfa2ceceb77d8cd52ac266', false) && !trait_exists('ComposerAutoloaderInit7ed8cace56dfa2ceceb77d8cd52ac266', false)) {
spl_autoload_call('RectorPrefix20220426\ComposerAutoloaderInit7ed8cace56dfa2ceceb77d8cd52ac266');
if (!class_exists('ComposerAutoloaderInit413cd0b650f4108ea1c045dfc2621a86', false) && !interface_exists('ComposerAutoloaderInit413cd0b650f4108ea1c045dfc2621a86', false) && !trait_exists('ComposerAutoloaderInit413cd0b650f4108ea1c045dfc2621a86', false)) {
spl_autoload_call('RectorPrefix20220426\ComposerAutoloaderInit413cd0b650f4108ea1c045dfc2621a86');
}
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('RectorPrefix20220426\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -59,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220426\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire7ed8cace56dfa2ceceb77d8cd52ac266')) {
function composerRequire7ed8cace56dfa2ceceb77d8cd52ac266() {
return \RectorPrefix20220426\composerRequire7ed8cace56dfa2ceceb77d8cd52ac266(...func_get_args());
if (!function_exists('composerRequire413cd0b650f4108ea1c045dfc2621a86')) {
function composerRequire413cd0b650f4108ea1c045dfc2621a86() {
return \RectorPrefix20220426\composerRequire413cd0b650f4108ea1c045dfc2621a86(...func_get_args());
}
}
if (!function_exists('scanPath')) {