octoleo
/
rector
mirror of https://github.com/rectorphp/rector.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated Rector to commit 10eb09f02d825d01caf92e2c45c73dddf6aa3430 

10eb09f02d [cleanup] Remove deprecated NonPhpRectorInterface, PseudoNamespaceToNamespaceRector and mysql to mysqli sets (#4927)
This commit is contained in:
Tomas Votruba 2023-09-06 16:03:21 +00:00
parent 55c7e63a09
commit e6e6042119
13 changed files with 14 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/set/mysql-to-mysqli.php
View File

@ -1,9 +0,0 @@
<?php
declare (strict_types=1);
namespace RectorPrefix202309;
use Rector\Config\RectorConfig;
return static function (RectorConfig $rectorConfig) : void {
// @deprecated Handle manually with explicit refactoring instead.
};

16
packages/Config/RectorConfig.php
View File

@ -8,7 +8,6 @@ use Rector\Caching\Contract\ValueObject\Storage\CacheStorageInterface;
use Rector\Core\Configuration\Option;
use Rector\Core\Configuration\Parameter\SimpleParameterProvider;
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
use Rector\Core\Contract\Rector\NonPhpRectorInterface;
use Rector\Core\Contract\Rector\RectorInterface;
use Rector\Core\Exception\ShouldNotHappenException;
use Rector\Core\FileSystem\FilesystemTweaker;
@ -147,7 +146,7 @@ final class RectorConfig extends Container
// store configuration to cache
$this->ruleConfigurations[$rectorClass] = \array_merge($this->ruleConfigurations[$rectorClass] ?? [], $configuration);
$this->singleton($rectorClass);
$this->tagRectorService($rectorClass);
$this->tag($rectorClass, RectorInterface::class);
$this->afterResolving($rectorClass, function (ConfigurableRectorInterface $configurableRector) use($rectorClass) : void {
$ruleConfiguration = $this->ruleConfigurations[$rectorClass];
$configurableRector->configure($ruleConfiguration);
@ -163,7 +162,7 @@ final class RectorConfig extends Container
Assert::classExists($rectorClass);
Assert::isAOf($rectorClass, RectorInterface::class);
$this->singleton($rectorClass);
$this->tagRectorService($rectorClass);
$this->tag($rectorClass, RectorInterface::class);
if (\is_a($rectorClass, AbstractScopeAwareRector::class, \true)) {
$this->extend($rectorClass, static function (AbstractScopeAwareRector $scopeAwareRector, Container $container) : AbstractScopeAwareRector {
$scopeAnalyzer = $container->make(ScopeAnalyzer::class);
@ -305,17 +304,6 @@ final class RectorConfig extends Container
}
return \array_unique($duplicates);
}
/**
* @param class-string<RectorInterface> $rectorClass
*/
private function tagRectorService(string $rectorClass) : void
{
$this->tag($rectorClass, RectorInterface::class);
if (\is_a($rectorClass, NonPhpRectorInterface::class, \true)) {
\trigger_error(\sprintf('The "%s" interface of "%s" rule is deprecated. Rector will process only PHP code, as designed to with AST. For another file format, use custom tooling.', NonPhpRectorInterface::class, $rectorClass));
exit;
}
}
/**
* @param string[] $rectorClasses
*/

5
packages/Set/ValueObject/SetList.php
View File

@ -29,11 +29,6 @@ final class SetList implements SetListInterface
* @var string
*/
public const GMAGICK_TO_IMAGICK = __DIR__ . '/../../../config/set/gmagick-to-imagick.php';
/**
* @deprecated Handle manually with explicit refactoring instead.
* @var string
*/
public const MYSQL_TO_MYSQLI = __DIR__ . '/../../../config/set/mysql-to-mysqli.php';
/**
* @var string
*/

58
rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php
View File

@ -1,58 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Renaming\Rector\FileWithoutNamespace;
use PhpParser\Node;
use PhpParser\Node\Stmt\Namespace_;
use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
use Rector\Core\Rector\AbstractRector;
use Rector\Renaming\ValueObject\PseudoNamespaceToNamespace;
use Symplify\RuleDocGenerator\ValueObject\CodeSample\ConfiguredCodeSample;
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
/**
* @api deprecated and soon to be removed
*/
final class PseudoNamespaceToNamespaceRector extends AbstractRector implements ConfigurableRectorInterface
{
public function getRuleDefinition() : RuleDefinition
{
return new RuleDefinition('Replaces defined Pseudo_Namespaces by Namespace\\Ones.', [new ConfiguredCodeSample(<<<'CODE_SAMPLE'
/** @var Some_Chicken $someService */
$someService = new Some_Chicken;
$someClassToKeep = new Some_Class_To_Keep;
CODE_SAMPLE
, <<<'CODE_SAMPLE'
/** @var Some\Chicken $someService */
$someService = new Some\Chicken;
$someClassToKeep = new Some_Class_To_Keep;
CODE_SAMPLE
, [new PseudoNamespaceToNamespace('Some_', ['Some_Class_To_Keep'])])]);
}
/**
* @return array<class-string<Node>>
*/
public function getNodeTypes() : array
{
// property, method
return [FileWithoutNamespace::class, Namespace_::class];
}
/**
* @param Namespace_|FileWithoutNamespace $node
*/
public function refactor(Node $node) : ?Node
{
$errorMessage = \sprintf('Rule "%s" is deprecated, as unreliable and too dynamic. Use more robuts RenameClassRector instead.', self::class);
\trigger_error($errorMessage, \E_USER_WARNING);
\sleep(3);
return null;
}
/**
* @param mixed[] $configuration
*/
public function configure(array $configuration) : void
{
// for BC
}
}

40
rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php
View File

@ -1,40 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Renaming\ValueObject;
/**
* @api deprecated, soon to be removed
*/
final class PseudoNamespaceToNamespace
{
/**
* @readonly
* @var string
*/
private $namespacePrefix;
/**
* @var string[]
* @readonly
*/
private $excludedClasses = [];
/**
* @param string[] $excludedClasses
*/
public function __construct(string $namespacePrefix, array $excludedClasses = [])
{
$this->namespacePrefix = $namespacePrefix;
$this->excludedClasses = $excludedClasses;
}
public function getNamespacePrefix() : string
{
return $this->namespacePrefix;
}
/**
* @return string[]
*/
public function getExcludedClasses() : array
{
return $this->excludedClasses;
}
}

4
src/Application/VersionResolver.php
View File

@ -19,12 +19,12 @@ final class VersionResolver
* @api
* @var string
*/
public const PACKAGE_VERSION = 'd3719c2e953f3be1b5b1e0a2eb7ba992b65a8e6d';
public const PACKAGE_VERSION = '10eb09f02d825d01caf92e2c45c73dddf6aa3430';
/**
* @api
* @var string
*/
public const RELEASE_DATE = '2023-09-06 14:53:10';
public const RELEASE_DATE = '2023-09-06 18:00:33';
/**
* @var int
*/

12
src/Contract/Rector/NonPhpRectorInterface.php
View File

@ -1,12 +0,0 @@
<?php
declare (strict_types=1);
namespace Rector\Core\Contract\Rector;
/**
* @deprecated Rector should never handle anything outside PHP files, as oustide it's scope - use custom tool instead.
*/
interface NonPhpRectorInterface extends \Rector\Core\Contract\Rector\RectorInterface
{
public function refactorFileContent(string $fileContent) : string;
}

2
src/DependencyInjection/LazyContainerFactory.php
View File

@ -382,9 +382,7 @@ final class LazyContainerFactory
});
$rectorConfig->when(PHPStanNodeScopeResolver::class)->needs('$nodeVisitors')->giveTagged(ScopeResolverNodeVisitorInterface::class);
$this->registerTagged($rectorConfig, self::SCOPE_RESOLVER_NODE_VISITOR_CLASSES, ScopeResolverNodeVisitorInterface::class);
// phpstan factory
$this->createPHPStanServices($rectorConfig);
// @todo add base node visitors
$rectorConfig->when(PhpDocNodeMapper::class)->needs('$phpDocNodeVisitors')->giveTagged(BasePhpDocNodeVisitorInterface::class);
/** @param mixed $parameters */
$hasForgotten = \false;

7
src/NodeManipulator/IfManipulator.php
View File

@ -168,13 +168,6 @@ final class IfManipulator
}
return $if->elseifs === [];
}
/**
* @deprecated Create If_ directly, this is simple new with no added value
*/
public function createIfStmt(Expr $condExpr, Stmt $stmt) : If_
{
return new If_($condExpr, ['stmts' => [$stmt]]);
}
private function matchComparedAndReturnedNode(NotIdentical $notIdentical, Return_ $return) : ?Expr
{
if ($this->nodeComparator->areNodesEqual($notIdentical->left, $return->expr) && $this->valueResolver->isNull($notIdentical->right)) {

2
vendor/autoload.php vendored
View File

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

3
vendor/composer/autoload_classmap.php vendored
View File

@ -1179,7 +1179,6 @@ return array(
'Rector\\Core\\Contract\\DependencyInjection\\ResetableInterface' => $baseDir . '/src/Contract/DependencyInjection/ResetableInterface.php',
'Rector\\Core\\Contract\\PhpParser\\Node\\StmtsAwareInterface' => $baseDir . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php',
'Rector\\Core\\Contract\\Rector\\ConfigurableRectorInterface' => $baseDir . '/src/Contract/Rector/ConfigurableRectorInterface.php',
'Rector\\Core\\Contract\\Rector\\NonPhpRectorInterface' => $baseDir . '/src/Contract/Rector/NonPhpRectorInterface.php',
'Rector\\Core\\Contract\\Rector\\RectorInterface' => $baseDir . '/src/Contract/Rector/RectorInterface.php',
'Rector\\Core\\Contract\\Rector\\ScopeAwareRectorInterface' => $baseDir . '/src/Contract/Rector/ScopeAwareRectorInterface.php',
'Rector\\Core\\DependencyInjection\\Laravel\\ContainerMemento' => $baseDir . '/src/DependencyInjection/Laravel/ContainerMemento.php',
@ -1977,7 +1976,6 @@ return array(
'Rector\\Renaming\\Rector\\ClassConstFetch\\RenameClassConstFetchRector' => $baseDir . '/rules/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector.php',
'Rector\\Renaming\\Rector\\ClassMethod\\RenameAnnotationRector' => $baseDir . '/rules/Renaming/Rector/ClassMethod/RenameAnnotationRector.php',
'Rector\\Renaming\\Rector\\ConstFetch\\RenameConstantRector' => $baseDir . '/rules/Renaming/Rector/ConstFetch/RenameConstantRector.php',
'Rector\\Renaming\\Rector\\FileWithoutNamespace\\PseudoNamespaceToNamespaceRector' => $baseDir . '/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php',
'Rector\\Renaming\\Rector\\FuncCall\\RenameFunctionRector' => $baseDir . '/rules/Renaming/Rector/FuncCall/RenameFunctionRector.php',
'Rector\\Renaming\\Rector\\MethodCall\\RenameMethodRector' => $baseDir . '/rules/Renaming/Rector/MethodCall/RenameMethodRector.php',
'Rector\\Renaming\\Rector\\Name\\RenameClassRector' => $baseDir . '/rules/Renaming/Rector/Name/RenameClassRector.php',
@ -1986,7 +1984,6 @@ return array(
'Rector\\Renaming\\Rector\\String_\\RenameStringRector' => $baseDir . '/rules/Renaming/Rector/String_/RenameStringRector.php',
'Rector\\Renaming\\ValueObject\\MethodCallRename' => $baseDir . '/rules/Renaming/ValueObject/MethodCallRename.php',
'Rector\\Renaming\\ValueObject\\MethodCallRenameWithArrayKey' => $baseDir . '/rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php',
'Rector\\Renaming\\ValueObject\\PseudoNamespaceToNamespace' => $baseDir . '/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php',
'Rector\\Renaming\\ValueObject\\RenameAnnotation' => $baseDir . '/rules/Renaming/ValueObject/RenameAnnotation.php',
'Rector\\Renaming\\ValueObject\\RenameAnnotationByType' => $baseDir . '/rules/Renaming/ValueObject/RenameAnnotationByType.php',
'Rector\\Renaming\\ValueObject\\RenameClassAndConstFetch' => $baseDir . '/rules/Renaming/ValueObject/RenameClassAndConstFetch.php',

10
vendor/composer/autoload_real.php vendored
View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit5f5135105dfe05af7c7e838e0657a382
class ComposerAutoloaderInit9248641f2e4b94b552e9ef0a05e9df45
{
private static $loader;
@ -22,17 +22,17 @@ class ComposerAutoloaderInit5f5135105dfe05af7c7e838e0657a382
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit5f5135105dfe05af7c7e838e0657a382', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInit9248641f2e4b94b552e9ef0a05e9df45', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
spl_autoload_unregister(array('ComposerAutoloaderInit5f5135105dfe05af7c7e838e0657a382', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInit9248641f2e4b94b552e9ef0a05e9df45', 'loadClassLoader'));
require __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit5f5135105dfe05af7c7e838e0657a382::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45::getInitializer($loader));
$loader->setClassMapAuthoritative(true);
$loader->register(true);
$filesToLoad = \Composer\Autoload\ComposerStaticInit5f5135105dfe05af7c7e838e0657a382::$files;
$filesToLoad = \Composer\Autoload\ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45::$files;
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

11
vendor/composer/autoload_static.php vendored
View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit5f5135105dfe05af7c7e838e0657a382
class ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45
{
public static $files = array (
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
@ -1399,7 +1399,6 @@ class ComposerStaticInit5f5135105dfe05af7c7e838e0657a382
'Rector\\Core\\Contract\\DependencyInjection\\ResetableInterface' => __DIR__ . '/../..' . '/src/Contract/DependencyInjection/ResetableInterface.php',
'Rector\\Core\\Contract\\PhpParser\\Node\\StmtsAwareInterface' => __DIR__ . '/../..' . '/src/Contract/PhpParser/Node/StmtsAwareInterface.php',
'Rector\\Core\\Contract\\Rector\\ConfigurableRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/ConfigurableRectorInterface.php',
'Rector\\Core\\Contract\\Rector\\NonPhpRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/NonPhpRectorInterface.php',
'Rector\\Core\\Contract\\Rector\\RectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/RectorInterface.php',
'Rector\\Core\\Contract\\Rector\\ScopeAwareRectorInterface' => __DIR__ . '/../..' . '/src/Contract/Rector/ScopeAwareRectorInterface.php',
'Rector\\Core\\DependencyInjection\\Laravel\\ContainerMemento' => __DIR__ . '/../..' . '/src/DependencyInjection/Laravel/ContainerMemento.php',
@ -2197,7 +2196,6 @@ class ComposerStaticInit5f5135105dfe05af7c7e838e0657a382
'Rector\\Renaming\\Rector\\ClassConstFetch\\RenameClassConstFetchRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector.php',
'Rector\\Renaming\\Rector\\ClassMethod\\RenameAnnotationRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/ClassMethod/RenameAnnotationRector.php',
'Rector\\Renaming\\Rector\\ConstFetch\\RenameConstantRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/ConstFetch/RenameConstantRector.php',
'Rector\\Renaming\\Rector\\FileWithoutNamespace\\PseudoNamespaceToNamespaceRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/FileWithoutNamespace/PseudoNamespaceToNamespaceRector.php',
'Rector\\Renaming\\Rector\\FuncCall\\RenameFunctionRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/FuncCall/RenameFunctionRector.php',
'Rector\\Renaming\\Rector\\MethodCall\\RenameMethodRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/MethodCall/RenameMethodRector.php',
'Rector\\Renaming\\Rector\\Name\\RenameClassRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/Name/RenameClassRector.php',
@ -2206,7 +2204,6 @@ class ComposerStaticInit5f5135105dfe05af7c7e838e0657a382
'Rector\\Renaming\\Rector\\String_\\RenameStringRector' => __DIR__ . '/../..' . '/rules/Renaming/Rector/String_/RenameStringRector.php',
'Rector\\Renaming\\ValueObject\\MethodCallRename' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/MethodCallRename.php',
'Rector\\Renaming\\ValueObject\\MethodCallRenameWithArrayKey' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/MethodCallRenameWithArrayKey.php',
'Rector\\Renaming\\ValueObject\\PseudoNamespaceToNamespace' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/PseudoNamespaceToNamespace.php',
'Rector\\Renaming\\ValueObject\\RenameAnnotation' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/RenameAnnotation.php',
'Rector\\Renaming\\ValueObject\\RenameAnnotationByType' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/RenameAnnotationByType.php',
'Rector\\Renaming\\ValueObject\\RenameClassAndConstFetch' => __DIR__ . '/../..' . '/rules/Renaming/ValueObject/RenameClassAndConstFetch.php',
@ -2606,9 +2603,9 @@ class ComposerStaticInit5f5135105dfe05af7c7e838e0657a382
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit5f5135105dfe05af7c7e838e0657a382::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit5f5135105dfe05af7c7e838e0657a382::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit5f5135105dfe05af7c7e838e0657a382::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45::$prefixDirsPsr4;
$loader->classMap = ComposerStaticInit9248641f2e4b94b552e9ef0a05e9df45::$classMap;
}, null, ClassLoader::class);
}