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 b055a88927

Browse Source 
b055a88927 Add RectorConfigProvider to ask for configuration behave for 3rd party packages (#2187)
This commit is contained in:
Tomas Votruba 2022-04-28 17:21:22 +00:00
parent 0b4c6251c0
commit 3d30a34d24
10 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rules/Renaming/Rector/Name/RenameClassRector.php
View File

@ -12,13 +12,12 @@ use PhpParser\Node\Stmt\Expression;
use PhpParser\Node\Stmt\Namespace_;
use PhpParser\Node\Stmt\Property;
use PhpParser\Node\Stmt\Use_;
use Rector\Core\Configuration\Option;
use Rector\Core\Configuration\RectorConfigProvider;
use Rector\Core\Configuration\RenamedClassesDataCollector;
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
use Rector\Core\Rector\AbstractRector;
use Rector\Renaming\NodeManipulator\ClassRenamer;
use RectorPrefix20220428\Symplify\PackageBuilder\Parameter\ParameterProvider;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
use RectorPrefix20220428\Webmozart\Assert\Assert;
@ -39,14 +38,14 @@ final class RenameClassRector extends \Rector\Core\Rector\AbstractRector impleme
private $classRenamer;
/**
* @readonly
* @var \Symplify\PackageBuilder\Parameter\ParameterProvider
* @var \Rector\Core\Configuration\RectorConfigProvider
*/
private $parameterProvider;
public function __construct(\Rector\Core\Configuration\RenamedClassesDataCollector $renamedClassesDataCollector, \Rector\Renaming\NodeManipulator\ClassRenamer $classRenamer, \RectorPrefix20220428\Symplify\PackageBuilder\Parameter\ParameterProvider $parameterProvider)
private $rectorConfigProvider;
public function __construct(\Rector\Core\Configuration\RenamedClassesDataCollector $renamedClassesDataCollector, \Rector\Renaming\NodeManipulator\ClassRenamer $classRenamer, \Rector\Core\Configuration\RectorConfigProvider $rectorConfigProvider)
{
$this->renamedClassesDataCollector = $renamedClassesDataCollector;
$this->classRenamer = $classRenamer;
$this->parameterProvider = $parameterProvider;
$this->rectorConfigProvider = $rectorConfigProvider;
}
public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition
{
@ -92,7 +91,7 @@ CODE_SAMPLE
if (!$node instanceof \PhpParser\Node\Stmt\Use_) {
return $this->classRenamer->renameNode($node, $oldToNewClasses, $this->file);
}
if (!$this->parameterProvider->provideBoolParameter(\Rector\Core\Configuration\Option::AUTO_IMPORT_NAMES)) {
if (!$this->rectorConfigProvider->shouldImportNames()) {
return null;
}
return $this->processCleanUpUse($node, $oldToNewClasses);

4
src/Application/VersionResolver.php
View File

@ -16,11 +16,11 @@ final class VersionResolver
/**
* @var string
*/
public const PACKAGE_VERSION = 'b061dcdcf347e07924a1379afda752c15ade36ec';
public const PACKAGE_VERSION = 'b055a8892749ed11ebf77d5ede4833093846471a';
/**
* @var string
*/
public const RELEASE_DATE = '2022-04-28 18:17:51';
public const RELEASE_DATE = '2022-04-28 19:13:39';
/**
* @var string
*/

26
src/Configuration/RectorConfigProvider.php Normal file
View File

@ -0,0 +1,26 @@
<?php
declare (strict_types=1);
namespace Rector\Core\Configuration;
use RectorPrefix20220428\Symplify\PackageBuilder\Parameter\ParameterProvider;
/**
* Rector native configuration provider, to keep deprecated options hidden,
* but also provide configuration that custom rules can check
*/
final class RectorConfigProvider
{
/**
* @readonly
* @var \Symplify\PackageBuilder\Parameter\ParameterProvider
*/
private $parameterProvider;
public function __construct(\RectorPrefix20220428\Symplify\PackageBuilder\Parameter\ParameterProvider $parameterProvider)
{
$this->parameterProvider = $parameterProvider;
}
public function shouldImportNames() : bool
{
return $this->parameterProvider->provideBoolParameter(\Rector\Core\Configuration\Option::AUTO_IMPORT_NAMES);
}
}

1
src/DependencyInjection/Loader/Configurator/RectorServiceConfigurator.php
View File

@ -14,6 +14,7 @@ use RectorPrefix20220428\Symfony\Component\DependencyInjection\Loader\Configurat
final class RectorServiceConfigurator extends \RectorPrefix20220428\Symfony\Component\DependencyInjection\Loader\Configurator\ServiceConfigurator
{
/**
* @deprecated Use @see \Rector\Config\RectorConfig instead
* @param mixed[] $configuration
*/
public function configure(array $configuration) : self

2
vendor/autoload.php vendored
View File

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

1
vendor/composer/autoload_classmap.php vendored
View File

@ -1646,6 +1646,7 @@ return array(
'Rector\\Core\\Configuration\\ConfigurationFactory' => $baseDir . '/src/Configuration/ConfigurationFactory.php',
'Rector\\Core\\Configuration\\CurrentNodeProvider' => $baseDir . '/src/Configuration/CurrentNodeProvider.php',
'Rector\\Core\\Configuration\\Option' => $baseDir . '/src/Configuration/Option.php',
'Rector\\Core\\Configuration\\RectorConfigProvider' => $baseDir . '/src/Configuration/RectorConfigProvider.php',
'Rector\\Core\\Configuration\\RenamedClassesDataCollector' => $baseDir . '/src/Configuration/RenamedClassesDataCollector.php',
'Rector\\Core\\Configuration\\ValueObjectInliner' => $baseDir . '/src/Configuration/ValueObjectInliner.php',
'Rector\\Core\\Console\\Command\\AbstractProcessCommand' => $baseDir . '/src/Console/Command/AbstractProcessCommand.php',

14
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit81f8b62bf9543393f36d01443cdcb59b
class ComposerAutoloaderInit0bac522db27f35bd482eac0f52f1143c
{
private static $loader;
@ -22,19 +22,19 @@ class ComposerAutoloaderInit81f8b62bf9543393f36d01443cdcb59b
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit81f8b62bf9543393f36d01443cdcb59b', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit0bac522db27f35bd482eac0f52f1143c', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit81f8b62bf9543393f36d01443cdcb59b', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit0bac522db27f35bd482eac0f52f1143c', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit81f8b62bf9543393f36d01443cdcb59b::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit0bac522db27f35bd482eac0f52f1143c::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$includeFiles = \Composer\Autoload\ComposerStaticInit81f8b62bf9543393f36d01443cdcb59b::$files;
$includeFiles = \Composer\Autoload\ComposerStaticInit0bac522db27f35bd482eac0f52f1143c::$files;
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire81f8b62bf9543393f36d01443cdcb59b($fileIdentifier, $file);
composerRequire0bac522db27f35bd482eac0f52f1143c($fileIdentifier, $file);
}
return $loader;
@ -46,7 +46,7 @@ class ComposerAutoloaderInit81f8b62bf9543393f36d01443cdcb59b
* @param string $file
* @return void
*/
function composerRequire81f8b62bf9543393f36d01443cdcb59b($fileIdentifier, $file)
function composerRequire0bac522db27f35bd482eac0f52f1143c($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

9
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit81f8b62bf9543393f36d01443cdcb59b
class ComposerStaticInit0bac522db27f35bd482eac0f52f1143c
{
public static $files = array (
'320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@ -2015,6 +2015,7 @@ class ComposerStaticInit81f8b62bf9543393f36d01443cdcb59b
'Rector\\Core\\Configuration\\ConfigurationFactory' => __DIR__ . '/../..' . '/src/Configuration/ConfigurationFactory.php',
'Rector\\Core\\Configuration\\CurrentNodeProvider' => __DIR__ . '/../..' . '/src/Configuration/CurrentNodeProvider.php',
'Rector\\Core\\Configuration\\Option' => __DIR__ . '/../..' . '/src/Configuration/Option.php',
'Rector\\Core\\Configuration\\RectorConfigProvider' => __DIR__ . '/../..' . '/src/Configuration/RectorConfigProvider.php',
'Rector\\Core\\Configuration\\RenamedClassesDataCollector' => __DIR__ . '/../..' . '/src/Configuration/RenamedClassesDataCollector.php',
'Rector\\Core\\Configuration\\ValueObjectInliner' => __DIR__ . '/../..' . '/src/Configuration/ValueObjectInliner.php',
'Rector\\Core\\Console\\Command\\AbstractProcessCommand' => __DIR__ . '/../..' . '/src/Console/Command/AbstractProcessCommand.php',
@ -3878,9 +3879,9 @@ class ComposerStaticInit81f8b62bf9543393f36d01443cdcb59b
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit81f8b62bf9543393f36d01443cdcb59b::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit81f8b62bf9543393f36d01443cdcb59b::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit81f8b62bf9543393f36d01443cdcb59b::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit0bac522db27f35bd482eac0f52f1143c::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit0bac522db27f35bd482eac0f52f1143c::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit0bac522db27f35bd482eac0f52f1143c::$classMap;
}, null, ClassLoader::class);
}

13
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('RectorPrefix20220428\AutoloadIncluder');
}
if (!class_exists('ComposerAutoloaderInit81f8b62bf9543393f36d01443cdcb59b', false) && !interface_exists('ComposerAutoloaderInit81f8b62bf9543393f36d01443cdcb59b', false) && !trait_exists('ComposerAutoloaderInit81f8b62bf9543393f36d01443cdcb59b', false)) {
spl_autoload_call('RectorPrefix20220428\ComposerAutoloaderInit81f8b62bf9543393f36d01443cdcb59b');
if (!class_exists('ComposerAutoloaderInit0bac522db27f35bd482eac0f52f1143c', false) && !interface_exists('ComposerAutoloaderInit0bac522db27f35bd482eac0f52f1143c', false) && !trait_exists('ComposerAutoloaderInit0bac522db27f35bd482eac0f52f1143c', false)) {
spl_autoload_call('RectorPrefix20220428\ComposerAutoloaderInit0bac522db27f35bd482eac0f52f1143c');
}
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('RectorPrefix20220428\Helmich\TypoScriptParser\Parser\AST\Statement');
@ -33,9 +33,6 @@ if (!class_exists('ReturnTypeWillChange', false) && !interface_exists('ReturnTyp
if (!class_exists('Symplify\ComposerJsonManipulator\ValueObject\ComposerJson', false) && !interface_exists('Symplify\ComposerJsonManipulator\ValueObject\ComposerJson', false) && !trait_exists('Symplify\ComposerJsonManipulator\ValueObject\ComposerJson', false)) {
spl_autoload_call('RectorPrefix20220428\Symplify\ComposerJsonManipulator\ValueObject\ComposerJson');
}
if (!class_exists('Symplify\PackageBuilder\Parameter\ParameterProvider', false) && !interface_exists('Symplify\PackageBuilder\Parameter\ParameterProvider', false) && !trait_exists('Symplify\PackageBuilder\Parameter\ParameterProvider', false)) {
spl_autoload_call('RectorPrefix20220428\Symplify\PackageBuilder\Parameter\ParameterProvider');
}
if (!class_exists('Symplify\SmartFileSystem\SmartFileInfo', false) && !interface_exists('Symplify\SmartFileSystem\SmartFileInfo', false) && !trait_exists('Symplify\SmartFileSystem\SmartFileInfo', false)) {
spl_autoload_call('RectorPrefix20220428\Symplify\SmartFileSystem\SmartFileInfo');
}
@ -62,9 +59,9 @@ if (!function_exists('print_node')) {
return \RectorPrefix20220428\print_node(...func_get_args());
}
}
if (!function_exists('composerRequire81f8b62bf9543393f36d01443cdcb59b')) {
function composerRequire81f8b62bf9543393f36d01443cdcb59b() {
return \RectorPrefix20220428\composerRequire81f8b62bf9543393f36d01443cdcb59b(...func_get_args());
if (!function_exists('composerRequire0bac522db27f35bd482eac0f52f1143c')) {
function composerRequire0bac522db27f35bd482eac0f52f1143c() {
return \RectorPrefix20220428\composerRequire0bac522db27f35bd482eac0f52f1143c(...func_get_args());
}
}
if (!function_exists('scanPath')) {

5
vendor/symplify/package-builder/src/Parameter/ParameterProvider.php vendored
View File

@ -92,8 +92,3 @@ final class ParameterProvider
throw new \RectorPrefix20220428\Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException($name);
}
}
/**
* @api
* @see \Symplify\PackageBuilder\Tests\Parameter\ParameterProviderTest
*/
\class_alias('RectorPrefix20220428\\Symplify\\PackageBuilder\\Parameter\\ParameterProvider', 'Symplify\\PackageBuilder\\Parameter\\ParameterProvider', \false);