mirror of
https://github.com/rectorphp/rector.git
synced 2024-05-31 08:20:53 +00:00
Updated Rector to commit 45766e1d95
45766e1d95 Decopule ChildClassMethodDecorator, and DependencyClassMethodDecorator (#600)This commit is contained in:
Tomas Votruba
parent
cedca442f9
commit
499d6ba043
|
|
@ -1,84 +0,0 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\NodeCollector\NodeCollector;
|
||||
|
||||
use PhpParser\Node\Stmt\Class_;
|
||||
use PHPStan\Reflection\ReflectionProvider;
|
||||
use Rector\Core\Exception\ShouldNotHappenException;
|
||||
use Rector\Core\NodeAnalyzer\ClassAnalyzer;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
/**
|
||||
* This service contains all the parsed nodes. E.g. all the functions, method call, classes, static calls etc. It's
|
||||
* useful in case of context analysis, e.g. find all the usage of class method to detect, if the method is used.
|
||||
*
|
||||
* @deprecated
|
||||
*/
|
||||
final class NodeRepository
|
||||
{
|
||||
/**
|
||||
* @deprecated Not reliable, as only works with so-far parsed classes
|
||||
* @var Class_[]
|
||||
*/
|
||||
private $classes = [];
|
||||
/**
|
||||
* @var \Rector\Core\NodeAnalyzer\ClassAnalyzer
|
||||
*/
|
||||
private $classAnalyzer;
|
||||
/**
|
||||
* @var \PHPStan\Reflection\ReflectionProvider
|
||||
*/
|
||||
private $reflectionProvider;
|
||||
public function __construct(\Rector\Core\NodeAnalyzer\ClassAnalyzer $classAnalyzer, \PHPStan\Reflection\ReflectionProvider $reflectionProvider)
|
||||
{
|
||||
$this->classAnalyzer = $classAnalyzer;
|
||||
$this->reflectionProvider = $reflectionProvider;
|
||||
}
|
||||
public function collectClass(\PhpParser\Node\Stmt\Class_ $class) : void
|
||||
{
|
||||
if ($this->classAnalyzer->isAnonymousClass($class)) {
|
||||
return;
|
||||
}
|
||||
$className = $class->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CLASS_NAME);
|
||||
if ($className === null) {
|
||||
throw new \Rector\Core\Exception\ShouldNotHappenException();
|
||||
}
|
||||
$this->classes[$className] = $class;
|
||||
}
|
||||
/**
|
||||
* @param class-string $className
|
||||
* @return Class_[]
|
||||
* @deprecated Use static reflection instead
|
||||
*/
|
||||
public function findChildrenOfClass(string $className) : array
|
||||
{
|
||||
$childrenClasses = [];
|
||||
// @todo refactor to reflection
|
||||
foreach ($this->classes as $class) {
|
||||
$currentClassName = $class->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CLASS_NAME);
|
||||
if ($currentClassName === null) {
|
||||
continue;
|
||||
}
|
||||
if (!$this->isChildOrEqualClassLike($className, $currentClassName)) {
|
||||
continue;
|
||||
}
|
||||
$childrenClasses[] = $class;
|
||||
}
|
||||
return $childrenClasses;
|
||||
}
|
||||
private function isChildOrEqualClassLike(string $desiredClass, string $currentClassName) : bool
|
||||
{
|
||||
if (!$this->reflectionProvider->hasClass($desiredClass)) {
|
||||
return \false;
|
||||
}
|
||||
if (!$this->reflectionProvider->hasClass($currentClassName)) {
|
||||
return \false;
|
||||
}
|
||||
$desiredClassReflection = $this->reflectionProvider->getClass($desiredClass);
|
||||
$currentClassReflection = $this->reflectionProvider->getClass($currentClassName);
|
||||
if (!$currentClassReflection->isSubclassOf($desiredClassReflection->getName())) {
|
||||
return \false;
|
||||
}
|
||||
return $currentClassName !== $desiredClass;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\NodeCollector\NodeVisitor;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Stmt\Class_;
|
||||
use PhpParser\NodeVisitorAbstract;
|
||||
use Rector\NodeCollector\NodeCollector\NodeRepository;
|
||||
final class NodeCollectorNodeVisitor extends \PhpParser\NodeVisitorAbstract
|
||||
{
|
||||
/**
|
||||
* @var \Rector\NodeCollector\NodeCollector\NodeRepository
|
||||
*/
|
||||
private $nodeRepository;
|
||||
public function __construct(\Rector\NodeCollector\NodeCollector\NodeRepository $nodeRepository)
|
||||
{
|
||||
$this->nodeRepository = $nodeRepository;
|
||||
}
|
||||
public function enterNode(\PhpParser\Node $node)
|
||||
{
|
||||
if ($node instanceof \PhpParser\Node\Stmt\Class_) {
|
||||
$this->nodeRepository->collectClass($node);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -9,7 +9,6 @@ use PhpParser\NodeVisitor\CloningVisitor;
|
|||
use PhpParser\NodeVisitor\NameResolver;
|
||||
use PhpParser\NodeVisitor\NodeConnectingVisitor;
|
||||
use Rector\Core\ValueObject\Application\File;
|
||||
use Rector\NodeCollector\NodeVisitor\NodeCollectorNodeVisitor;
|
||||
use Rector\NodeTypeResolver\NodeVisitor\FileNodeVisitor;
|
||||
use Rector\NodeTypeResolver\NodeVisitor\FunctionLikeParamArgPositionNodeVisitor;
|
||||
use Rector\NodeTypeResolver\NodeVisitor\FunctionMethodAndClassNodeVisitor;
|
||||
|
|
@ -30,10 +29,6 @@ final class NodeScopeAndMetadataDecorator
|
|||
* @var \Rector\NodeTypeResolver\NodeVisitor\NamespaceNodeVisitor
|
||||
*/
|
||||
private $namespaceNodeVisitor;
|
||||
/**
|
||||
* @var \Rector\NodeCollector\NodeVisitor\NodeCollectorNodeVisitor
|
||||
*/
|
||||
private $nodeCollectorNodeVisitor;
|
||||
/**
|
||||
* @var \Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver
|
||||
*/
|
||||
|
|
@ -50,12 +45,11 @@ final class NodeScopeAndMetadataDecorator
|
|||
* @var \Rector\NodeTypeResolver\NodeVisitor\FunctionLikeParamArgPositionNodeVisitor
|
||||
*/
|
||||
private $functionLikeParamArgPositionNodeVisitor;
|
||||
public function __construct(\PhpParser\NodeVisitor\CloningVisitor $cloningVisitor, \Rector\NodeTypeResolver\NodeVisitor\FunctionMethodAndClassNodeVisitor $functionMethodAndClassNodeVisitor, \Rector\NodeTypeResolver\NodeVisitor\NamespaceNodeVisitor $namespaceNodeVisitor, \Rector\NodeCollector\NodeVisitor\NodeCollectorNodeVisitor $nodeCollectorNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver $phpStanNodeScopeResolver, \Rector\NodeTypeResolver\NodeVisitor\StatementNodeVisitor $statementNodeVisitor, \PhpParser\NodeVisitor\NodeConnectingVisitor $nodeConnectingVisitor, \Rector\NodeTypeResolver\NodeVisitor\FunctionLikeParamArgPositionNodeVisitor $functionLikeParamArgPositionNodeVisitor)
|
||||
public function __construct(\PhpParser\NodeVisitor\CloningVisitor $cloningVisitor, \Rector\NodeTypeResolver\NodeVisitor\FunctionMethodAndClassNodeVisitor $functionMethodAndClassNodeVisitor, \Rector\NodeTypeResolver\NodeVisitor\NamespaceNodeVisitor $namespaceNodeVisitor, \Rector\NodeTypeResolver\PHPStan\Scope\PHPStanNodeScopeResolver $phpStanNodeScopeResolver, \Rector\NodeTypeResolver\NodeVisitor\StatementNodeVisitor $statementNodeVisitor, \PhpParser\NodeVisitor\NodeConnectingVisitor $nodeConnectingVisitor, \Rector\NodeTypeResolver\NodeVisitor\FunctionLikeParamArgPositionNodeVisitor $functionLikeParamArgPositionNodeVisitor)
|
||||
{
|
||||
$this->cloningVisitor = $cloningVisitor;
|
||||
$this->functionMethodAndClassNodeVisitor = $functionMethodAndClassNodeVisitor;
|
||||
$this->namespaceNodeVisitor = $namespaceNodeVisitor;
|
||||
$this->nodeCollectorNodeVisitor = $nodeCollectorNodeVisitor;
|
||||
$this->phpStanNodeScopeResolver = $phpStanNodeScopeResolver;
|
||||
$this->statementNodeVisitor = $statementNodeVisitor;
|
||||
$this->nodeConnectingVisitor = $nodeConnectingVisitor;
|
||||
|
|
@ -98,7 +92,6 @@ final class NodeScopeAndMetadataDecorator
|
|||
// this split is needed, so nodes have names, classes and namespaces
|
||||
$nodeTraverser = new \PhpParser\NodeTraverser();
|
||||
$nodeTraverser->addVisitor($this->statementNodeVisitor);
|
||||
$nodeTraverser->addVisitor($this->nodeCollectorNodeVisitor);
|
||||
return $nodeTraverser->traverse($nodes);
|
||||
}
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@ final class VersionResolver
|
|||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = 'c2acf79190949005a21fbacae74ba08a740d4058';
|
||||
public const PACKAGE_VERSION = '45766e1d95f9797040738c8b286312202632ccd4';
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2021-08-06 08:39:47';
|
||||
public const RELEASE_DATE = '2021-08-06 10:39:44';
|
||||
public static function resolvePackageVersion() : string
|
||||
{
|
||||
$process = new \RectorPrefix20210806\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__);
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ use PHPStan\Analyser\Scope;
|
|||
use PHPStan\Reflection\ClassReflection;
|
||||
use PHPStan\Type\Type;
|
||||
use Rector\Core\NodeAnalyzer\PropertyPresenceChecker;
|
||||
use Rector\Core\NodeManipulator\Dependency\DependencyClassMethodDecorator;
|
||||
use Rector\Core\Php\PhpVersionProvider;
|
||||
use Rector\Core\PhpParser\Node\NodeFactory;
|
||||
use Rector\Core\ValueObject\MethodName;
|
||||
|
|
@ -26,10 +27,6 @@ use Rector\PostRector\ValueObject\PropertyMetadata;
|
|||
use Rector\TypeDeclaration\NodeAnalyzer\AutowiredClassMethodOrPropertyAnalyzer;
|
||||
final class ClassDependencyManipulator
|
||||
{
|
||||
/**
|
||||
* @var \Rector\Core\NodeManipulator\ChildAndParentClassManipulator
|
||||
*/
|
||||
private $childAndParentClassManipulator;
|
||||
/**
|
||||
* @var \Rector\Core\NodeManipulator\ClassInsertManipulator
|
||||
*/
|
||||
|
|
@ -66,9 +63,12 @@ final class ClassDependencyManipulator
|
|||
* @var \Rector\TypeDeclaration\NodeAnalyzer\AutowiredClassMethodOrPropertyAnalyzer
|
||||
*/
|
||||
private $autowiredClassMethodOrPropertyAnalyzer;
|
||||
public function __construct(\Rector\Core\NodeManipulator\ChildAndParentClassManipulator $childAndParentClassManipulator, \Rector\Core\NodeManipulator\ClassInsertManipulator $classInsertManipulator, \Rector\Core\NodeManipulator\ClassMethodAssignManipulator $classMethodAssignManipulator, \Rector\Core\PhpParser\Node\NodeFactory $nodeFactory, \Rector\Core\NodeManipulator\StmtsManipulator $stmtsManipulator, \Rector\Core\Php\PhpVersionProvider $phpVersionProvider, \Rector\Core\NodeAnalyzer\PropertyPresenceChecker $propertyPresenceChecker, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\PostRector\Collector\NodesToRemoveCollector $nodesToRemoveCollector, \Rector\TypeDeclaration\NodeAnalyzer\AutowiredClassMethodOrPropertyAnalyzer $autowiredClassMethodOrPropertyAnalyzer)
|
||||
/**
|
||||
* @var \Rector\Core\NodeManipulator\Dependency\DependencyClassMethodDecorator
|
||||
*/
|
||||
private $dependencyClassMethodDecorator;
|
||||
public function __construct(\Rector\Core\NodeManipulator\ClassInsertManipulator $classInsertManipulator, \Rector\Core\NodeManipulator\ClassMethodAssignManipulator $classMethodAssignManipulator, \Rector\Core\PhpParser\Node\NodeFactory $nodeFactory, \Rector\Core\NodeManipulator\StmtsManipulator $stmtsManipulator, \Rector\Core\Php\PhpVersionProvider $phpVersionProvider, \Rector\Core\NodeAnalyzer\PropertyPresenceChecker $propertyPresenceChecker, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\PostRector\Collector\NodesToRemoveCollector $nodesToRemoveCollector, \Rector\TypeDeclaration\NodeAnalyzer\AutowiredClassMethodOrPropertyAnalyzer $autowiredClassMethodOrPropertyAnalyzer, \Rector\Core\NodeManipulator\Dependency\DependencyClassMethodDecorator $dependencyClassMethodDecorator)
|
||||
{
|
||||
$this->childAndParentClassManipulator = $childAndParentClassManipulator;
|
||||
$this->classInsertManipulator = $classInsertManipulator;
|
||||
$this->classMethodAssignManipulator = $classMethodAssignManipulator;
|
||||
$this->nodeFactory = $nodeFactory;
|
||||
|
|
@ -78,6 +78,7 @@ final class ClassDependencyManipulator
|
|||
$this->nodeNameResolver = $nodeNameResolver;
|
||||
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
|
||||
$this->autowiredClassMethodOrPropertyAnalyzer = $autowiredClassMethodOrPropertyAnalyzer;
|
||||
$this->dependencyClassMethodDecorator = $dependencyClassMethodDecorator;
|
||||
}
|
||||
public function addConstructorDependency(\PhpParser\Node\Stmt\Class_ $class, \Rector\PostRector\ValueObject\PropertyMetadata $propertyMetadata) : void
|
||||
{
|
||||
|
|
@ -107,8 +108,7 @@ final class ClassDependencyManipulator
|
|||
$this->classInsertManipulator->addAsFirstMethod($class, $constructorMethod);
|
||||
/** @var Scope $scope */
|
||||
$scope = $class->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE);
|
||||
$this->childAndParentClassManipulator->completeParentConstructor($class, $constructorMethod, $scope);
|
||||
$this->childAndParentClassManipulator->completeChildConstructors($class, $constructorMethod);
|
||||
$this->dependencyClassMethodDecorator->decorateConstructorWithParentDependencies($class, $constructorMethod, $scope);
|
||||
}
|
||||
/**
|
||||
* @param Stmt[] $stmts
|
||||
|
|
@ -157,8 +157,7 @@ final class ClassDependencyManipulator
|
|||
}
|
||||
/** @var Scope $scope */
|
||||
$scope = $class->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE);
|
||||
$this->childAndParentClassManipulator->completeParentConstructor($class, $constructClassMethod, $scope);
|
||||
$this->childAndParentClassManipulator->completeChildConstructors($class, $constructClassMethod);
|
||||
$this->dependencyClassMethodDecorator->decorateConstructorWithParentDependencies($class, $constructClassMethod, $scope);
|
||||
}
|
||||
private function hasClassParentClassMethod(\PhpParser\Node\Stmt\Class_ $class, string $methodName) : bool
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\Core\NodeManipulator;
|
||||
namespace Rector\Core\NodeManipulator\Dependency;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Param;
|
||||
|
|
@ -14,10 +14,9 @@ use Rector\Core\NodeAnalyzer\PromotedPropertyParamCleaner;
|
|||
use Rector\Core\PhpParser\AstResolver;
|
||||
use Rector\Core\PhpParser\Node\NodeFactory;
|
||||
use Rector\Core\ValueObject\MethodName;
|
||||
use Rector\NodeCollector\NodeCollector\NodeRepository;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use RectorPrefix20210806\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
final class ChildAndParentClassManipulator
|
||||
final class DependencyClassMethodDecorator
|
||||
{
|
||||
/**
|
||||
* @var \Rector\Core\PhpParser\Node\NodeFactory
|
||||
|
|
@ -27,10 +26,6 @@ final class ChildAndParentClassManipulator
|
|||
* @var \Rector\NodeNameResolver\NodeNameResolver
|
||||
*/
|
||||
private $nodeNameResolver;
|
||||
/**
|
||||
* @var \Rector\NodeCollector\NodeCollector\NodeRepository
|
||||
*/
|
||||
private $nodeRepository;
|
||||
/**
|
||||
* @var \Rector\Core\NodeAnalyzer\PromotedPropertyParamCleaner
|
||||
*/
|
||||
|
|
@ -47,11 +42,10 @@ final class ChildAndParentClassManipulator
|
|||
* @var \Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
private $simpleCallableNodeTraverser;
|
||||
public function __construct(\Rector\Core\PhpParser\Node\NodeFactory $nodeFactory, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\NodeCollector\NodeCollector\NodeRepository $nodeRepository, \Rector\Core\NodeAnalyzer\PromotedPropertyParamCleaner $promotedPropertyParamCleaner, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\Core\PhpParser\AstResolver $astResolver, \RectorPrefix20210806\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
|
||||
public function __construct(\Rector\Core\PhpParser\Node\NodeFactory $nodeFactory, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\Core\NodeAnalyzer\PromotedPropertyParamCleaner $promotedPropertyParamCleaner, \PHPStan\Reflection\ReflectionProvider $reflectionProvider, \Rector\Core\PhpParser\AstResolver $astResolver, \RectorPrefix20210806\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser)
|
||||
{
|
||||
$this->nodeFactory = $nodeFactory;
|
||||
$this->nodeNameResolver = $nodeNameResolver;
|
||||
$this->nodeRepository = $nodeRepository;
|
||||
$this->promotedPropertyParamCleaner = $promotedPropertyParamCleaner;
|
||||
$this->reflectionProvider = $reflectionProvider;
|
||||
$this->astResolver = $astResolver;
|
||||
|
|
@ -60,7 +54,7 @@ final class ChildAndParentClassManipulator
|
|||
/**
|
||||
* Add "parent::__construct(X, Y, Z)" where needed
|
||||
*/
|
||||
public function completeParentConstructor(\PhpParser\Node\Stmt\Class_ $class, \PhpParser\Node\Stmt\ClassMethod $classMethod, \PHPStan\Analyser\Scope $scope) : void
|
||||
public function decorateConstructorWithParentDependencies(\PhpParser\Node\Stmt\Class_ $class, \PhpParser\Node\Stmt\ClassMethod $classMethod, \PHPStan\Analyser\Scope $scope) : void
|
||||
{
|
||||
$className = $this->nodeNameResolver->getName($class);
|
||||
if ($className === null) {
|
||||
|
|
@ -83,24 +77,6 @@ final class ChildAndParentClassManipulator
|
|||
break;
|
||||
}
|
||||
}
|
||||
public function completeChildConstructors(\PhpParser\Node\Stmt\Class_ $class, \PhpParser\Node\Stmt\ClassMethod $constructorClassMethod) : void
|
||||
{
|
||||
$className = $this->nodeNameResolver->getName($class);
|
||||
if ($className === null) {
|
||||
return;
|
||||
}
|
||||
$childClasses = $this->nodeRepository->findChildrenOfClass($className);
|
||||
foreach ($childClasses as $childClass) {
|
||||
$childConstructorClassMethod = $childClass->getMethod(\Rector\Core\ValueObject\MethodName::CONSTRUCT);
|
||||
if (!$childConstructorClassMethod instanceof \PhpParser\Node\Stmt\ClassMethod) {
|
||||
continue;
|
||||
}
|
||||
// replicate parent parameters
|
||||
$childConstructorClassMethod->params = \array_merge($constructorClassMethod->params, $childConstructorClassMethod->params);
|
||||
$parentConstructCallNode = $this->nodeFactory->createParentConstructWithParams($constructorClassMethod->params);
|
||||
$childConstructorClassMethod->stmts = \array_merge([new \PhpParser\Node\Stmt\Expression($parentConstructCallNode)], (array) $childConstructorClassMethod->stmts);
|
||||
}
|
||||
}
|
||||
private function completeParentConstructorBasedOnParentNode(\PhpParser\Node\Stmt\ClassMethod $classMethod, \PhpParser\Node\Stmt\ClassMethod $parentClassMethod) : void
|
||||
{
|
||||
$paramsWithoutDefaultValue = [];
|
||||
|
|
@ -36,7 +36,6 @@ use Rector\Core\PhpParser\Printer\BetterStandardPrinter;
|
|||
use Rector\Core\Provider\CurrentFileProvider;
|
||||
use Rector\Core\Validation\InfiniteLoopValidator;
|
||||
use Rector\Core\ValueObject\Application\File;
|
||||
use Rector\NodeCollector\NodeCollector\NodeRepository;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeRemoval\NodeRemover;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
|
|
@ -103,10 +102,6 @@ abstract class AbstractRector extends \PhpParser\NodeVisitorAbstract implements
|
|||
* @var \Rector\Core\PhpParser\Node\Value\ValueResolver
|
||||
*/
|
||||
protected $valueResolver;
|
||||
/**
|
||||
* @var \Rector\NodeCollector\NodeCollector\NodeRepository
|
||||
*/
|
||||
protected $nodeRepository;
|
||||
/**
|
||||
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
|
||||
*/
|
||||
|
|
@ -182,7 +177,7 @@ abstract class AbstractRector extends \PhpParser\NodeVisitorAbstract implements
|
|||
/**
|
||||
* @required
|
||||
*/
|
||||
public function autowireAbstractRector(\Rector\PostRector\Collector\NodesToRemoveCollector $nodesToRemoveCollector, \Rector\PostRector\Collector\NodesToAddCollector $nodesToAddCollector, \Rector\ChangesReporting\Collector\RectorChangeCollector $rectorChangeCollector, \Rector\NodeRemoval\NodeRemover $nodeRemover, \Rector\Core\Application\FileSystem\RemovedAndAddedFilesCollector $removedAndAddedFilesCollector, \Rector\Core\PhpParser\Printer\BetterStandardPrinter $betterStandardPrinter, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\NodeTypeResolver\NodeTypeResolver $nodeTypeResolver, \RectorPrefix20210806\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser, \Rector\Privatization\NodeManipulator\VisibilityManipulator $visibilityManipulator, \Rector\Core\PhpParser\Node\NodeFactory $nodeFactory, \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \RectorPrefix20210806\Symfony\Component\Console\Style\SymfonyStyle $symfonyStyle, \Rector\Core\Php\PhpVersionProvider $phpVersionProvider, \Rector\Core\Exclusion\ExclusionManager $exclusionManager, \Rector\StaticTypeMapper\StaticTypeMapper $staticTypeMapper, \RectorPrefix20210806\Symplify\PackageBuilder\Parameter\ParameterProvider $parameterProvider, \Rector\Core\Logging\CurrentRectorProvider $currentRectorProvider, \Rector\Core\Configuration\CurrentNodeProvider $currentNodeProvider, \RectorPrefix20210806\Symplify\Skipper\Skipper\Skipper $skipper, \Rector\Core\PhpParser\Node\Value\ValueResolver $valueResolver, \Rector\NodeCollector\NodeCollector\NodeRepository $nodeRepository, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator, \Rector\Core\Provider\CurrentFileProvider $currentFileProvider, \Rector\Core\NodeAnalyzer\ChangedNodeAnalyzer $changedNodeAnalyzer, \Rector\Core\Validation\InfiniteLoopValidator $infiniteLoopValidator) : void
|
||||
public function autowireAbstractRector(\Rector\PostRector\Collector\NodesToRemoveCollector $nodesToRemoveCollector, \Rector\PostRector\Collector\NodesToAddCollector $nodesToAddCollector, \Rector\ChangesReporting\Collector\RectorChangeCollector $rectorChangeCollector, \Rector\NodeRemoval\NodeRemover $nodeRemover, \Rector\Core\Application\FileSystem\RemovedAndAddedFilesCollector $removedAndAddedFilesCollector, \Rector\Core\PhpParser\Printer\BetterStandardPrinter $betterStandardPrinter, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver, \Rector\NodeTypeResolver\NodeTypeResolver $nodeTypeResolver, \RectorPrefix20210806\Symplify\Astral\NodeTraverser\SimpleCallableNodeTraverser $simpleCallableNodeTraverser, \Rector\Privatization\NodeManipulator\VisibilityManipulator $visibilityManipulator, \Rector\Core\PhpParser\Node\NodeFactory $nodeFactory, \Rector\BetterPhpDocParser\PhpDocInfo\PhpDocInfoFactory $phpDocInfoFactory, \RectorPrefix20210806\Symfony\Component\Console\Style\SymfonyStyle $symfonyStyle, \Rector\Core\Php\PhpVersionProvider $phpVersionProvider, \Rector\Core\Exclusion\ExclusionManager $exclusionManager, \Rector\StaticTypeMapper\StaticTypeMapper $staticTypeMapper, \RectorPrefix20210806\Symplify\PackageBuilder\Parameter\ParameterProvider $parameterProvider, \Rector\Core\Logging\CurrentRectorProvider $currentRectorProvider, \Rector\Core\Configuration\CurrentNodeProvider $currentNodeProvider, \RectorPrefix20210806\Symplify\Skipper\Skipper\Skipper $skipper, \Rector\Core\PhpParser\Node\Value\ValueResolver $valueResolver, \Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\Core\PhpParser\Comparing\NodeComparator $nodeComparator, \Rector\Core\Provider\CurrentFileProvider $currentFileProvider, \Rector\Core\NodeAnalyzer\ChangedNodeAnalyzer $changedNodeAnalyzer, \Rector\Core\Validation\InfiniteLoopValidator $infiniteLoopValidator) : void
|
||||
{
|
||||
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
|
||||
$this->nodesToAddCollector = $nodesToAddCollector;
|
||||
|
|
@ -205,7 +200,6 @@ abstract class AbstractRector extends \PhpParser\NodeVisitorAbstract implements
|
|||
$this->currentNodeProvider = $currentNodeProvider;
|
||||
$this->skipper = $skipper;
|
||||
$this->valueResolver = $valueResolver;
|
||||
$this->nodeRepository = $nodeRepository;
|
||||
$this->betterNodeFinder = $betterNodeFinder;
|
||||
$this->nodeComparator = $nodeComparator;
|
||||
$this->currentFileProvider = $currentFileProvider;
|
||||
|
|
|
|||
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
|
@ -4,4 +4,4 @@
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit023a10cf85b690bf9054bda8136dfcef::getLoader();
|
||||
return ComposerAutoloaderInit6880bc14858460aa28c80d26ae6211b8::getLoader();
|
||||
|
|
|
|||
4
vendor/composer/autoload_classmap.php
vendored
4
vendor/composer/autoload_classmap.php
vendored
|
|
@ -1844,7 +1844,6 @@ return array(
|
|||
'Rector\\Core\\NodeManipulator\\ArrayManipulator' => $baseDir . '/src/NodeManipulator/ArrayManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\AssignManipulator' => $baseDir . '/src/NodeManipulator/AssignManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\BinaryOpManipulator' => $baseDir . '/src/NodeManipulator/BinaryOpManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ChildAndParentClassManipulator' => $baseDir . '/src/NodeManipulator/ChildAndParentClassManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ClassConstManipulator' => $baseDir . '/src/NodeManipulator/ClassConstManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ClassDependencyManipulator' => $baseDir . '/src/NodeManipulator/ClassDependencyManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ClassInsertManipulator' => $baseDir . '/src/NodeManipulator/ClassInsertManipulator.php',
|
||||
|
|
@ -1852,6 +1851,7 @@ return array(
|
|||
'Rector\\Core\\NodeManipulator\\ClassMethodAssignManipulator' => $baseDir . '/src/NodeManipulator/ClassMethodAssignManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ClassMethodManipulator' => $baseDir . '/src/NodeManipulator/ClassMethodManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ClassMethodPropertyFetchManipulator' => $baseDir . '/src/NodeManipulator/ClassMethodPropertyFetchManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\Dependency\\DependencyClassMethodDecorator' => $baseDir . '/src/NodeManipulator/Dependency/DependencyClassMethodDecorator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ForeachManipulator' => $baseDir . '/src/NodeManipulator/ForeachManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\FuncCallManipulator' => $baseDir . '/src/NodeManipulator/FuncCallManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\FunctionLikeManipulator' => $baseDir . '/src/NodeManipulator/FunctionLikeManipulator.php',
|
||||
|
|
@ -2406,8 +2406,6 @@ return array(
|
|||
'Rector\\Nette\\ValueObject\\TemplateParametersAssigns' => $vendorDir . '/rector/rector-nette/src/ValueObject/TemplateParametersAssigns.php',
|
||||
'Rector\\NodeCollector\\NodeAnalyzer\\ArrayCallableMethodMatcher' => $baseDir . '/packages/NodeCollector/NodeAnalyzer/ArrayCallableMethodMatcher.php',
|
||||
'Rector\\NodeCollector\\NodeAnalyzer\\BooleanAndAnalyzer' => $baseDir . '/packages/NodeCollector/NodeAnalyzer/BooleanAndAnalyzer.php',
|
||||
'Rector\\NodeCollector\\NodeCollector\\NodeRepository' => $baseDir . '/packages/NodeCollector/NodeCollector/NodeRepository.php',
|
||||
'Rector\\NodeCollector\\NodeVisitor\\NodeCollectorNodeVisitor' => $baseDir . '/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php',
|
||||
'Rector\\NodeCollector\\ScopeResolver\\ParentClassScopeResolver' => $baseDir . '/packages/NodeCollector/ScopeResolver/ParentClassScopeResolver.php',
|
||||
'Rector\\NodeCollector\\StaticAnalyzer' => $baseDir . '/packages/NodeCollector/StaticAnalyzer.php',
|
||||
'Rector\\NodeCollector\\ValueObject\\ArrayCallable' => $baseDir . '/packages/NodeCollector/ValueObject/ArrayCallable.php',
|
||||
|
|
|
|||
14
vendor/composer/autoload_real.php
vendored
14
vendor/composer/autoload_real.php
vendored
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit023a10cf85b690bf9054bda8136dfcef
|
||||
class ComposerAutoloaderInit6880bc14858460aa28c80d26ae6211b8
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
|
@ -22,15 +22,15 @@ class ComposerAutoloaderInit023a10cf85b690bf9054bda8136dfcef
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit023a10cf85b690bf9054bda8136dfcef', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit6880bc14858460aa28c80d26ae6211b8', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit023a10cf85b690bf9054bda8136dfcef', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit6880bc14858460aa28c80d26ae6211b8', '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\ComposerStaticInit023a10cf85b690bf9054bda8136dfcef::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit6880bc14858460aa28c80d26ae6211b8::getInitializer($loader));
|
||||
} else {
|
||||
$classMap = require __DIR__ . '/autoload_classmap.php';
|
||||
if ($classMap) {
|
||||
|
|
@ -42,19 +42,19 @@ class ComposerAutoloaderInit023a10cf85b690bf9054bda8136dfcef
|
|||
$loader->register(true);
|
||||
|
||||
if ($useStaticLoader) {
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInit023a10cf85b690bf9054bda8136dfcef::$files;
|
||||
$includeFiles = Composer\Autoload\ComposerStaticInit6880bc14858460aa28c80d26ae6211b8::$files;
|
||||
} else {
|
||||
$includeFiles = require __DIR__ . '/autoload_files.php';
|
||||
}
|
||||
foreach ($includeFiles as $fileIdentifier => $file) {
|
||||
composerRequire023a10cf85b690bf9054bda8136dfcef($fileIdentifier, $file);
|
||||
composerRequire6880bc14858460aa28c80d26ae6211b8($fileIdentifier, $file);
|
||||
}
|
||||
|
||||
return $loader;
|
||||
}
|
||||
}
|
||||
|
||||
function composerRequire023a10cf85b690bf9054bda8136dfcef($fileIdentifier, $file)
|
||||
function composerRequire6880bc14858460aa28c80d26ae6211b8($fileIdentifier, $file)
|
||||
{
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
require $file;
|
||||
|
|
|
|||
12
vendor/composer/autoload_static.php
vendored
12
vendor/composer/autoload_static.php
vendored
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit023a10cf85b690bf9054bda8136dfcef
|
||||
class ComposerStaticInit6880bc14858460aa28c80d26ae6211b8
|
||||
{
|
||||
public static $files = array (
|
||||
'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
|
||||
|
|
@ -2204,7 +2204,6 @@ class ComposerStaticInit023a10cf85b690bf9054bda8136dfcef
|
|||
'Rector\\Core\\NodeManipulator\\ArrayManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/ArrayManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\AssignManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/AssignManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\BinaryOpManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/BinaryOpManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ChildAndParentClassManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/ChildAndParentClassManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ClassConstManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/ClassConstManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ClassDependencyManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/ClassDependencyManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ClassInsertManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/ClassInsertManipulator.php',
|
||||
|
|
@ -2212,6 +2211,7 @@ class ComposerStaticInit023a10cf85b690bf9054bda8136dfcef
|
|||
'Rector\\Core\\NodeManipulator\\ClassMethodAssignManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/ClassMethodAssignManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ClassMethodManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/ClassMethodManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ClassMethodPropertyFetchManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/ClassMethodPropertyFetchManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\Dependency\\DependencyClassMethodDecorator' => __DIR__ . '/../..' . '/src/NodeManipulator/Dependency/DependencyClassMethodDecorator.php',
|
||||
'Rector\\Core\\NodeManipulator\\ForeachManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/ForeachManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\FuncCallManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/FuncCallManipulator.php',
|
||||
'Rector\\Core\\NodeManipulator\\FunctionLikeManipulator' => __DIR__ . '/../..' . '/src/NodeManipulator/FunctionLikeManipulator.php',
|
||||
|
|
@ -2766,8 +2766,6 @@ class ComposerStaticInit023a10cf85b690bf9054bda8136dfcef
|
|||
'Rector\\Nette\\ValueObject\\TemplateParametersAssigns' => __DIR__ . '/..' . '/rector/rector-nette/src/ValueObject/TemplateParametersAssigns.php',
|
||||
'Rector\\NodeCollector\\NodeAnalyzer\\ArrayCallableMethodMatcher' => __DIR__ . '/../..' . '/packages/NodeCollector/NodeAnalyzer/ArrayCallableMethodMatcher.php',
|
||||
'Rector\\NodeCollector\\NodeAnalyzer\\BooleanAndAnalyzer' => __DIR__ . '/../..' . '/packages/NodeCollector/NodeAnalyzer/BooleanAndAnalyzer.php',
|
||||
'Rector\\NodeCollector\\NodeCollector\\NodeRepository' => __DIR__ . '/../..' . '/packages/NodeCollector/NodeCollector/NodeRepository.php',
|
||||
'Rector\\NodeCollector\\NodeVisitor\\NodeCollectorNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeCollector/NodeVisitor/NodeCollectorNodeVisitor.php',
|
||||
'Rector\\NodeCollector\\ScopeResolver\\ParentClassScopeResolver' => __DIR__ . '/../..' . '/packages/NodeCollector/ScopeResolver/ParentClassScopeResolver.php',
|
||||
'Rector\\NodeCollector\\StaticAnalyzer' => __DIR__ . '/../..' . '/packages/NodeCollector/StaticAnalyzer.php',
|
||||
'Rector\\NodeCollector\\ValueObject\\ArrayCallable' => __DIR__ . '/../..' . '/packages/NodeCollector/ValueObject/ArrayCallable.php',
|
||||
|
|
@ -3848,9 +3846,9 @@ class ComposerStaticInit023a10cf85b690bf9054bda8136dfcef
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit023a10cf85b690bf9054bda8136dfcef::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit023a10cf85b690bf9054bda8136dfcef::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit023a10cf85b690bf9054bda8136dfcef::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit6880bc14858460aa28c80d26ae6211b8::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit6880bc14858460aa28c80d26ae6211b8::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit6880bc14858460aa28c80d26ae6211b8::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
|
|||
10
vendor/scoper-autoload.php
vendored
10
vendor/scoper-autoload.php
vendored
|
|
@ -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('RectorPrefix20210806\AutoloadIncluder');
|
||||
}
|
||||
if (!class_exists('ComposerAutoloaderInit023a10cf85b690bf9054bda8136dfcef', false) && !interface_exists('ComposerAutoloaderInit023a10cf85b690bf9054bda8136dfcef', false) && !trait_exists('ComposerAutoloaderInit023a10cf85b690bf9054bda8136dfcef', false)) {
|
||||
spl_autoload_call('RectorPrefix20210806\ComposerAutoloaderInit023a10cf85b690bf9054bda8136dfcef');
|
||||
if (!class_exists('ComposerAutoloaderInit6880bc14858460aa28c80d26ae6211b8', false) && !interface_exists('ComposerAutoloaderInit6880bc14858460aa28c80d26ae6211b8', false) && !trait_exists('ComposerAutoloaderInit6880bc14858460aa28c80d26ae6211b8', false)) {
|
||||
spl_autoload_call('RectorPrefix20210806\ComposerAutoloaderInit6880bc14858460aa28c80d26ae6211b8');
|
||||
}
|
||||
if (!class_exists('AjaxLogin', false) && !interface_exists('AjaxLogin', false) && !trait_exists('AjaxLogin', false)) {
|
||||
spl_autoload_call('RectorPrefix20210806\AjaxLogin');
|
||||
|
|
@ -3305,9 +3305,9 @@ if (!function_exists('print_node')) {
|
|||
return \RectorPrefix20210806\print_node(...func_get_args());
|
||||
}
|
||||
}
|
||||
if (!function_exists('composerRequire023a10cf85b690bf9054bda8136dfcef')) {
|
||||
function composerRequire023a10cf85b690bf9054bda8136dfcef() {
|
||||
return \RectorPrefix20210806\composerRequire023a10cf85b690bf9054bda8136dfcef(...func_get_args());
|
||||
if (!function_exists('composerRequire6880bc14858460aa28c80d26ae6211b8')) {
|
||||
function composerRequire6880bc14858460aa28c80d26ae6211b8() {
|
||||
return \RectorPrefix20210806\composerRequire6880bc14858460aa28c80d26ae6211b8(...func_get_args());
|
||||
}
|
||||
}
|
||||
if (!function_exists('parseArgs')) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user