diff --git a/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php b/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php index 2267550239f..83d937e5eda 100644 --- a/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php +++ b/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php @@ -10,20 +10,14 @@ use PHPStan\Reflection\FunctionVariantWithPhpDocs; use PHPStan\Type\MixedType; use Rector\NodeNameResolver\NodeNameResolver; use Rector\NodeTypeResolver\Node\AttributeKey; -use Rector\VendorLocker\Reflection\MethodReflectionContractAnalyzer; final class ClassMethodReturnVendorLockResolver { - /** - * @var \Rector\VendorLocker\Reflection\MethodReflectionContractAnalyzer - */ - private $methodReflectionContractAnalyzer; /** * @var \Rector\NodeNameResolver\NodeNameResolver */ private $nodeNameResolver; - public function __construct(\Rector\VendorLocker\Reflection\MethodReflectionContractAnalyzer $methodReflectionContractAnalyzer, \Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver) + public function __construct(\Rector\NodeNameResolver\NodeNameResolver $nodeNameResolver) { - $this->methodReflectionContractAnalyzer = $methodReflectionContractAnalyzer; $this->nodeNameResolver = $nodeNameResolver; } public function isVendorLocked(\PhpParser\Node\Stmt\ClassMethod $classMethod) : bool @@ -36,27 +30,24 @@ final class ClassMethodReturnVendorLockResolver if (!$classReflection instanceof \PHPStan\Reflection\ClassReflection) { return \false; } - if (\count($classReflection->getAncestors()) === 1) { - return \false; - } $methodName = $this->nodeNameResolver->getName($classMethod); - if ($this->isVendorLockedByParentClass($classReflection, $methodName)) { + if ($this->isVendorLockedByAncestors($classReflection, $methodName)) { return \true; } - if ($classReflection->isTrait()) { - return \false; - } - return $this->methodReflectionContractAnalyzer->hasInterfaceContract($classReflection, $methodName); + return $classReflection->isTrait(); } - private function isVendorLockedByParentClass(\PHPStan\Reflection\ClassReflection $classReflection, string $methodName) : bool + private function isVendorLockedByAncestors(\PHPStan\Reflection\ClassReflection $classReflection, string $methodName) : bool { - foreach ($classReflection->getParents() as $parentClassReflections) { - $nativeClassReflection = $parentClassReflections->getNativeReflection(); + foreach ($classReflection->getAncestors() as $ancestorClassReflections) { + if ($ancestorClassReflections === $classReflection) { + continue; + } + $nativeClassReflection = $ancestorClassReflections->getNativeReflection(); // this should avoid detecting @method as real method if (!$nativeClassReflection->hasMethod($methodName)) { continue; } - $parentClassMethodReflection = $parentClassReflections->getNativeMethod($methodName); + $parentClassMethodReflection = $ancestorClassReflections->getNativeMethod($methodName); $parametersAcceptor = $parentClassMethodReflection->getVariants()[0]; if (!$parametersAcceptor instanceof \PHPStan\Reflection\FunctionVariantWithPhpDocs) { continue; diff --git a/packages/VendorLocker/NodeVendorLocker/ClassMethodVendorLockResolver.php b/packages/VendorLocker/NodeVendorLocker/ClassMethodVendorLockResolver.php deleted file mode 100644 index 8405c518f2c..00000000000 --- a/packages/VendorLocker/NodeVendorLocker/ClassMethodVendorLockResolver.php +++ /dev/null @@ -1,62 +0,0 @@ -methodReflectionContractAnalyzer = $methodReflectionContractAnalyzer; - $this->nodeNameResolver = $nodeNameResolver; - } - /** - * Checks for: - * - interface required methods - * - abstract classes reqired method - * - * Prevent: - * - removing class methods, that breaks the code - */ - public function isRemovalVendorLocked(\PhpParser\Node\Stmt\ClassMethod $classMethod) : bool - { - $classMethodName = $this->nodeNameResolver->getName($classMethod); - /** @var Scope $scope */ - $scope = $classMethod->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE); - $classReflection = $scope->getClassReflection(); - if (!$classReflection instanceof \PHPStan\Reflection\ClassReflection) { - return \false; - } - if ($this->methodReflectionContractAnalyzer->hasInterfaceContract($classReflection, $classMethodName)) { - return \true; - } - foreach ($classReflection->getParents() as $parentClassReflection) { - if (!$parentClassReflection->hasMethod($classMethodName)) { - continue; - } - $methodReflection = $parentClassReflection->getNativeMethod($classMethodName); - if (!$methodReflection instanceof \PHPStan\Reflection\Php\PhpMethodReflection) { - continue; - } - if ($methodReflection->isAbstract()) { - return \true; - } - } - return \false; - } -} diff --git a/packages/VendorLocker/Reflection/MethodReflectionContractAnalyzer.php b/packages/VendorLocker/Reflection/MethodReflectionContractAnalyzer.php deleted file mode 100644 index 861c217065f..00000000000 --- a/packages/VendorLocker/Reflection/MethodReflectionContractAnalyzer.php +++ /dev/null @@ -1,18 +0,0 @@ -getInterfaces() as $interfaceReflection) { - if ($interfaceReflection->hasMethod($methodName)) { - return \true; - } - } - return \false; - } -} diff --git a/rules/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector.php b/rules/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector.php index fc29a15304c..a5193af136d 100644 --- a/rules/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector.php +++ b/rules/Arguments/Rector/FuncCall/FunctionArgumentDefaultValueReplacerRector.php @@ -56,7 +56,7 @@ CODE_SAMPLE /** * @param FuncCall $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\FuncCall { foreach ($this->replacedArguments as $replacedArgument) { if (!$this->isName($node->name, $replacedArgument->getFunction())) { diff --git a/rules/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector.php b/rules/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector.php index 5cce9a9082b..77d052f924f 100644 --- a/rules/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector.php +++ b/rules/Arguments/Rector/FuncCall/SwapFuncCallArgumentsRector.php @@ -56,7 +56,7 @@ CODE_SAMPLE /** * @param FuncCall $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\FuncCall { foreach ($this->functionArgumentSwaps as $functionArgumentSwap) { if (!$this->isName($node, $functionArgumentSwap->getFunction())) { diff --git a/rules/CodeQuality/Rector/NotEqual/CommonNotEqualRector.php b/rules/CodeQuality/Rector/NotEqual/CommonNotEqualRector.php index e551db35e72..bb35ea7d81e 100644 --- a/rules/CodeQuality/Rector/NotEqual/CommonNotEqualRector.php +++ b/rules/CodeQuality/Rector/NotEqual/CommonNotEqualRector.php @@ -47,7 +47,7 @@ CODE_SAMPLE /** * @param NotEqual $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\BinaryOp\NotEqual { // invoke override to default "!=" $node->setAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::ORIGINAL_NODE, null); diff --git a/rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php b/rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php index 7a0e259006e..e1b22423235 100644 --- a/rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php +++ b/rules/CodingStyle/Rector/ClassConst/SplitGroupedConstantsAndPropertiesRector.php @@ -57,9 +57,9 @@ CODE_SAMPLE } /** * @param ClassConst|Property $node - * @return Node|Node[]|null + * @return Node[]|null */ - public function refactor(\PhpParser\Node $node) + public function refactor(\PhpParser\Node $node) : ?array { if ($node instanceof \PhpParser\Node\Stmt\ClassConst) { if (\count($node->consts) < 2) { diff --git a/rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php b/rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php index 1bed245ee32..f544f6e6bc8 100644 --- a/rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php +++ b/rules/CodingStyle/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php @@ -75,7 +75,7 @@ CODE_SAMPLE /** * @param ClassMethod $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Stmt\ClassMethod { foreach ($this->methodsByType as $type => $methods) { if (!$this->isObjectType($node, new \PHPStan\Type\ObjectType($type))) { diff --git a/rules/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector.php b/rules/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector.php index 3bdf9799913..66807dbbc6c 100644 --- a/rules/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector.php +++ b/rules/CodingStyle/Rector/String_/SymplifyQuoteEscapeRector.php @@ -54,7 +54,7 @@ CODE_SAMPLE /** * @param String_ $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Scalar\String_ { $doubleQuoteCount = \substr_count($node->value, '"'); $singleQuoteCount = \substr_count($node->value, "'"); diff --git a/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php b/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php index a9dffd434c1..b3955711106 100644 --- a/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php +++ b/rules/DeadCode/Rector/If_/RemoveDeadInstanceOfRector.php @@ -61,9 +61,8 @@ CODE_SAMPLE } /** * @param If_ $node - * @return null|If_ */ - public function refactor(\PhpParser\Node $node) + public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node\Stmt\If_ { $scope = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE); // a trait diff --git a/rules/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector.php b/rules/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector.php index 2c47a22f466..2ad9e7429a9 100644 --- a/rules/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector.php +++ b/rules/DeadCode/Rector/TryCatch/RemoveDeadTryCatchRector.php @@ -54,7 +54,7 @@ CODE_SAMPLE * @param TryCatch $node * @return Stmt[]|null */ - public function refactor(\PhpParser\Node $node) + public function refactor(\PhpParser\Node $node) : ?array { if (\count($node->catches) !== 1) { return null; diff --git a/rules/Defluent/Rector/Return_/DefluentReturnMethodCallRector.php b/rules/Defluent/Rector/Return_/DefluentReturnMethodCallRector.php index 2f2bc0fcc65..d23dbe84dc0 100644 --- a/rules/Defluent/Rector/Return_/DefluentReturnMethodCallRector.php +++ b/rules/Defluent/Rector/Return_/DefluentReturnMethodCallRector.php @@ -49,7 +49,7 @@ CODE_SAMPLE * @param Return_ $node * @return null|Expression[]|Return_[] */ - public function refactor(\PhpParser\Node $node) + public function refactor(\PhpParser\Node $node) : ?array { if (!$node->expr instanceof \PhpParser\Node\Expr\MethodCall) { return null; diff --git a/rules/DowngradePhp53/Rector/Dir/DirConstToFileConstRector.php b/rules/DowngradePhp53/Rector/Dir/DirConstToFileConstRector.php index d78627e3e84..f089313dafa 100644 --- a/rules/DowngradePhp53/Rector/Dir/DirConstToFileConstRector.php +++ b/rules/DowngradePhp53/Rector/Dir/DirConstToFileConstRector.php @@ -4,6 +4,7 @@ declare (strict_types=1); namespace Rector\DowngradePhp53\Rector\Dir; use PhpParser\Node; +use PhpParser\Node\Expr\FuncCall; use PhpParser\Node\Scalar\MagicConst\Dir; use PhpParser\Node\Scalar\MagicConst\File; use Rector\Core\Rector\AbstractRector; @@ -48,7 +49,7 @@ CODE_SAMPLE /** * @param Dir $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\FuncCall { return $this->nodeFactory->createFuncCall('dirname', [new \PhpParser\Node\Scalar\MagicConst\File()]); } diff --git a/rules/DowngradePhp70/Rector/Coalesce/DowngradeNullCoalesceRector.php b/rules/DowngradePhp70/Rector/Coalesce/DowngradeNullCoalesceRector.php index e23a279f64a..93fd99c1d9c 100644 --- a/rules/DowngradePhp70/Rector/Coalesce/DowngradeNullCoalesceRector.php +++ b/rules/DowngradePhp70/Rector/Coalesce/DowngradeNullCoalesceRector.php @@ -40,7 +40,7 @@ CODE_SAMPLE /** * @param Coalesce $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\Ternary { $if = $node->left; $else = $node->right; diff --git a/rules/DowngradePhp70/Rector/GroupUse/SplitGroupedUseImportsRector.php b/rules/DowngradePhp70/Rector/GroupUse/SplitGroupedUseImportsRector.php index 9a0e3126332..2d244acdcd6 100644 --- a/rules/DowngradePhp70/Rector/GroupUse/SplitGroupedUseImportsRector.php +++ b/rules/DowngradePhp70/Rector/GroupUse/SplitGroupedUseImportsRector.php @@ -40,9 +40,9 @@ CODE_SAMPLE } /** * @param GroupUse $node - * @return Use_[]|null + * @return Use_[] */ - public function refactor(\PhpParser\Node $node) + public function refactor(\PhpParser\Node $node) : array { $prefix = $this->getName($node->prefix); $uses = []; diff --git a/rules/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector.php b/rules/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector.php index 10f9cbcc15f..f8533dad6e4 100644 --- a/rules/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector.php +++ b/rules/DowngradePhp70/Rector/Spaceship/DowngradeSpaceshipRector.php @@ -62,7 +62,7 @@ CODE_SAMPLE /** * @param Spaceship $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\FuncCall { $leftVariableParam = new \PhpParser\Node\Expr\Variable('left'); $rightVariableParam = new \PhpParser\Node\Expr\Variable('right'); diff --git a/rules/DowngradePhp71/Rector/ClassConst/DowngradeClassConstantVisibilityRector.php b/rules/DowngradePhp71/Rector/ClassConst/DowngradeClassConstantVisibilityRector.php index 88d63e1b3b7..3c0c2a42494 100644 --- a/rules/DowngradePhp71/Rector/ClassConst/DowngradeClassConstantVisibilityRector.php +++ b/rules/DowngradePhp71/Rector/ClassConst/DowngradeClassConstantVisibilityRector.php @@ -45,7 +45,7 @@ CODE_SAMPLE /** * @param ClassConst $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Stmt\ClassConst { $this->visibilityManipulator->removeVisibility($node); return $node; diff --git a/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php b/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php index 949cc2f6764..0bb643d3c2b 100644 --- a/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php +++ b/rules/DowngradePhp74/Rector/ArrowFunction/ArrowFunctionToAnonymousFunctionRector.php @@ -5,6 +5,7 @@ namespace Rector\DowngradePhp74\Rector\ArrowFunction; use PhpParser\Node; use PhpParser\Node\Expr\ArrowFunction; +use PhpParser\Node\Expr\Closure; use PhpParser\Node\Stmt\Return_; use Rector\Core\Rector\AbstractRector; use Rector\Php72\NodeFactory\AnonymousFunctionFactory; @@ -61,7 +62,7 @@ CODE_SAMPLE /** * @param ArrowFunction $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\Closure { $stmts = [new \PhpParser\Node\Stmt\Return_($node->expr)]; return $this->anonymousFunctionFactory->create($node->params, $stmts, $node->returnType); diff --git a/rules/DowngradePhp74/Rector/Coalesce/DowngradeNullCoalescingOperatorRector.php b/rules/DowngradePhp74/Rector/Coalesce/DowngradeNullCoalescingOperatorRector.php index f6fae7186ac..42903bb797c 100644 --- a/rules/DowngradePhp74/Rector/Coalesce/DowngradeNullCoalescingOperatorRector.php +++ b/rules/DowngradePhp74/Rector/Coalesce/DowngradeNullCoalescingOperatorRector.php @@ -38,7 +38,7 @@ CODE_SAMPLE /** * @param AssignCoalesce $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\Assign { return new \PhpParser\Node\Expr\Assign($node->var, new \PhpParser\Node\Expr\BinaryOp\Coalesce($node->var, $node->expr)); } diff --git a/rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php b/rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php index ee5d7d85b93..494ccd6a0e3 100644 --- a/rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php +++ b/rules/DowngradePhp80/Rector/NullsafeMethodCall/DowngradeNullsafeToTernaryOperatorRector.php @@ -51,7 +51,7 @@ CODE_SAMPLE /** * @param NullsafeMethodCall|NullsafePropertyFetch $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\Ternary { $tempVarName = $this->variableNaming->resolveFromNodeWithScopeCountAndFallbackName($node->var, $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE), '_'); $variable = new \PhpParser\Node\Expr\Variable($tempVarName); diff --git a/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php b/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php index e0fc06c933e..426168d8059 100644 --- a/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php +++ b/rules/EarlyReturn/Rector/If_/ChangeIfElseValueAssignToEarlyReturnRector.php @@ -76,9 +76,9 @@ CODE_SAMPLE } /** * @param If_ $node - * @return Stmt[]|Node|null + * @return Stmt[]|null */ - public function refactor(\PhpParser\Node $node) + public function refactor(\PhpParser\Node $node) : ?array { $nextNode = $node->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::NEXT_NODE); if (!$nextNode instanceof \PhpParser\Node\Stmt\Return_) { diff --git a/rules/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector.php b/rules/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector.php index 3958caaaad3..269c0eabb05 100644 --- a/rules/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector.php +++ b/rules/MysqlToMysqli/Rector/FuncCall/MysqlFuncCallToMysqliRector.php @@ -44,7 +44,7 @@ CODE_SAMPLE /** * @param FuncCall $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\FuncCall { if ($this->isName($node, 'mysql_create_db')) { return $this->processMysqlCreateDb($node); diff --git a/rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php b/rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php index c5b36ee778d..a3d9c71854e 100644 --- a/rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php +++ b/rules/Php52/Rector/Switch_/ContinueToBreakInSwitchRector.php @@ -60,7 +60,7 @@ CODE_SAMPLE /** * @param Switch_ $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Stmt\Switch_ { foreach ($node->cases as $case) { foreach ($case->stmts as $key => $caseStmt) { diff --git a/rules/Php54/Rector/FuncCall/RemoveReferenceFromCallRector.php b/rules/Php54/Rector/FuncCall/RemoveReferenceFromCallRector.php index c03abcf85c7..d197db520b3 100644 --- a/rules/Php54/Rector/FuncCall/RemoveReferenceFromCallRector.php +++ b/rules/Php54/Rector/FuncCall/RemoveReferenceFromCallRector.php @@ -45,7 +45,7 @@ CODE_SAMPLE /** * @param FuncCall $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\FuncCall { foreach ($node->args as $nodeArg) { if ($nodeArg->byRef) { diff --git a/rules/RemovingStatic/Rector/Class_/NewUniqueObjectToEntityFactoryRector.php b/rules/RemovingStatic/Rector/Class_/NewUniqueObjectToEntityFactoryRector.php index 62a79ae4feb..30b0ce1db92 100644 --- a/rules/RemovingStatic/Rector/Class_/NewUniqueObjectToEntityFactoryRector.php +++ b/rules/RemovingStatic/Rector/Class_/NewUniqueObjectToEntityFactoryRector.php @@ -100,7 +100,7 @@ CODE_SAMPLE /** * @param Class_ $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Stmt\Class_ { $this->matchedObjectTypes = []; // collect classes with new to factory in all classes diff --git a/rules/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector.php b/rules/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector.php index 85184ba8110..3062af823f0 100644 --- a/rules/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector.php +++ b/rules/Renaming/Rector/ClassConstFetch/RenameClassConstFetchRector.php @@ -51,7 +51,7 @@ CODE_SAMPLE /** * @param ClassConstFetch $node */ - public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node + public function refactor(\PhpParser\Node $node) : \PhpParser\Node\Expr\ClassConstFetch { foreach ($this->renameClassConstFetches as $renameClassConstFetch) { if (!$this->isObjectType($node->class, $renameClassConstFetch->getOldObjectType())) { diff --git a/rules/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector.php b/rules/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector.php index 56e3d5da670..26c923bc532 100644 --- a/rules/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector.php +++ b/rules/Transform/Rector/MethodCall/CallableInMethodCallToVariableRector.php @@ -73,9 +73,8 @@ CODE_SAMPLE } /** * @param MethodCall $node - * @return Node|Node[]|null */ - public function refactor(\PhpParser\Node $node) + public function refactor(\PhpParser\Node $node) : ?\PhpParser\Node\Expr\MethodCall { foreach ($this->callableInMethodCallToVariable as $singleCallableInMethodCallToVariable) { if (!$this->isObjectType($node->var, $singleCallableInMethodCallToVariable->getObjectType())) { diff --git a/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php b/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php index fbddcabd00b..9ba4b3b6d9d 100644 --- a/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php +++ b/rules/TypeDeclaration/Rector/ClassMethod/AddVoidReturnTypeWhereNoReturnRector.php @@ -11,6 +11,7 @@ use PhpParser\Node\Stmt\Function_; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\TypeDeclaration\TypeInferer\SilentVoidResolver; +use Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnVendorLockResolver; use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample; use Symplify\RuleDocGenerator\ValueObject\RuleDefinition; /** @@ -22,9 +23,14 @@ final class AddVoidReturnTypeWhereNoReturnRector extends \Rector\Core\Rector\Abs * @var \Rector\TypeDeclaration\TypeInferer\SilentVoidResolver */ private $silentVoidResolver; - public function __construct(\Rector\TypeDeclaration\TypeInferer\SilentVoidResolver $silentVoidResolver) + /** + * @var \Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnVendorLockResolver + */ + private $classMethodReturnVendorLockResolver; + public function __construct(\Rector\TypeDeclaration\TypeInferer\SilentVoidResolver $silentVoidResolver, \Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnVendorLockResolver $classMethodReturnVendorLockResolver) { $this->silentVoidResolver = $silentVoidResolver; + $this->classMethodReturnVendorLockResolver = $classMethodReturnVendorLockResolver; } public function getRuleDefinition() : \Symplify\RuleDocGenerator\ValueObject\RuleDefinition { @@ -74,6 +80,9 @@ CODE_SAMPLE if (!$this->silentVoidResolver->hasExclusiveVoid($node)) { return null; } + if ($node instanceof \PhpParser\Node\Stmt\ClassMethod && $this->classMethodReturnVendorLockResolver->isVendorLocked($node)) { + return null; + } $node->returnType = new \PhpParser\Node\Identifier('void'); return $node; } diff --git a/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php b/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php index 723a4a4fc7e..0c5abff80ba 100644 --- a/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php +++ b/rules/TypeDeclaration/Rector/FunctionLike/ReturnTypeDeclarationRector.php @@ -14,7 +14,6 @@ use PhpParser\Node\UnionType as PhpParserUnionType; use PHPStan\Type\MixedType; use PHPStan\Type\Type; use PHPStan\Type\UnionType; -use Rector\Core\NodeAnalyzer\ExternalFullyQualifiedAnalyzer; use Rector\Core\Rector\AbstractRector; use Rector\Core\ValueObject\PhpVersionFeature; use Rector\NodeTypeResolver\Node\AttributeKey; @@ -69,11 +68,7 @@ final class ReturnTypeDeclarationRector extends \Rector\Core\Rector\AbstractRect * @var \Rector\TypeDeclaration\TypeAnalyzer\ObjectTypeComparator */ private $objectTypeComparator; - /** - * @var \Rector\Core\NodeAnalyzer\ExternalFullyQualifiedAnalyzer - */ - private $externalFullyQualifiedAnalyzer; - public function __construct(\Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer $returnTypeInferer, \Rector\TypeDeclaration\ChildPopulator\ChildReturnPopulator $childReturnPopulator, \Rector\TypeDeclaration\TypeAlreadyAddedChecker\ReturnTypeAlreadyAddedChecker $returnTypeAlreadyAddedChecker, \Rector\TypeDeclaration\PhpDocParser\NonInformativeReturnTagRemover $nonInformativeReturnTagRemover, \Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard, \Rector\VendorLocker\VendorLockResolver $vendorLockResolver, \Rector\TypeDeclaration\PhpParserTypeAnalyzer $phpParserTypeAnalyzer, \Rector\TypeDeclaration\TypeAnalyzer\ObjectTypeComparator $objectTypeComparator, \Rector\Core\NodeAnalyzer\ExternalFullyQualifiedAnalyzer $externalFullyQualifiedAnalyzer) + public function __construct(\Rector\TypeDeclaration\TypeInferer\ReturnTypeInferer $returnTypeInferer, \Rector\TypeDeclaration\ChildPopulator\ChildReturnPopulator $childReturnPopulator, \Rector\TypeDeclaration\TypeAlreadyAddedChecker\ReturnTypeAlreadyAddedChecker $returnTypeAlreadyAddedChecker, \Rector\TypeDeclaration\PhpDocParser\NonInformativeReturnTagRemover $nonInformativeReturnTagRemover, \Rector\VendorLocker\NodeVendorLocker\ClassMethodReturnTypeOverrideGuard $classMethodReturnTypeOverrideGuard, \Rector\VendorLocker\VendorLockResolver $vendorLockResolver, \Rector\TypeDeclaration\PhpParserTypeAnalyzer $phpParserTypeAnalyzer, \Rector\TypeDeclaration\TypeAnalyzer\ObjectTypeComparator $objectTypeComparator) { $this->returnTypeInferer = $returnTypeInferer; $this->childReturnPopulator = $childReturnPopulator; @@ -83,7 +78,6 @@ final class ReturnTypeDeclarationRector extends \Rector\Core\Rector\AbstractRect $this->vendorLockResolver = $vendorLockResolver; $this->phpParserTypeAnalyzer = $phpParserTypeAnalyzer; $this->objectTypeComparator = $objectTypeComparator; - $this->externalFullyQualifiedAnalyzer = $externalFullyQualifiedAnalyzer; } /** * @return array> @@ -204,9 +198,6 @@ CODE_SAMPLE */ private function addReturnType($functionLike, $inferredReturnNode) : void { - if ($this->isExternalVoid($functionLike, $inferredReturnNode)) { - return; - } if ($functionLike->returnType === null) { $functionLike->returnType = $inferredReturnNode; return; @@ -221,21 +212,6 @@ CODE_SAMPLE $functionLike->returnType = $inferredReturnNode; } } - /** - * @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Stmt\Function_ $functionLike - * @param \PhpParser\Node\Name|\PhpParser\Node\NullableType|PhpParserUnionType $inferredReturnNode - */ - private function isExternalVoid($functionLike, $inferredReturnNode) : bool - { - $classLike = $functionLike->getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::CLASS_NODE); - if (!$classLike instanceof \PhpParser\Node\Stmt\Class_) { - return \false; - } - if (!$this->externalFullyQualifiedAnalyzer->hasVendorLocatedDependency($classLike)) { - return \false; - } - return $functionLike->returnType === null && $this->isName($inferredReturnNode, 'void'); - } private function isNullableTypeSubType(\PHPStan\Type\Type $currentType, \PHPStan\Type\Type $inferedType) : bool { if (!$currentType instanceof \PHPStan\Type\UnionType) { diff --git a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php index 54f6f5987ef..7b3794d6acc 100644 --- a/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php +++ b/rules/TypeDeclaration/TypeInferer/SilentVoidResolver.php @@ -6,7 +6,6 @@ namespace Rector\TypeDeclaration\TypeInferer; use PhpParser\Node\Expr\Closure; use PhpParser\Node\Expr\Yield_; use PhpParser\Node\Stmt; -use PhpParser\Node\Stmt\Class_; use PhpParser\Node\Stmt\ClassMethod; use PhpParser\Node\Stmt\Expression; use PhpParser\Node\Stmt\Function_; @@ -16,7 +15,6 @@ use PhpParser\Node\Stmt\Switch_; use PhpParser\Node\Stmt\Throw_; use PhpParser\Node\Stmt\Trait_; use PhpParser\Node\Stmt\TryCatch; -use Rector\Core\NodeAnalyzer\ExternalFullyQualifiedAnalyzer; use Rector\Core\PhpParser\Node\BetterNodeFinder; use Rector\NodeTypeResolver\Node\AttributeKey; final class SilentVoidResolver @@ -25,14 +23,9 @@ final class SilentVoidResolver * @var \Rector\Core\PhpParser\Node\BetterNodeFinder */ private $betterNodeFinder; - /** - * @var \Rector\Core\NodeAnalyzer\ExternalFullyQualifiedAnalyzer - */ - private $externalFullyQualifiedAnalyzer; - public function __construct(\Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder, \Rector\Core\NodeAnalyzer\ExternalFullyQualifiedAnalyzer $externalFullyQualifiedAnalyzer) + public function __construct(\Rector\Core\PhpParser\Node\BetterNodeFinder $betterNodeFinder) { $this->betterNodeFinder = $betterNodeFinder; - $this->externalFullyQualifiedAnalyzer = $externalFullyQualifiedAnalyzer; } /** * @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Expr\Closure|\PhpParser\Node\Stmt\Function_ $functionLike @@ -52,9 +45,6 @@ final class SilentVoidResolver if ($this->betterNodeFinder->hasInstancesOf((array) $functionLike->stmts, [\PhpParser\Node\Expr\Yield_::class])) { return \false; } - if ($classLike instanceof \PhpParser\Node\Stmt\Class_ && $this->externalFullyQualifiedAnalyzer->hasVendorLocatedDependency($classLike)) { - return \false; - } /** @var Return_[] $returns */ $returns = $this->betterNodeFinder->findInstanceOf((array) $functionLike->stmts, \PhpParser\Node\Stmt\Return_::class); foreach ($returns as $return) { diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php index ed94f9a84b9..2eb16ab3955 100644 --- a/src/Application/VersionResolver.php +++ b/src/Application/VersionResolver.php @@ -16,11 +16,11 @@ final class VersionResolver /** * @var string */ - public const PACKAGE_VERSION = 'a9b1bbba885aa28167e65e5a46063959cf6449a3'; + public const PACKAGE_VERSION = '904a5a7a1c8dd041524cb51ec3a689ad4cbef436'; /** * @var string */ - public const RELEASE_DATE = '2021-07-04 18:11:13'; + public const RELEASE_DATE = '2021-07-04 23:04:09'; public static function resolvePackageVersion() : string { $process = new \RectorPrefix20210704\Symfony\Component\Process\Process(['git', 'log', '--pretty="%H"', '-n1', 'HEAD'], __DIR__); diff --git a/src/DependencyInjection/Loader/ConfigurableCallValuesCollectingPhpFileLoader.php b/src/DependencyInjection/Loader/ConfigurableCallValuesCollectingPhpFileLoader.php index 82ed7f5905e..7be0b5d326e 100644 --- a/src/DependencyInjection/Loader/ConfigurableCallValuesCollectingPhpFileLoader.php +++ b/src/DependencyInjection/Loader/ConfigurableCallValuesCollectingPhpFileLoader.php @@ -22,14 +22,14 @@ final class ConfigurableCallValuesCollectingPhpFileLoader extends \RectorPrefix2 /** * @param mixed $resource */ - public function load($resource, string $type = null) + public function load($resource, string $type = null) : void { // this call collects root values $this->collectConfigureCallsFromJustImportedConfigurableRectorDefinitions(); parent::load($resource, $type); $this->collectConfigureCallsFromJustImportedConfigurableRectorDefinitions(); } - public function import($resource, string $type = null, $ignoreErrors = \false, $sourceResource = null, $exclude = null) + public function import($resource, string $type = null, $ignoreErrors = \false, $sourceResource = null, $exclude = null) : void { // this call collects root values $this->collectConfigureCallsFromJustImportedConfigurableRectorDefinitions(); diff --git a/src/NodeAnalyzer/ExternalFullyQualifiedAnalyzer.php b/src/NodeAnalyzer/ExternalFullyQualifiedAnalyzer.php deleted file mode 100644 index b084810dc4f..00000000000 --- a/src/NodeAnalyzer/ExternalFullyQualifiedAnalyzer.php +++ /dev/null @@ -1,40 +0,0 @@ -getAttribute(\Rector\NodeTypeResolver\Node\AttributeKey::SCOPE); - if (!$scope instanceof \PHPStan\Analyser\Scope) { - return \false; - } - $classReflection = $scope->getClassReflection(); - if (!$classReflection instanceof \PHPStan\Reflection\ClassReflection) { - return \false; - } - foreach ($classReflection->getAncestors() as $ancestorClassReflection) { - if ($classReflection === $ancestorClassReflection) { - continue; - } - $fileName = $ancestorClassReflection->getFileName(); - if ($fileName === \false) { - continue; - } - // file is located in vendor → out of modifiable scope - if (\strpos($fileName, '/vendor/') !== \false) { - return \true; - } - } - return \false; - } -} diff --git a/vendor/autoload.php b/vendor/autoload.php index f6f208e257c..adc846b8f8b 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitfbed5e30872de338ac03dddfdc4d41a1::getLoader(); +return ComposerAutoloaderInitd12afff95d0d64dcd0dd26bf8b6c1fc2::getLoader(); diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 9cb4a22ab86..55b03d5b13d 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -1837,7 +1837,6 @@ return array( 'Rector\\Core\\NodeAnalyzer\\ClassAnalyzer' => $baseDir . '/src/NodeAnalyzer/ClassAnalyzer.php', 'Rector\\Core\\NodeAnalyzer\\CompactFuncCallAnalyzer' => $baseDir . '/src/NodeAnalyzer/CompactFuncCallAnalyzer.php', 'Rector\\Core\\NodeAnalyzer\\ConstFetchAnalyzer' => $baseDir . '/src/NodeAnalyzer/ConstFetchAnalyzer.php', - 'Rector\\Core\\NodeAnalyzer\\ExternalFullyQualifiedAnalyzer' => $baseDir . '/src/NodeAnalyzer/ExternalFullyQualifiedAnalyzer.php', 'Rector\\Core\\NodeAnalyzer\\ParamAnalyzer' => $baseDir . '/src/NodeAnalyzer/ParamAnalyzer.php', 'Rector\\Core\\NodeAnalyzer\\PromotedPropertyParamCleaner' => $baseDir . '/src/NodeAnalyzer/PromotedPropertyParamCleaner.php', 'Rector\\Core\\NodeAnalyzer\\PropertyFetchAnalyzer' => $baseDir . '/src/NodeAnalyzer/PropertyFetchAnalyzer.php', @@ -3192,10 +3191,8 @@ return array( 'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodParamVendorLockResolver' => $baseDir . '/packages/VendorLocker/NodeVendorLocker/ClassMethodParamVendorLockResolver.php', 'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodReturnTypeOverrideGuard' => $baseDir . '/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php', 'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodReturnVendorLockResolver' => $baseDir . '/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php', - 'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodVendorLockResolver' => $baseDir . '/packages/VendorLocker/NodeVendorLocker/ClassMethodVendorLockResolver.php', 'Rector\\VendorLocker\\NodeVendorLocker\\PropertyTypeVendorLockResolver' => $baseDir . '/packages/VendorLocker/NodeVendorLocker/PropertyTypeVendorLockResolver.php', 'Rector\\VendorLocker\\NodeVendorLocker\\PropertyVisibilityVendorLockResolver' => $baseDir . '/packages/VendorLocker/NodeVendorLocker/PropertyVisibilityVendorLockResolver.php', - 'Rector\\VendorLocker\\Reflection\\MethodReflectionContractAnalyzer' => $baseDir . '/packages/VendorLocker/Reflection/MethodReflectionContractAnalyzer.php', 'Rector\\VendorLocker\\VendorLockResolver' => $baseDir . '/packages/VendorLocker/VendorLockResolver.php', 'Rector\\Visibility\\Rector\\ClassConst\\ChangeConstantVisibilityRector' => $baseDir . '/rules/Visibility/Rector/ClassConst/ChangeConstantVisibilityRector.php', 'Rector\\Visibility\\Rector\\ClassMethod\\ChangeMethodVisibilityRector' => $baseDir . '/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php', diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index c0fe9967692..7cf50178618 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitfbed5e30872de338ac03dddfdc4d41a1 +class ComposerAutoloaderInitd12afff95d0d64dcd0dd26bf8b6c1fc2 { private static $loader; @@ -22,15 +22,15 @@ class ComposerAutoloaderInitfbed5e30872de338ac03dddfdc4d41a1 return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitfbed5e30872de338ac03dddfdc4d41a1', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitd12afff95d0d64dcd0dd26bf8b6c1fc2', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); - spl_autoload_unregister(array('ComposerAutoloaderInitfbed5e30872de338ac03dddfdc4d41a1', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitd12afff95d0d64dcd0dd26bf8b6c1fc2', '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\ComposerStaticInitfbed5e30872de338ac03dddfdc4d41a1::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitd12afff95d0d64dcd0dd26bf8b6c1fc2::getInitializer($loader)); } else { $classMap = require __DIR__ . '/autoload_classmap.php'; if ($classMap) { @@ -42,19 +42,19 @@ class ComposerAutoloaderInitfbed5e30872de338ac03dddfdc4d41a1 $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitfbed5e30872de338ac03dddfdc4d41a1::$files; + $includeFiles = Composer\Autoload\ComposerStaticInitd12afff95d0d64dcd0dd26bf8b6c1fc2::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirefbed5e30872de338ac03dddfdc4d41a1($fileIdentifier, $file); + composerRequired12afff95d0d64dcd0dd26bf8b6c1fc2($fileIdentifier, $file); } return $loader; } } -function composerRequirefbed5e30872de338ac03dddfdc4d41a1($fileIdentifier, $file) +function composerRequired12afff95d0d64dcd0dd26bf8b6c1fc2($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index a34b42f1433..52877572b7d 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitfbed5e30872de338ac03dddfdc4d41a1 +class ComposerStaticInitd12afff95d0d64dcd0dd26bf8b6c1fc2 { public static $files = array ( 'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php', @@ -2192,7 +2192,6 @@ class ComposerStaticInitfbed5e30872de338ac03dddfdc4d41a1 'Rector\\Core\\NodeAnalyzer\\ClassAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/ClassAnalyzer.php', 'Rector\\Core\\NodeAnalyzer\\CompactFuncCallAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/CompactFuncCallAnalyzer.php', 'Rector\\Core\\NodeAnalyzer\\ConstFetchAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/ConstFetchAnalyzer.php', - 'Rector\\Core\\NodeAnalyzer\\ExternalFullyQualifiedAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/ExternalFullyQualifiedAnalyzer.php', 'Rector\\Core\\NodeAnalyzer\\ParamAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/ParamAnalyzer.php', 'Rector\\Core\\NodeAnalyzer\\PromotedPropertyParamCleaner' => __DIR__ . '/../..' . '/src/NodeAnalyzer/PromotedPropertyParamCleaner.php', 'Rector\\Core\\NodeAnalyzer\\PropertyFetchAnalyzer' => __DIR__ . '/../..' . '/src/NodeAnalyzer/PropertyFetchAnalyzer.php', @@ -3547,10 +3546,8 @@ class ComposerStaticInitfbed5e30872de338ac03dddfdc4d41a1 'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodParamVendorLockResolver' => __DIR__ . '/../..' . '/packages/VendorLocker/NodeVendorLocker/ClassMethodParamVendorLockResolver.php', 'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodReturnTypeOverrideGuard' => __DIR__ . '/../..' . '/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnTypeOverrideGuard.php', 'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodReturnVendorLockResolver' => __DIR__ . '/../..' . '/packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php', - 'Rector\\VendorLocker\\NodeVendorLocker\\ClassMethodVendorLockResolver' => __DIR__ . '/../..' . '/packages/VendorLocker/NodeVendorLocker/ClassMethodVendorLockResolver.php', 'Rector\\VendorLocker\\NodeVendorLocker\\PropertyTypeVendorLockResolver' => __DIR__ . '/../..' . '/packages/VendorLocker/NodeVendorLocker/PropertyTypeVendorLockResolver.php', 'Rector\\VendorLocker\\NodeVendorLocker\\PropertyVisibilityVendorLockResolver' => __DIR__ . '/../..' . '/packages/VendorLocker/NodeVendorLocker/PropertyVisibilityVendorLockResolver.php', - 'Rector\\VendorLocker\\Reflection\\MethodReflectionContractAnalyzer' => __DIR__ . '/../..' . '/packages/VendorLocker/Reflection/MethodReflectionContractAnalyzer.php', 'Rector\\VendorLocker\\VendorLockResolver' => __DIR__ . '/../..' . '/packages/VendorLocker/VendorLockResolver.php', 'Rector\\Visibility\\Rector\\ClassConst\\ChangeConstantVisibilityRector' => __DIR__ . '/../..' . '/rules/Visibility/Rector/ClassConst/ChangeConstantVisibilityRector.php', 'Rector\\Visibility\\Rector\\ClassMethod\\ChangeMethodVisibilityRector' => __DIR__ . '/../..' . '/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php', @@ -3848,9 +3845,9 @@ class ComposerStaticInitfbed5e30872de338ac03dddfdc4d41a1 public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitfbed5e30872de338ac03dddfdc4d41a1::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitfbed5e30872de338ac03dddfdc4d41a1::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitfbed5e30872de338ac03dddfdc4d41a1::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInitd12afff95d0d64dcd0dd26bf8b6c1fc2::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitd12afff95d0d64dcd0dd26bf8b6c1fc2::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitd12afff95d0d64dcd0dd26bf8b6c1fc2::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/scoper-autoload.php b/vendor/scoper-autoload.php index a2f1d476953..7787221516a 100644 --- a/vendor/scoper-autoload.php +++ b/vendor/scoper-autoload.php @@ -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('RectorPrefix20210704\AutoloadIncluder'); } -if (!class_exists('ComposerAutoloaderInitfbed5e30872de338ac03dddfdc4d41a1', false) && !interface_exists('ComposerAutoloaderInitfbed5e30872de338ac03dddfdc4d41a1', false) && !trait_exists('ComposerAutoloaderInitfbed5e30872de338ac03dddfdc4d41a1', false)) { - spl_autoload_call('RectorPrefix20210704\ComposerAutoloaderInitfbed5e30872de338ac03dddfdc4d41a1'); +if (!class_exists('ComposerAutoloaderInitd12afff95d0d64dcd0dd26bf8b6c1fc2', false) && !interface_exists('ComposerAutoloaderInitd12afff95d0d64dcd0dd26bf8b6c1fc2', false) && !trait_exists('ComposerAutoloaderInitd12afff95d0d64dcd0dd26bf8b6c1fc2', false)) { + spl_autoload_call('RectorPrefix20210704\ComposerAutoloaderInitd12afff95d0d64dcd0dd26bf8b6c1fc2'); } if (!class_exists('Doctrine\Inflector\Inflector', false) && !interface_exists('Doctrine\Inflector\Inflector', false) && !trait_exists('Doctrine\Inflector\Inflector', false)) { spl_autoload_call('RectorPrefix20210704\Doctrine\Inflector\Inflector'); @@ -3308,9 +3308,9 @@ if (!function_exists('print_node')) { return \RectorPrefix20210704\print_node(...func_get_args()); } } -if (!function_exists('composerRequirefbed5e30872de338ac03dddfdc4d41a1')) { - function composerRequirefbed5e30872de338ac03dddfdc4d41a1() { - return \RectorPrefix20210704\composerRequirefbed5e30872de338ac03dddfdc4d41a1(...func_get_args()); +if (!function_exists('composerRequired12afff95d0d64dcd0dd26bf8b6c1fc2')) { + function composerRequired12afff95d0d64dcd0dd26bf8b6c1fc2() { + return \RectorPrefix20210704\composerRequired12afff95d0d64dcd0dd26bf8b6c1fc2(...func_get_args()); } } if (!function_exists('parseArgs')) {