mirror of
https://github.com/rectorphp/rector.git
synced 2024-06-15 15:42:22 +00:00
Updated Rector to commit 42b697f65f0c648cc45abcc5b9e32a16a7967caa
42b697f65f
[deprecated] Remove deprecated properties from AbstractRector (#5243)
This commit is contained in:
parent
753e83fb31
commit
39dc6141e7
|
@ -15,8 +15,8 @@ use Rector\Core\Configuration\Parameter\SimpleParameterProvider;
|
|||
use Rector\Core\Configuration\RenamedClassesDataCollector;
|
||||
use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\Renaming\NodeManipulator\ClassRenamer;
|
||||
use Rector\Renaming\Collector\RenamedNameCollector;
|
||||
use Rector\Renaming\NodeManipulator\ClassRenamer;
|
||||
final class ClassRenamingPostRector extends \Rector\PostRector\Rector\AbstractPostRector
|
||||
{
|
||||
/**
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
declare (strict_types=1);
|
||||
namespace Rector\Php74\Rector\Property;
|
||||
|
||||
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Stmt\Class_;
|
||||
use PhpParser\Node\Stmt\Property;
|
||||
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
|
||||
use Rector\Core\Rector\AbstractRector;
|
||||
use Rector\Core\ValueObject\PhpVersionFeature;
|
||||
use Rector\TypeDeclaration\AlreadyAssignDetector\ConstructorAssignDetector;
|
||||
|
|
|
@ -19,12 +19,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = '4ed71bc537b3b3bb80245efb7661941119ab077d';
|
||||
public const PACKAGE_VERSION = '42b697f65f0c648cc45abcc5b9e32a16a7967caa';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2023-11-11 09:55:00';
|
||||
public const RELEASE_DATE = '2023-11-11 18:08:36';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
|
@ -64,9 +64,7 @@ use Rector\Core\Contract\Rector\CollectorRectorInterface;
|
|||
use Rector\Core\Contract\Rector\RectorInterface;
|
||||
use Rector\Core\NodeDecorator\CreatedByRuleDecorator;
|
||||
use Rector\Core\PhpParser\Comparing\NodeComparator;
|
||||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\Core\PhpParser\Node\NodeFactory;
|
||||
use Rector\Core\PhpParser\Node\Value\ValueResolver;
|
||||
use Rector\Core\PhpParser\NodeTraverser\RectorNodeTraverser;
|
||||
use Rector\Core\Provider\CurrentFileProvider;
|
||||
use Rector\Core\Rector\AbstractRector;
|
||||
|
@ -313,25 +311,7 @@ final class LazyContainerFactory
|
|||
$rectorConfig->when(Skipper::class)->needs('$skipVoters')->giveTagged(SkipVoterInterface::class);
|
||||
$this->registerTagged($rectorConfig, self::SKIP_VOTER_CLASSES, SkipVoterInterface::class);
|
||||
$rectorConfig->afterResolving(AbstractRector::class, static function (AbstractRector $rector, Container $container) : void {
|
||||
$rector->autowire(
|
||||
$container->get(NodeNameResolver::class),
|
||||
$container->get(NodeTypeResolver::class),
|
||||
$container->get(SimpleCallableNodeTraverser::class),
|
||||
$container->get(NodeFactory::class),
|
||||
// @deprecated, use injected service in your Rector rules
|
||||
$container->get(PhpDocInfoFactory::class),
|
||||
// @deprecated, use injected service in your Rector rules
|
||||
$container->get(StaticTypeMapper::class),
|
||||
$container->get(Skipper::class),
|
||||
// @deprecated, use injected service in your Rector rules
|
||||
$container->get(ValueResolver::class),
|
||||
// @deprecated, use injected service in your Rector rules
|
||||
$container->get(BetterNodeFinder::class),
|
||||
$container->get(NodeComparator::class),
|
||||
$container->get(CurrentFileProvider::class),
|
||||
$container->get(CreatedByRuleDecorator::class),
|
||||
$container->get(ChangedNodeScopeRefresher::class)
|
||||
);
|
||||
$rector->autowire($container->get(NodeNameResolver::class), $container->get(NodeTypeResolver::class), $container->get(SimpleCallableNodeTraverser::class), $container->get(NodeFactory::class), $container->get(Skipper::class), $container->get(NodeComparator::class), $container->get(CurrentFileProvider::class), $container->get(CreatedByRuleDecorator::class), $container->get(ChangedNodeScopeRefresher::class));
|
||||
});
|
||||
$this->registerTagged($rectorConfig, self::PHP_PARSER_NODE_MAPPER_CLASSES, PhpParserNodeMapperInterface::class);
|
||||
$this->registerTagged($rectorConfig, self::PHP_DOC_NODE_DECORATOR_CLASSES, PhpDocNodeDecoratorInterface::class);
|
||||
|
|
|
@ -11,16 +11,13 @@ use PhpParser\NodeVisitorAbstract;
|
|||
use PHPStan\Analyser\MutatingScope;
|
||||
use PHPStan\Type\ObjectType;
|
||||
use PHPStan\Type\Type;
|
||||
use Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory;
|
||||
use Rector\ChangesReporting\ValueObject\RectorWithLineChange;
|
||||
use Rector\Core\Application\ChangedNodeScopeRefresher;
|
||||
use Rector\Core\Contract\Rector\RectorInterface;
|
||||
use Rector\Core\Exception\ShouldNotHappenException;
|
||||
use Rector\Core\NodeDecorator\CreatedByRuleDecorator;
|
||||
use Rector\Core\PhpParser\Comparing\NodeComparator;
|
||||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\Core\PhpParser\Node\NodeFactory;
|
||||
use Rector\Core\PhpParser\Node\Value\ValueResolver;
|
||||
use Rector\Core\Provider\CurrentFileProvider;
|
||||
use Rector\Core\ValueObject\Application\File;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
|
@ -28,16 +25,6 @@ use Rector\NodeTypeResolver\Node\AttributeKey;
|
|||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\Skipper\Skipper\Skipper;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
/**
|
||||
* @property-read PhpDocInfoFactory $phpDocInfoFactory; @deprecated The parent AbstractRector dependency is deprecated and will be removed. Use dependency injection in your own rule instead.
|
||||
*
|
||||
* @property-read ValueResolver $valueResolver; @deprecated The parent AbstractRector dependency is deprecated and will be removed. Use dependency injection in your own rule instead.
|
||||
*
|
||||
* @property-read BetterNodeFinder $betterNodeFinder; @deprecated The parent AbstractRector dependency is deprecated and will be removed. Use dependency injection in your own rule instead.
|
||||
*
|
||||
* @property-read StaticTypeMapper $staticTypeMapper; @deprecated The parent AbstractRector dependency is deprecated and will be removed. Use dependency injection in your own rule instead.
|
||||
*/
|
||||
abstract class AbstractRector extends NodeVisitorAbstract implements RectorInterface
|
||||
{
|
||||
/**
|
||||
|
@ -123,7 +110,7 @@ CODE_SAMPLE;
|
|||
}
|
||||
return $this->deprecatedDependencies[$name] ?? null;
|
||||
}
|
||||
public function autowire(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeFactory $nodeFactory, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, Skipper $skipper, ValueResolver $valueResolver, BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator, CurrentFileProvider $currentFileProvider, CreatedByRuleDecorator $createdByRuleDecorator, ChangedNodeScopeRefresher $changedNodeScopeRefresher) : void
|
||||
public function autowire(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeFactory $nodeFactory, Skipper $skipper, NodeComparator $nodeComparator, CurrentFileProvider $currentFileProvider, CreatedByRuleDecorator $createdByRuleDecorator, ChangedNodeScopeRefresher $changedNodeScopeRefresher) : void
|
||||
{
|
||||
$this->nodeNameResolver = $nodeNameResolver;
|
||||
$this->nodeTypeResolver = $nodeTypeResolver;
|
||||
|
@ -134,10 +121,6 @@ CODE_SAMPLE;
|
|||
$this->currentFileProvider = $currentFileProvider;
|
||||
$this->createdByRuleDecorator = $createdByRuleDecorator;
|
||||
$this->changedNodeScopeRefresher = $changedNodeScopeRefresher;
|
||||
$this->deprecatedDependencies['phpDocInfoFactory'] = $phpDocInfoFactory;
|
||||
$this->deprecatedDependencies['valueResolver'] = $valueResolver;
|
||||
$this->deprecatedDependencies['betterNodeFinder'] = $betterNodeFinder;
|
||||
$this->deprecatedDependencies['staticTypeMapper'] = $staticTypeMapper;
|
||||
}
|
||||
/**
|
||||
* @return Node[]|null
|
||||
|
|
Loading…
Reference in New Issue
Block a user