mirror of
https://github.com/rectorphp/rector.git
synced 2024-06-12 22:22:24 +00:00
Updated Rector to commit 701278e9882f33c2977753be99b08dd7aaf93997
701278e988
Remove node removing services, cleanup (#4093)
This commit is contained in:
parent
687f5efeef
commit
189167959e
|
@ -10,6 +10,9 @@ final class AffectedFilesCollector
|
|||
* @var array<string, File>
|
||||
*/
|
||||
private $affectedFiles = [];
|
||||
/**
|
||||
* @api
|
||||
*/
|
||||
public function addFile(File $file) : void
|
||||
{
|
||||
$this->affectedFiles[$file->getFilePath()] = $file;
|
||||
|
|
|
@ -115,7 +115,6 @@ final class ConsoleOutputFormatter implements OutputFormatterInterface
|
|||
$message = \sprintf('%d files were removed', $processResult->getRemovedFilesCount());
|
||||
$this->rectorOutputStyle->note($message);
|
||||
}
|
||||
$this->reportRemovedNodes($processResult);
|
||||
}
|
||||
private function normalizePathsToRelativeWithLine(string $errorMessage) : string
|
||||
{
|
||||
|
@ -123,14 +122,6 @@ final class ConsoleOutputFormatter implements OutputFormatterInterface
|
|||
$errorMessage = Strings::replace($errorMessage, $regex);
|
||||
return Strings::replace($errorMessage, self::ON_LINE_REGEX);
|
||||
}
|
||||
private function reportRemovedNodes(ProcessResult $processResult) : void
|
||||
{
|
||||
if ($processResult->getRemovedNodeCount() === 0) {
|
||||
return;
|
||||
}
|
||||
$message = \sprintf('%d nodes were removed', $processResult->getRemovedNodeCount());
|
||||
$this->rectorOutputStyle->warning($message);
|
||||
}
|
||||
private function createSuccessMessage(ProcessResult $processResult, Configuration $configuration) : string
|
||||
{
|
||||
$changeCount = \count($processResult->getFileDiffs()) + $processResult->getRemovedAndAddedFilesCount();
|
||||
|
|
|
@ -31,7 +31,7 @@ final class JsonOutputFormatter implements OutputFormatterInterface
|
|||
}
|
||||
public function report(ProcessResult $processResult, Configuration $configuration) : void
|
||||
{
|
||||
$errorsJson = ['totals' => ['changed_files' => \count($processResult->getFileDiffs()), 'removed_and_added_files_count' => $processResult->getRemovedAndAddedFilesCount(), 'removed_node_count' => $processResult->getRemovedNodeCount()]];
|
||||
$errorsJson = ['totals' => ['changed_files' => \count($processResult->getFileDiffs()), 'removed_and_added_files_count' => $processResult->getRemovedAndAddedFilesCount()]];
|
||||
$fileDiffs = $processResult->getFileDiffs();
|
||||
\ksort($fileDiffs);
|
||||
foreach ($fileDiffs as $fileDiff) {
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\NodeRemoval;
|
||||
|
||||
use PhpParser\Node;
|
||||
use Rector\Core\Exception\ShouldNotHappenException;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
final class BreakingRemovalGuard
|
||||
{
|
||||
/**
|
||||
* @deprecated
|
||||
*/
|
||||
public function ensureNodeCanBeRemove(Node $node) : void
|
||||
{
|
||||
if ($this->isLegalNodeRemoval($node)) {
|
||||
return;
|
||||
}
|
||||
/** @var string $childOfNodeType */
|
||||
$childOfNodeType = $node->getAttribute(AttributeKey::CHILD_OF_NODE_TYPE);
|
||||
throw new ShouldNotHappenException(\sprintf('Node "%s" on line %d is child of "%s", so it cannot be removed as it would break PHP code. Change or remove the parent node instead.', \get_class($node), $node->getLine(), $childOfNodeType));
|
||||
}
|
||||
/**
|
||||
* @api
|
||||
*/
|
||||
public function isLegalNodeRemoval(Node $node) : bool
|
||||
{
|
||||
return $node->getAttribute(AttributeKey::IS_BREAKING_REMOVAL_NODE) !== \true;
|
||||
}
|
||||
}
|
|
@ -1,41 +0,0 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\NodeRemoval;
|
||||
|
||||
use PhpParser\Node;
|
||||
use Rector\ChangesReporting\Collector\RectorChangeCollector;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\PostRector\Collector\NodesToRemoveCollector;
|
||||
final class NodeRemover
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\PostRector\Collector\NodesToRemoveCollector
|
||||
*/
|
||||
private $nodesToRemoveCollector;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\ChangesReporting\Collector\RectorChangeCollector
|
||||
*/
|
||||
private $rectorChangeCollector;
|
||||
public function __construct(NodesToRemoveCollector $nodesToRemoveCollector, RectorChangeCollector $rectorChangeCollector)
|
||||
{
|
||||
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
|
||||
$this->rectorChangeCollector = $rectorChangeCollector;
|
||||
}
|
||||
/**
|
||||
* @deprecated Return NodeTraverser::* to remove node directly instead
|
||||
*/
|
||||
public function removeNode(Node $node) : void
|
||||
{
|
||||
// this make sure to keep just added nodes, e.g. added class constant, that doesn't have analysis of full code in this run
|
||||
// if this is missing, there are false positive e.g. for unused private constant
|
||||
$isJustAddedNode = !(bool) $node->getAttribute(AttributeKey::ORIGINAL_NODE);
|
||||
if ($isJustAddedNode) {
|
||||
return;
|
||||
}
|
||||
$this->nodesToRemoveCollector->addNodeToRemove($node);
|
||||
$this->rectorChangeCollector->notifyNodeFileInfo($node);
|
||||
}
|
||||
}
|
|
@ -172,14 +172,6 @@ final class AttributeKey
|
|||
* @var string
|
||||
*/
|
||||
public const STMT_KEY = 'stmt_key';
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const IS_BREAKING_REMOVAL_NODE = 'is_breaking_removal_node';
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
public const CHILD_OF_NODE_TYPE = 'child_of_node_type';
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
|
|
|
@ -1,33 +0,0 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\NodeTypeResolver\PHPStan\Scope\NodeVisitor;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Expr\BooleanNot;
|
||||
use PhpParser\Node\Stmt\If_;
|
||||
use PhpParser\Node\Stmt\While_;
|
||||
use PhpParser\NodeVisitorAbstract;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\NodeTypeResolver\PHPStan\Scope\Contract\NodeVisitor\ScopeResolverNodeVisitorInterface;
|
||||
final class BreakingRemovalGuardNodeVisitor extends NodeVisitorAbstract implements ScopeResolverNodeVisitorInterface
|
||||
{
|
||||
public function enterNode(Node $node) : ?Node
|
||||
{
|
||||
if ($node instanceof If_) {
|
||||
$node->cond->setAttribute(AttributeKey::IS_BREAKING_REMOVAL_NODE, \true);
|
||||
$node->cond->setAttribute(AttributeKey::CHILD_OF_NODE_TYPE, If_::class);
|
||||
return null;
|
||||
}
|
||||
if ($node instanceof BooleanNot) {
|
||||
$node->expr->setAttribute(AttributeKey::IS_BREAKING_REMOVAL_NODE, \true);
|
||||
$node->expr->setAttribute(AttributeKey::CHILD_OF_NODE_TYPE, BooleanNot::class);
|
||||
return null;
|
||||
}
|
||||
if ($node instanceof While_) {
|
||||
$node->cond->setAttribute(AttributeKey::IS_BREAKING_REMOVAL_NODE, \true);
|
||||
$node->cond->setAttribute(AttributeKey::CHILD_OF_NODE_TYPE, While_::class);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
|
@ -1,144 +0,0 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\PostRector\Collector;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Arg;
|
||||
use PhpParser\Node\Expr\MethodCall;
|
||||
use PhpParser\Node\Expr\StaticCall;
|
||||
use PhpParser\Node\Expr\Variable;
|
||||
use PhpParser\Node\Param;
|
||||
use PhpParser\Node\Stmt;
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PhpParser\Node\Stmt\Expression;
|
||||
use Rector\ChangesReporting\Collector\AffectedFilesCollector;
|
||||
use Rector\Core\Exception\ShouldNotHappenException;
|
||||
use Rector\Core\PhpParser\Comparing\NodeComparator;
|
||||
use Rector\Core\PhpParser\Node\BetterNodeFinder;
|
||||
use Rector\Core\Provider\CurrentFileProvider;
|
||||
use Rector\Core\ValueObject\Application\File;
|
||||
use Rector\NodeRemoval\BreakingRemovalGuard;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\PostRector\Contract\Collector\NodeCollectorInterface;
|
||||
final class NodesToRemoveCollector implements NodeCollectorInterface
|
||||
{
|
||||
/**
|
||||
* @var Stmt[]|Node[]
|
||||
*/
|
||||
private $nodesToRemove = [];
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\ChangesReporting\Collector\AffectedFilesCollector
|
||||
*/
|
||||
private $affectedFilesCollector;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\NodeRemoval\BreakingRemovalGuard
|
||||
*/
|
||||
private $breakingRemovalGuard;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
|
||||
*/
|
||||
private $betterNodeFinder;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
|
||||
*/
|
||||
private $nodeComparator;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\Provider\CurrentFileProvider
|
||||
*/
|
||||
private $currentFileProvider;
|
||||
public function __construct(AffectedFilesCollector $affectedFilesCollector, BreakingRemovalGuard $breakingRemovalGuard, BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator, CurrentFileProvider $currentFileProvider)
|
||||
{
|
||||
$this->affectedFilesCollector = $affectedFilesCollector;
|
||||
$this->breakingRemovalGuard = $breakingRemovalGuard;
|
||||
$this->betterNodeFinder = $betterNodeFinder;
|
||||
$this->nodeComparator = $nodeComparator;
|
||||
$this->currentFileProvider = $currentFileProvider;
|
||||
}
|
||||
/**
|
||||
* @deprecated Use direct return of changes Stmt instead
|
||||
*/
|
||||
public function addNodeToRemove(Node $node) : void
|
||||
{
|
||||
/** Node|null $parentNode */
|
||||
$parentNode = $node->getAttribute(AttributeKey::PARENT_NODE);
|
||||
if ($parentNode instanceof Node && $this->isUsedInArg($node, $parentNode)) {
|
||||
return;
|
||||
}
|
||||
// chain call: "->method()->another()"
|
||||
$this->ensureIsNotPartOfChainMethodCall($node);
|
||||
if (!$node instanceof Expression && $parentNode instanceof Expression) {
|
||||
// only expressions can be removed
|
||||
$node = $parentNode;
|
||||
} else {
|
||||
$this->breakingRemovalGuard->ensureNodeCanBeRemove($node);
|
||||
}
|
||||
$file = $this->currentFileProvider->getFile();
|
||||
if ($file instanceof File) {
|
||||
$this->affectedFilesCollector->addFile($file);
|
||||
}
|
||||
/** @var Stmt $node */
|
||||
$this->nodesToRemove[] = $node;
|
||||
}
|
||||
public function isNodeRemoved(Node $node) : bool
|
||||
{
|
||||
return \in_array($node, $this->nodesToRemove, \true);
|
||||
}
|
||||
public function isActive() : bool
|
||||
{
|
||||
return $this->getCount() > 0;
|
||||
}
|
||||
public function getCount() : int
|
||||
{
|
||||
return \count($this->nodesToRemove);
|
||||
}
|
||||
/**
|
||||
* @return array<int, Node>
|
||||
*/
|
||||
public function getNodesToRemove() : array
|
||||
{
|
||||
return $this->nodesToRemove;
|
||||
}
|
||||
public function unset(int $key) : void
|
||||
{
|
||||
unset($this->nodesToRemove[$key]);
|
||||
}
|
||||
private function isUsedInArg(Node $node, Node $parentNode) : bool
|
||||
{
|
||||
if (!$node instanceof Param) {
|
||||
return \false;
|
||||
}
|
||||
if (!$parentNode instanceof ClassMethod) {
|
||||
return \false;
|
||||
}
|
||||
$paramVariable = $node->var;
|
||||
if ($paramVariable instanceof Variable) {
|
||||
return (bool) $this->betterNodeFinder->findFirst((array) $parentNode->stmts, function (Node $node) use($paramVariable) : bool {
|
||||
if (!$this->nodeComparator->areNodesEqual($node, $paramVariable)) {
|
||||
return \false;
|
||||
}
|
||||
$hasArgParent = (bool) $this->betterNodeFinder->findParentType($node, Arg::class);
|
||||
if (!$hasArgParent) {
|
||||
return \false;
|
||||
}
|
||||
return !(bool) $this->betterNodeFinder->findParentType($node, StaticCall::class);
|
||||
});
|
||||
}
|
||||
return \false;
|
||||
}
|
||||
private function ensureIsNotPartOfChainMethodCall(Node $node) : void
|
||||
{
|
||||
if (!$node instanceof MethodCall) {
|
||||
return;
|
||||
}
|
||||
if (!$node->var instanceof MethodCall) {
|
||||
return;
|
||||
}
|
||||
throw new ShouldNotHappenException('Chain method calls cannot be removed this way. It would remove the whole tree of calls. Remove them manually by creating new parent node with no following method.');
|
||||
}
|
||||
}
|
|
@ -1,147 +0,0 @@
|
|||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\PostRector\Rector;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Expr\BinaryOp;
|
||||
use PhpParser\Node\Expr\MethodCall;
|
||||
use PhpParser\NodeTraverser;
|
||||
use Rector\Core\PhpParser\Node\NodeFactory;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\PostRector\Collector\NodesToRemoveCollector;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
|
||||
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
|
||||
/**
|
||||
* @deprecated Remove node directly instead in refactor() method
|
||||
*/
|
||||
final class NodeRemovingPostRector extends \Rector\PostRector\Rector\AbstractPostRector
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\PhpParser\Node\NodeFactory
|
||||
*/
|
||||
private $nodeFactory;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\NodeNameResolver\NodeNameResolver
|
||||
*/
|
||||
private $nodeNameResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\PostRector\Collector\NodesToRemoveCollector
|
||||
*/
|
||||
private $nodesToRemoveCollector;
|
||||
public function __construct(NodeFactory $nodeFactory, NodeNameResolver $nodeNameResolver, NodesToRemoveCollector $nodesToRemoveCollector)
|
||||
{
|
||||
$this->nodeFactory = $nodeFactory;
|
||||
$this->nodeNameResolver = $nodeNameResolver;
|
||||
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
|
||||
}
|
||||
public function getPriority() : int
|
||||
{
|
||||
return 800;
|
||||
}
|
||||
public function enterNode(Node $node) : ?Node
|
||||
{
|
||||
if (!$this->nodesToRemoveCollector->isActive()) {
|
||||
return null;
|
||||
}
|
||||
// special case for fluent methods
|
||||
foreach ($this->nodesToRemoveCollector->getNodesToRemove() as $key => $nodeToRemove) {
|
||||
if (!$node instanceof MethodCall) {
|
||||
continue;
|
||||
}
|
||||
if (!$nodeToRemove instanceof MethodCall) {
|
||||
continue;
|
||||
}
|
||||
// replace chain method call by non-chain method call
|
||||
if (!$this->isChainMethodCallNodeToBeRemoved($node, $nodeToRemove)) {
|
||||
continue;
|
||||
}
|
||||
$this->nodesToRemoveCollector->unset($key);
|
||||
$methodName = $this->nodeNameResolver->getName($node->name);
|
||||
/** @var MethodCall $nestedMethodCall */
|
||||
$nestedMethodCall = $node->var;
|
||||
/** @var string $methodName */
|
||||
return $this->nodeFactory->createMethodCall($nestedMethodCall->var, $methodName, $node->args);
|
||||
}
|
||||
if (!$node instanceof BinaryOp) {
|
||||
return null;
|
||||
}
|
||||
return $this->removePartOfBinaryOp($node);
|
||||
}
|
||||
/**
|
||||
* @return int|\PhpParser\Node
|
||||
*/
|
||||
public function leaveNode(Node $node)
|
||||
{
|
||||
foreach ($this->nodesToRemoveCollector->getNodesToRemove() as $key => $nodeToRemove) {
|
||||
$nodeToRemoveParent = $nodeToRemove->getAttribute(AttributeKey::PARENT_NODE);
|
||||
if ($nodeToRemoveParent instanceof BinaryOp) {
|
||||
continue;
|
||||
}
|
||||
if ($node === $nodeToRemove) {
|
||||
$this->nodesToRemoveCollector->unset($key);
|
||||
return NodeTraverser::REMOVE_NODE;
|
||||
}
|
||||
}
|
||||
return $node;
|
||||
}
|
||||
public function getRuleDefinition() : RuleDefinition
|
||||
{
|
||||
return new RuleDefinition('Remove nodes from weird positions', [new CodeSample(<<<'CODE_SAMPLE'
|
||||
class SomeClass
|
||||
{
|
||||
public function run($value)
|
||||
{
|
||||
if ($value) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
CODE_SAMPLE
|
||||
, <<<'CODE_SAMPLE'
|
||||
class SomeClass
|
||||
{
|
||||
public function run($value)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
CODE_SAMPLE
|
||||
)]);
|
||||
}
|
||||
private function isChainMethodCallNodeToBeRemoved(MethodCall $mainMethodCall, MethodCall $toBeRemovedMethodCall) : bool
|
||||
{
|
||||
if (!$mainMethodCall->var instanceof MethodCall) {
|
||||
return \false;
|
||||
}
|
||||
if ($toBeRemovedMethodCall !== $mainMethodCall->var) {
|
||||
return \false;
|
||||
}
|
||||
$methodName = $this->nodeNameResolver->getName($mainMethodCall->name);
|
||||
return $methodName !== null;
|
||||
}
|
||||
private function removePartOfBinaryOp(BinaryOp $binaryOp) : ?Node
|
||||
{
|
||||
// handle left/right binary remove, e.g. "true && false" → remove false → "true"
|
||||
foreach ($this->nodesToRemoveCollector->getNodesToRemove() as $key => $nodeToRemove) {
|
||||
// remove node
|
||||
$nodeToRemoveParentNode = $nodeToRemove->getAttribute(AttributeKey::PARENT_NODE);
|
||||
if (!$nodeToRemoveParentNode instanceof BinaryOp) {
|
||||
continue;
|
||||
}
|
||||
if ($binaryOp->left === $nodeToRemove) {
|
||||
$this->nodesToRemoveCollector->unset($key);
|
||||
return $binaryOp->right;
|
||||
}
|
||||
if ($binaryOp->right === $nodeToRemove) {
|
||||
$this->nodesToRemoveCollector->unset($key);
|
||||
return $binaryOp->left;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
|
@ -25,7 +25,6 @@ use PhpParser\Node\Stmt\While_;
|
|||
use Rector\Core\Contract\PhpParser\Node\StmtsAwareInterface;
|
||||
use Rector\Core\Rector\AbstractRector;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\PostRector\Collector\NodesToRemoveCollector;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
|
||||
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
|
||||
/**
|
||||
|
@ -37,15 +36,6 @@ final class NewlineAfterStatementRector extends AbstractRector
|
|||
* @var array<class-string<Node>>
|
||||
*/
|
||||
private const STMTS_TO_HAVE_NEXT_NEWLINE = [ClassMethod::class, Function_::class, Property::class, If_::class, Foreach_::class, Do_::class, While_::class, For_::class, ClassConst::class, TryCatch::class, Class_::class, Trait_::class, Interface_::class, Switch_::class];
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\PostRector\Collector\NodesToRemoveCollector
|
||||
*/
|
||||
private $nodesToRemoveCollector;
|
||||
public function __construct(NodesToRemoveCollector $nodesToRemoveCollector)
|
||||
{
|
||||
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
|
||||
}
|
||||
public function getRuleDefinition() : RuleDefinition
|
||||
{
|
||||
return new RuleDefinition('Add new line after statements to tidify code', [new CodeSample(<<<'CODE_SAMPLE'
|
||||
|
@ -121,9 +111,6 @@ CODE_SAMPLE
|
|||
if ($rangeLine > 1) {
|
||||
continue;
|
||||
}
|
||||
if ($this->isRemoved($stmt)) {
|
||||
continue;
|
||||
}
|
||||
\array_splice($node->stmts, $key + 1, 0, [new Nop()]);
|
||||
$hasChanged = \true;
|
||||
return $this->processAddNewLine($node, $hasChanged, $key + 2);
|
||||
|
@ -162,10 +149,6 @@ CODE_SAMPLE
|
|||
}
|
||||
return !isset($comments[0]);
|
||||
}
|
||||
private function isRemoved(Stmt $stmt) : bool
|
||||
{
|
||||
return $this->nodesToRemoveCollector->isNodeRemoved($stmt);
|
||||
}
|
||||
private function shouldSkip(Stmt $stmt) : bool
|
||||
{
|
||||
return !\in_array(\get_class($stmt), self::STMTS_TO_HAVE_NEXT_NEWLINE, \true);
|
||||
|
|
|
@ -15,7 +15,6 @@ use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
|
|||
use Rector\Core\ValueObject\MethodName;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PostRector\Collector\NodesToRemoveCollector;
|
||||
use Rector\TypeDeclaration\Matcher\PropertyAssignMatcher;
|
||||
use Rector\TypeDeclaration\NodeAnalyzer\AutowiredClassMethodOrPropertyAnalyzer;
|
||||
final class ConstructorAssignDetector
|
||||
|
@ -49,19 +48,13 @@ final class ConstructorAssignDetector
|
|||
* @var \Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer
|
||||
*/
|
||||
private $propertyFetchAnalyzer;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\PostRector\Collector\NodesToRemoveCollector
|
||||
*/
|
||||
private $nodesToRemoveCollector;
|
||||
public function __construct(NodeTypeResolver $nodeTypeResolver, PropertyAssignMatcher $propertyAssignMatcher, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, AutowiredClassMethodOrPropertyAnalyzer $autowiredClassMethodOrPropertyAnalyzer, PropertyFetchAnalyzer $propertyFetchAnalyzer, NodesToRemoveCollector $nodesToRemoveCollector)
|
||||
public function __construct(NodeTypeResolver $nodeTypeResolver, PropertyAssignMatcher $propertyAssignMatcher, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, AutowiredClassMethodOrPropertyAnalyzer $autowiredClassMethodOrPropertyAnalyzer, PropertyFetchAnalyzer $propertyFetchAnalyzer)
|
||||
{
|
||||
$this->nodeTypeResolver = $nodeTypeResolver;
|
||||
$this->propertyAssignMatcher = $propertyAssignMatcher;
|
||||
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
|
||||
$this->autowiredClassMethodOrPropertyAnalyzer = $autowiredClassMethodOrPropertyAnalyzer;
|
||||
$this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
|
||||
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
|
||||
}
|
||||
public function isPropertyAssigned(ClassLike $classLike, string $propertyName) : bool
|
||||
{
|
||||
|
@ -73,9 +66,6 @@ final class ConstructorAssignDetector
|
|||
$this->decorateFirstLevelStatementAttribute($initializeClassMethods);
|
||||
foreach ($initializeClassMethods as $initializeClassMethod) {
|
||||
$this->simpleCallableNodeTraverser->traverseNodesWithCallable((array) $initializeClassMethod->stmts, function (Node $node) use($propertyName, &$isAssignedInConstructor) : ?int {
|
||||
if ($node instanceof Expression && $this->nodesToRemoveCollector->isNodeRemoved($node)) {
|
||||
return NodeTraverser::DONT_TRAVERSE_CURRENT_AND_CHILDREN;
|
||||
}
|
||||
$expr = $this->matchAssignExprToPropertyName($node, $propertyName);
|
||||
if (!$expr instanceof Expr) {
|
||||
return null;
|
||||
|
|
|
@ -19,12 +19,12 @@ final class VersionResolver
|
|||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = 'd9cf3d4b9f427691349d4c1fbe2160241c1585b8';
|
||||
public const PACKAGE_VERSION = '701278e9882f33c2977753be99b08dd7aaf93997';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2023-06-06 11:51:40';
|
||||
public const RELEASE_DATE = '2023-06-06 13:01:55';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
|
|
@ -15,7 +15,7 @@ final class RectorKernel
|
|||
/**
|
||||
* @var string
|
||||
*/
|
||||
private const CACHE_KEY = 'v61';
|
||||
private const CACHE_KEY = 'v62';
|
||||
/**
|
||||
* @var \Symfony\Component\DependencyInjection\ContainerInterface|null
|
||||
*/
|
||||
|
|
|
@ -24,7 +24,6 @@ use Rector\Core\ValueObject\MethodName;
|
|||
use Rector\Core\ValueObject\PhpVersionFeature;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\PostRector\Collector\NodesToRemoveCollector;
|
||||
use Rector\PostRector\ValueObject\PropertyMetadata;
|
||||
use Rector\TypeDeclaration\NodeAnalyzer\AutowiredClassMethodOrPropertyAnalyzer;
|
||||
final class ClassDependencyManipulator
|
||||
|
@ -64,11 +63,6 @@ final class ClassDependencyManipulator
|
|||
* @var \Rector\NodeNameResolver\NodeNameResolver
|
||||
*/
|
||||
private $nodeNameResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\PostRector\Collector\NodesToRemoveCollector
|
||||
*/
|
||||
private $nodesToRemoveCollector;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\TypeDeclaration\NodeAnalyzer\AutowiredClassMethodOrPropertyAnalyzer
|
||||
|
@ -84,7 +78,7 @@ final class ClassDependencyManipulator
|
|||
* @var \Rector\Core\Reflection\ReflectionResolver
|
||||
*/
|
||||
private $reflectionResolver;
|
||||
public function __construct(\Rector\Core\NodeManipulator\ClassInsertManipulator $classInsertManipulator, \Rector\Core\NodeManipulator\ClassMethodAssignManipulator $classMethodAssignManipulator, NodeFactory $nodeFactory, \Rector\Core\NodeManipulator\StmtsManipulator $stmtsManipulator, PhpVersionProvider $phpVersionProvider, PropertyPresenceChecker $propertyPresenceChecker, NodeNameResolver $nodeNameResolver, NodesToRemoveCollector $nodesToRemoveCollector, AutowiredClassMethodOrPropertyAnalyzer $autowiredClassMethodOrPropertyAnalyzer, DependencyClassMethodDecorator $dependencyClassMethodDecorator, ReflectionResolver $reflectionResolver)
|
||||
public function __construct(\Rector\Core\NodeManipulator\ClassInsertManipulator $classInsertManipulator, \Rector\Core\NodeManipulator\ClassMethodAssignManipulator $classMethodAssignManipulator, NodeFactory $nodeFactory, \Rector\Core\NodeManipulator\StmtsManipulator $stmtsManipulator, PhpVersionProvider $phpVersionProvider, PropertyPresenceChecker $propertyPresenceChecker, NodeNameResolver $nodeNameResolver, AutowiredClassMethodOrPropertyAnalyzer $autowiredClassMethodOrPropertyAnalyzer, DependencyClassMethodDecorator $dependencyClassMethodDecorator, ReflectionResolver $reflectionResolver)
|
||||
{
|
||||
$this->classInsertManipulator = $classInsertManipulator;
|
||||
$this->classMethodAssignManipulator = $classMethodAssignManipulator;
|
||||
|
@ -93,7 +87,6 @@ final class ClassDependencyManipulator
|
|||
$this->phpVersionProvider = $phpVersionProvider;
|
||||
$this->propertyPresenceChecker = $propertyPresenceChecker;
|
||||
$this->nodeNameResolver = $nodeNameResolver;
|
||||
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
|
||||
$this->autowiredClassMethodOrPropertyAnalyzer = $autowiredClassMethodOrPropertyAnalyzer;
|
||||
$this->dependencyClassMethodDecorator = $dependencyClassMethodDecorator;
|
||||
$this->reflectionResolver = $reflectionResolver;
|
||||
|
@ -233,9 +226,6 @@ final class ClassDependencyManipulator
|
|||
}
|
||||
// only if the property does not exist yet
|
||||
$existingProperty = $class->getProperty($propertyMetadata->getName());
|
||||
if (!$existingProperty instanceof Property) {
|
||||
return \true;
|
||||
}
|
||||
return $this->nodesToRemoveCollector->isNodeRemoved($existingProperty);
|
||||
return !$existingProperty instanceof Property;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -37,11 +37,9 @@ use Rector\Core\ProcessAnalyzer\RectifiedAnalyzer;
|
|||
use Rector\Core\Provider\CurrentFileProvider;
|
||||
use Rector\Core\ValueObject\Application\File;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
use Rector\NodeRemoval\NodeRemover;
|
||||
use Rector\NodeTypeResolver\Node\AttributeKey;
|
||||
use Rector\NodeTypeResolver\NodeTypeResolver;
|
||||
use Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser;
|
||||
use Rector\PostRector\Collector\NodesToRemoveCollector;
|
||||
use Rector\Skipper\Skipper\Skipper;
|
||||
use Rector\StaticTypeMapper\StaticTypeMapper;
|
||||
use RectorPrefix202306\Symfony\Contracts\Service\Attribute\Required;
|
||||
|
@ -89,11 +87,6 @@ CODE_SAMPLE;
|
|||
* @var \Rector\Core\PhpParser\Node\BetterNodeFinder
|
||||
*/
|
||||
protected $betterNodeFinder;
|
||||
/**
|
||||
* @internal Use service directly or return changes nodes
|
||||
* @var \Rector\NodeRemoval\NodeRemover
|
||||
*/
|
||||
protected $nodeRemover;
|
||||
/**
|
||||
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
|
||||
*/
|
||||
|
@ -106,10 +99,6 @@ CODE_SAMPLE;
|
|||
* @var \Rector\Core\Application\ChangedNodeScopeRefresher
|
||||
*/
|
||||
private $changedNodeScopeRefresher;
|
||||
/**
|
||||
* @var \Rector\PostRector\Collector\NodesToRemoveCollector
|
||||
*/
|
||||
private $nodesToRemoveCollector;
|
||||
/**
|
||||
* @var \Rector\PhpDocParser\NodeTraverser\SimpleCallableNodeTraverser
|
||||
*/
|
||||
|
@ -165,10 +154,8 @@ CODE_SAMPLE;
|
|||
/**
|
||||
* @required
|
||||
*/
|
||||
public function autowire(NodesToRemoveCollector $nodesToRemoveCollector, NodeRemover $nodeRemover, NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeFactory $nodeFactory, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, CurrentRectorProvider $currentRectorProvider, CurrentNodeProvider $currentNodeProvider, Skipper $skipper, ValueResolver $valueResolver, BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator, CurrentFileProvider $currentFileProvider, RectifiedAnalyzer $rectifiedAnalyzer, CreatedByRuleDecorator $createdByRuleDecorator, ChangedNodeScopeRefresher $changedNodeScopeRefresher, RectorOutputStyle $rectorOutputStyle, FilePathHelper $filePathHelper, DocBlockUpdater $docBlockUpdater, NodeConnectingTraverser $nodeConnectingTraverser) : void
|
||||
public function autowire(NodeNameResolver $nodeNameResolver, NodeTypeResolver $nodeTypeResolver, SimpleCallableNodeTraverser $simpleCallableNodeTraverser, NodeFactory $nodeFactory, PhpDocInfoFactory $phpDocInfoFactory, StaticTypeMapper $staticTypeMapper, CurrentRectorProvider $currentRectorProvider, CurrentNodeProvider $currentNodeProvider, Skipper $skipper, ValueResolver $valueResolver, BetterNodeFinder $betterNodeFinder, NodeComparator $nodeComparator, CurrentFileProvider $currentFileProvider, RectifiedAnalyzer $rectifiedAnalyzer, CreatedByRuleDecorator $createdByRuleDecorator, ChangedNodeScopeRefresher $changedNodeScopeRefresher, RectorOutputStyle $rectorOutputStyle, FilePathHelper $filePathHelper, DocBlockUpdater $docBlockUpdater, NodeConnectingTraverser $nodeConnectingTraverser) : void
|
||||
{
|
||||
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
|
||||
$this->nodeRemover = $nodeRemover;
|
||||
$this->nodeNameResolver = $nodeNameResolver;
|
||||
$this->nodeTypeResolver = $nodeTypeResolver;
|
||||
$this->simpleCallableNodeTraverser = $simpleCallableNodeTraverser;
|
||||
|
@ -342,7 +329,6 @@ CODE_SAMPLE;
|
|||
*/
|
||||
protected function removeNode(Node $node) : void
|
||||
{
|
||||
$this->nodeRemover->removeNode($node);
|
||||
}
|
||||
/**
|
||||
* @param \PhpParser\Node|mixed[]|int $refactoredNode
|
||||
|
@ -405,9 +391,6 @@ CODE_SAMPLE;
|
|||
}
|
||||
private function shouldSkipCurrentNode(Node $node) : bool
|
||||
{
|
||||
if ($this->nodesToRemoveCollector->isNodeRemoved($node)) {
|
||||
return \true;
|
||||
}
|
||||
$filePath = $this->file->getFilePath();
|
||||
if ($this->skipper->shouldSkipElementAndFilePath($this, $filePath)) {
|
||||
return \true;
|
||||
|
|
|
@ -31,22 +31,16 @@ final class ProcessResult
|
|||
* @var int
|
||||
*/
|
||||
private $removedFilesCount;
|
||||
/**
|
||||
* @readonly
|
||||
* @var int
|
||||
*/
|
||||
private $removedNodeCount;
|
||||
/**
|
||||
* @param FileDiff[] $fileDiffs
|
||||
* @param SystemError[] $systemErrors
|
||||
*/
|
||||
public function __construct(array $systemErrors, array $fileDiffs, int $addedFilesCount, int $removedFilesCount, int $removedNodeCount)
|
||||
public function __construct(array $systemErrors, array $fileDiffs, int $addedFilesCount, int $removedFilesCount)
|
||||
{
|
||||
$this->systemErrors = $systemErrors;
|
||||
$this->fileDiffs = $fileDiffs;
|
||||
$this->addedFilesCount = $addedFilesCount;
|
||||
$this->removedFilesCount = $removedFilesCount;
|
||||
$this->removedNodeCount = $removedNodeCount;
|
||||
Assert::allIsAOf($fileDiffs, FileDiff::class);
|
||||
Assert::allIsAOf($systemErrors, SystemError::class);
|
||||
}
|
||||
|
@ -76,8 +70,4 @@ final class ProcessResult
|
|||
{
|
||||
return $this->removedFilesCount + $this->addedFilesCount;
|
||||
}
|
||||
public function getRemovedNodeCount() : int
|
||||
{
|
||||
return $this->removedNodeCount;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,7 +8,6 @@ use Rector\Core\ValueObject\Error\SystemError;
|
|||
use Rector\Core\ValueObject\ProcessResult;
|
||||
use Rector\Core\ValueObject\Reporting\FileDiff;
|
||||
use Rector\Parallel\ValueObject\Bridge;
|
||||
use Rector\PostRector\Collector\NodesToRemoveCollector;
|
||||
final class ProcessResultFactory
|
||||
{
|
||||
/**
|
||||
|
@ -16,15 +15,9 @@ final class ProcessResultFactory
|
|||
* @var \Rector\Core\Application\FileSystem\RemovedAndAddedFilesCollector
|
||||
*/
|
||||
private $removedAndAddedFilesCollector;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\PostRector\Collector\NodesToRemoveCollector
|
||||
*/
|
||||
private $nodesToRemoveCollector;
|
||||
public function __construct(RemovedAndAddedFilesCollector $removedAndAddedFilesCollector, NodesToRemoveCollector $nodesToRemoveCollector)
|
||||
public function __construct(RemovedAndAddedFilesCollector $removedAndAddedFilesCollector)
|
||||
{
|
||||
$this->removedAndAddedFilesCollector = $removedAndAddedFilesCollector;
|
||||
$this->nodesToRemoveCollector = $nodesToRemoveCollector;
|
||||
}
|
||||
/**
|
||||
* @param array{system_errors: SystemError[], file_diffs: FileDiff[]} $errorsAndFileDiffs
|
||||
|
@ -33,6 +26,6 @@ final class ProcessResultFactory
|
|||
{
|
||||
$systemErrors = $errorsAndFileDiffs[Bridge::SYSTEM_ERRORS];
|
||||
$fileDiffs = $errorsAndFileDiffs[Bridge::FILE_DIFFS];
|
||||
return new ProcessResult($systemErrors, $fileDiffs, $this->removedAndAddedFilesCollector->getAddedFileCount(), $this->removedAndAddedFilesCollector->getRemovedFilesCount(), $this->nodesToRemoveCollector->getCount());
|
||||
return new ProcessResult($systemErrors, $fileDiffs, $this->removedAndAddedFilesCollector->getAddedFileCount(), $this->removedAndAddedFilesCollector->getRemovedFilesCount());
|
||||
}
|
||||
}
|
||||
|
|
2
vendor/autoload.php
vendored
2
vendor/autoload.php
vendored
|
@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) {
|
|||
|
||||
require_once __DIR__ . '/composer/autoload_real.php';
|
||||
|
||||
return ComposerAutoloaderInit0a78a899db7d2a4fb6eee1e8ee40bcee::getLoader();
|
||||
return ComposerAutoloaderInit083184dffc36c4cc84f04a206cac4e3f::getLoader();
|
||||
|
|
5
vendor/composer/autoload_classmap.php
vendored
5
vendor/composer/autoload_classmap.php
vendored
|
@ -1922,8 +1922,6 @@ return array(
|
|||
'Rector\\NodeNestingScope\\ParentScopeFinder' => $baseDir . '/packages/NodeNestingScope/ParentScopeFinder.php',
|
||||
'Rector\\NodeNestingScope\\ScopeNestingComparator' => $baseDir . '/packages/NodeNestingScope/ScopeNestingComparator.php',
|
||||
'Rector\\NodeNestingScope\\ValueObject\\ControlStructure' => $baseDir . '/packages/NodeNestingScope/ValueObject/ControlStructure.php',
|
||||
'Rector\\NodeRemoval\\BreakingRemovalGuard' => $baseDir . '/packages/NodeRemoval/BreakingRemovalGuard.php',
|
||||
'Rector\\NodeRemoval\\NodeRemover' => $baseDir . '/packages/NodeRemoval/NodeRemover.php',
|
||||
'Rector\\NodeTypeResolver\\Contract\\NodeTypeResolverInterface' => $baseDir . '/packages/NodeTypeResolver/Contract/NodeTypeResolverInterface.php',
|
||||
'Rector\\NodeTypeResolver\\Contract\\SourceLocatorProviderInterface' => $baseDir . '/packages/NodeTypeResolver/Contract/SourceLocatorProviderInterface.php',
|
||||
'Rector\\NodeTypeResolver\\DependencyInjection\\BleedingEdgeIncludePurifier' => $baseDir . '/packages/NodeTypeResolver/DependencyInjection/BleedingEdgeIncludePurifier.php',
|
||||
|
@ -1954,7 +1952,6 @@ return array(
|
|||
'Rector\\NodeTypeResolver\\PHPStan\\ParametersAcceptorSelectorVariantsWrapper' => $baseDir . '/packages/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\Contract\\NodeVisitor\\ScopeResolverNodeVisitorInterface' => $baseDir . '/packages/NodeTypeResolver/PHPStan/Scope/Contract/NodeVisitor/ScopeResolverNodeVisitorInterface.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\AssignedToNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/AssignedToNodeVisitor.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\BreakingRemovalGuardNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/BreakingRemovalGuardNodeVisitor.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\ByRefReturnNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ByRefReturnNodeVisitor.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\ByRefVariableNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ByRefVariableNodeVisitor.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\GlobalVariableNodeVisitor' => $baseDir . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/GlobalVariableNodeVisitor.php',
|
||||
|
@ -2320,7 +2317,6 @@ return array(
|
|||
'Rector\\PhpDocParser\\ValueObject\\AttributeKey' => $baseDir . '/packages/PhpDocParser/ValueObject/AttributeKey.php',
|
||||
'Rector\\PostRector\\Application\\PostFileProcessor' => $baseDir . '/packages/PostRector/Application/PostFileProcessor.php',
|
||||
'Rector\\PostRector\\Collector\\NodesToAddCollector' => $baseDir . '/packages/PostRector/Collector/NodesToAddCollector.php',
|
||||
'Rector\\PostRector\\Collector\\NodesToRemoveCollector' => $baseDir . '/packages/PostRector/Collector/NodesToRemoveCollector.php',
|
||||
'Rector\\PostRector\\Collector\\PropertyToAddCollector' => $baseDir . '/packages/PostRector/Collector/PropertyToAddCollector.php',
|
||||
'Rector\\PostRector\\Collector\\UseNodesToAddCollector' => $baseDir . '/packages/PostRector/Collector/UseNodesToAddCollector.php',
|
||||
'Rector\\PostRector\\Contract\\Collector\\NodeCollectorInterface' => $baseDir . '/packages/PostRector/Contract/Collector/NodeCollectorInterface.php',
|
||||
|
@ -2331,7 +2327,6 @@ return array(
|
|||
'Rector\\PostRector\\Rector\\ClassRenamingPostRector' => $baseDir . '/packages/PostRector/Rector/ClassRenamingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\NameImportingPostRector' => $baseDir . '/packages/PostRector/Rector/NameImportingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\NodeAddingPostRector' => $baseDir . '/packages/PostRector/Rector/NodeAddingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\NodeRemovingPostRector' => $baseDir . '/packages/PostRector/Rector/NodeRemovingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\PropertyAddingPostRector' => $baseDir . '/packages/PostRector/Rector/PropertyAddingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\UnusedImportRemovingPostRector' => $baseDir . '/packages/PostRector/Rector/UnusedImportRemovingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\UseAddingPostRector' => $baseDir . '/packages/PostRector/Rector/UseAddingPostRector.php',
|
||||
|
|
10
vendor/composer/autoload_real.php
vendored
10
vendor/composer/autoload_real.php
vendored
|
@ -2,7 +2,7 @@
|
|||
|
||||
// autoload_real.php @generated by Composer
|
||||
|
||||
class ComposerAutoloaderInit0a78a899db7d2a4fb6eee1e8ee40bcee
|
||||
class ComposerAutoloaderInit083184dffc36c4cc84f04a206cac4e3f
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
|
@ -22,17 +22,17 @@ class ComposerAutoloaderInit0a78a899db7d2a4fb6eee1e8ee40bcee
|
|||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInit0a78a899db7d2a4fb6eee1e8ee40bcee', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit083184dffc36c4cc84f04a206cac4e3f', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit0a78a899db7d2a4fb6eee1e8ee40bcee', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit083184dffc36c4cc84f04a206cac4e3f', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee::$files;
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f::$files;
|
||||
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
|
||||
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
|
||||
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
|
||||
|
|
13
vendor/composer/autoload_static.php
vendored
13
vendor/composer/autoload_static.php
vendored
|
@ -4,7 +4,7 @@
|
|||
|
||||
namespace Composer\Autoload;
|
||||
|
||||
class ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee
|
||||
class ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
|
@ -2164,8 +2164,6 @@ class ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee
|
|||
'Rector\\NodeNestingScope\\ParentScopeFinder' => __DIR__ . '/../..' . '/packages/NodeNestingScope/ParentScopeFinder.php',
|
||||
'Rector\\NodeNestingScope\\ScopeNestingComparator' => __DIR__ . '/../..' . '/packages/NodeNestingScope/ScopeNestingComparator.php',
|
||||
'Rector\\NodeNestingScope\\ValueObject\\ControlStructure' => __DIR__ . '/../..' . '/packages/NodeNestingScope/ValueObject/ControlStructure.php',
|
||||
'Rector\\NodeRemoval\\BreakingRemovalGuard' => __DIR__ . '/../..' . '/packages/NodeRemoval/BreakingRemovalGuard.php',
|
||||
'Rector\\NodeRemoval\\NodeRemover' => __DIR__ . '/../..' . '/packages/NodeRemoval/NodeRemover.php',
|
||||
'Rector\\NodeTypeResolver\\Contract\\NodeTypeResolverInterface' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/Contract/NodeTypeResolverInterface.php',
|
||||
'Rector\\NodeTypeResolver\\Contract\\SourceLocatorProviderInterface' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/Contract/SourceLocatorProviderInterface.php',
|
||||
'Rector\\NodeTypeResolver\\DependencyInjection\\BleedingEdgeIncludePurifier' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/DependencyInjection/BleedingEdgeIncludePurifier.php',
|
||||
|
@ -2196,7 +2194,6 @@ class ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee
|
|||
'Rector\\NodeTypeResolver\\PHPStan\\ParametersAcceptorSelectorVariantsWrapper' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\Contract\\NodeVisitor\\ScopeResolverNodeVisitorInterface' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/Scope/Contract/NodeVisitor/ScopeResolverNodeVisitorInterface.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\AssignedToNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/AssignedToNodeVisitor.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\BreakingRemovalGuardNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/BreakingRemovalGuardNodeVisitor.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\ByRefReturnNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ByRefReturnNodeVisitor.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\ByRefVariableNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/ByRefVariableNodeVisitor.php',
|
||||
'Rector\\NodeTypeResolver\\PHPStan\\Scope\\NodeVisitor\\GlobalVariableNodeVisitor' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/PHPStan/Scope/NodeVisitor/GlobalVariableNodeVisitor.php',
|
||||
|
@ -2562,7 +2559,6 @@ class ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee
|
|||
'Rector\\PhpDocParser\\ValueObject\\AttributeKey' => __DIR__ . '/../..' . '/packages/PhpDocParser/ValueObject/AttributeKey.php',
|
||||
'Rector\\PostRector\\Application\\PostFileProcessor' => __DIR__ . '/../..' . '/packages/PostRector/Application/PostFileProcessor.php',
|
||||
'Rector\\PostRector\\Collector\\NodesToAddCollector' => __DIR__ . '/../..' . '/packages/PostRector/Collector/NodesToAddCollector.php',
|
||||
'Rector\\PostRector\\Collector\\NodesToRemoveCollector' => __DIR__ . '/../..' . '/packages/PostRector/Collector/NodesToRemoveCollector.php',
|
||||
'Rector\\PostRector\\Collector\\PropertyToAddCollector' => __DIR__ . '/../..' . '/packages/PostRector/Collector/PropertyToAddCollector.php',
|
||||
'Rector\\PostRector\\Collector\\UseNodesToAddCollector' => __DIR__ . '/../..' . '/packages/PostRector/Collector/UseNodesToAddCollector.php',
|
||||
'Rector\\PostRector\\Contract\\Collector\\NodeCollectorInterface' => __DIR__ . '/../..' . '/packages/PostRector/Contract/Collector/NodeCollectorInterface.php',
|
||||
|
@ -2573,7 +2569,6 @@ class ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee
|
|||
'Rector\\PostRector\\Rector\\ClassRenamingPostRector' => __DIR__ . '/../..' . '/packages/PostRector/Rector/ClassRenamingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\NameImportingPostRector' => __DIR__ . '/../..' . '/packages/PostRector/Rector/NameImportingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\NodeAddingPostRector' => __DIR__ . '/../..' . '/packages/PostRector/Rector/NodeAddingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\NodeRemovingPostRector' => __DIR__ . '/../..' . '/packages/PostRector/Rector/NodeRemovingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\PropertyAddingPostRector' => __DIR__ . '/../..' . '/packages/PostRector/Rector/PropertyAddingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\UnusedImportRemovingPostRector' => __DIR__ . '/../..' . '/packages/PostRector/Rector/UnusedImportRemovingPostRector.php',
|
||||
'Rector\\PostRector\\Rector\\UseAddingPostRector' => __DIR__ . '/../..' . '/packages/PostRector/Rector/UseAddingPostRector.php',
|
||||
|
@ -3049,9 +3044,9 @@ class ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee
|
|||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit0a78a899db7d2a4fb6eee1e8ee40bcee::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit083184dffc36c4cc84f04a206cac4e3f::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user