mirror of
https://github.com/rectorphp/rector.git
synced 2025-04-16 13:33:13 +02:00
Updated Rector to commit 8fe22e43b593963c405fac48c5d093e1575afd49
8fe22e43b5
Remove RemoveDelegatingParentCallRector as overly complex and usually on purpose (#4136)
This commit is contained in:
parent
fc7326e2ba
commit
b0e2693e28
@ -11,7 +11,6 @@ use Rector\DeadCode\Rector\Assign\RemoveUnusedVariableAssignRector;
|
||||
use Rector\DeadCode\Rector\BooleanAnd\RemoveAndTrueRector;
|
||||
use Rector\DeadCode\Rector\Cast\RecastingRemovalRector;
|
||||
use Rector\DeadCode\Rector\ClassConst\RemoveUnusedPrivateClassConstantRector;
|
||||
use Rector\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector;
|
||||
use Rector\DeadCode\Rector\ClassMethod\RemoveEmptyClassMethodRector;
|
||||
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedConstructorParamRector;
|
||||
use Rector\DeadCode\Rector\ClassMethod\RemoveUnusedPrivateMethodParameterRector;
|
||||
@ -68,7 +67,6 @@ return static function (RectorConfig $rectorConfig) : void {
|
||||
RemoveAndTrueRector::class,
|
||||
RemoveConcatAutocastRector::class,
|
||||
SimplifyUselessVariableRector::class,
|
||||
RemoveDelegatingParentCallRector::class,
|
||||
RemoveDuplicatedCaseInSwitchRector::class,
|
||||
RemoveNullPropertyInitializationRector::class,
|
||||
RemoveUnreachableStatementRector::class,
|
||||
|
@ -1,64 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\NodeTypeResolver;
|
||||
|
||||
use PhpParser\Node\Expr\StaticCall;
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PHPStan\Analyser\Scope;
|
||||
use PHPStan\Reflection\MethodReflection;
|
||||
use PHPStan\Reflection\Native\NativeMethodReflection;
|
||||
use PHPStan\Type\Type;
|
||||
use Rector\Core\Reflection\ReflectionResolver;
|
||||
use Rector\NodeTypeResolver\PHPStan\ParametersAcceptorSelectorVariantsWrapper;
|
||||
final class MethodParameterTypeResolver
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\Reflection\ReflectionResolver
|
||||
*/
|
||||
private $reflectionResolver;
|
||||
public function __construct(ReflectionResolver $reflectionResolver)
|
||||
{
|
||||
$this->reflectionResolver = $reflectionResolver;
|
||||
}
|
||||
/**
|
||||
* @return Type[]
|
||||
*/
|
||||
public function provideParameterTypesByStaticCall(StaticCall $staticCall, Scope $scope) : array
|
||||
{
|
||||
$methodReflection = $this->reflectionResolver->resolveMethodReflectionFromStaticCall($staticCall);
|
||||
if (!$methodReflection instanceof MethodReflection) {
|
||||
return [];
|
||||
}
|
||||
return $this->provideParameterTypesFromMethodReflection($methodReflection, $staticCall, $scope);
|
||||
}
|
||||
/**
|
||||
* @return Type[]
|
||||
*/
|
||||
public function provideParameterTypesByClassMethod(ClassMethod $classMethod, Scope $scope) : array
|
||||
{
|
||||
$methodReflection = $this->reflectionResolver->resolveMethodReflectionFromClassMethod($classMethod);
|
||||
if (!$methodReflection instanceof MethodReflection) {
|
||||
return [];
|
||||
}
|
||||
return $this->provideParameterTypesFromMethodReflection($methodReflection, $classMethod, $scope);
|
||||
}
|
||||
/**
|
||||
* @return Type[]
|
||||
* @param \PhpParser\Node\Stmt\ClassMethod|\PhpParser\Node\Expr\StaticCall $node
|
||||
*/
|
||||
private function provideParameterTypesFromMethodReflection(MethodReflection $methodReflection, $node, Scope $scope) : array
|
||||
{
|
||||
if ($methodReflection instanceof NativeMethodReflection) {
|
||||
// method "getParameters()" does not exist there
|
||||
return [];
|
||||
}
|
||||
$parameterTypes = [];
|
||||
$parametersAcceptor = ParametersAcceptorSelectorVariantsWrapper::select($methodReflection, $node, $scope);
|
||||
foreach ($parametersAcceptor->getParameters() as $parameterReflection) {
|
||||
$parameterTypes[] = $parameterReflection->getType();
|
||||
}
|
||||
return $parameterTypes;
|
||||
}
|
||||
}
|
@ -1,160 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\DeadCode\Comparator;
|
||||
|
||||
use PhpParser\Node\Arg;
|
||||
use PhpParser\Node\Expr\StaticCall;
|
||||
use PhpParser\Node\Param;
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PhpParser\Node\VariadicPlaceholder;
|
||||
use PHPStan\Analyser\Scope;
|
||||
use PHPStan\Reflection\ClassReflection;
|
||||
use PHPStan\Reflection\ExtendedMethodReflection;
|
||||
use PHPStan\Reflection\ParametersAcceptorSelector;
|
||||
use PHPStan\Type\Type;
|
||||
use Rector\Core\Enum\ObjectReference;
|
||||
use Rector\Core\PhpParser\Comparing\NodeComparator;
|
||||
use Rector\Core\Reflection\ReflectionResolver;
|
||||
use Rector\DeadCode\Comparator\Parameter\ParameterDefaultsComparator;
|
||||
use Rector\DeadCode\Comparator\Parameter\ParameterTypeComparator;
|
||||
use Rector\NodeNameResolver\NodeNameResolver;
|
||||
final class CurrentAndParentClassMethodComparator
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\NodeNameResolver\NodeNameResolver
|
||||
*/
|
||||
private $nodeNameResolver;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\DeadCode\Comparator\Parameter\ParameterDefaultsComparator
|
||||
*/
|
||||
private $parameterDefaultsComparator;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\DeadCode\Comparator\Parameter\ParameterTypeComparator
|
||||
*/
|
||||
private $parameterTypeComparator;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
|
||||
*/
|
||||
private $nodeComparator;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\Reflection\ReflectionResolver
|
||||
*/
|
||||
private $reflectionResolver;
|
||||
public function __construct(NodeNameResolver $nodeNameResolver, ParameterDefaultsComparator $parameterDefaultsComparator, ParameterTypeComparator $parameterTypeComparator, NodeComparator $nodeComparator, ReflectionResolver $reflectionResolver)
|
||||
{
|
||||
$this->nodeNameResolver = $nodeNameResolver;
|
||||
$this->parameterDefaultsComparator = $parameterDefaultsComparator;
|
||||
$this->parameterTypeComparator = $parameterTypeComparator;
|
||||
$this->nodeComparator = $nodeComparator;
|
||||
$this->reflectionResolver = $reflectionResolver;
|
||||
}
|
||||
public function isParentCallMatching(ClassMethod $classMethod, StaticCall $staticCall, Scope $scope) : bool
|
||||
{
|
||||
if (!$this->isSameMethodParentCall($classMethod, $staticCall)) {
|
||||
return \false;
|
||||
}
|
||||
if (!$this->areArgsAndParamsEqual($staticCall->args, $classMethod->params)) {
|
||||
return \false;
|
||||
}
|
||||
if (!$this->parameterTypeComparator->isClassMethodIdenticalToParentStaticCall($classMethod, $staticCall, $scope)) {
|
||||
return \false;
|
||||
}
|
||||
return !$this->isParentClassMethodVisibilityOrDefaultOverride($classMethod, $staticCall, $scope);
|
||||
}
|
||||
private function isSameMethodParentCall(ClassMethod $classMethod, StaticCall $staticCall) : bool
|
||||
{
|
||||
if (!$this->nodeNameResolver->areNamesEqual($staticCall->name, $classMethod->name)) {
|
||||
return \false;
|
||||
}
|
||||
return $this->nodeNameResolver->isName($staticCall->class, ObjectReference::PARENT);
|
||||
}
|
||||
/**
|
||||
* @param Arg[]|VariadicPlaceholder[] $parentStaticCallArgs
|
||||
* @param Param[] $currentClassMethodParams
|
||||
*/
|
||||
private function areArgsAndParamsEqual(array $parentStaticCallArgs, array $currentClassMethodParams) : bool
|
||||
{
|
||||
if (\count($parentStaticCallArgs) !== \count($currentClassMethodParams)) {
|
||||
return \false;
|
||||
}
|
||||
if ($parentStaticCallArgs === []) {
|
||||
return \true;
|
||||
}
|
||||
foreach ($parentStaticCallArgs as $key => $arg) {
|
||||
if (!isset($currentClassMethodParams[$key])) {
|
||||
return \false;
|
||||
}
|
||||
if (!$arg instanceof Arg) {
|
||||
continue;
|
||||
}
|
||||
// this only compares variable name, but those can be differnt, so its kinda useless
|
||||
$param = $currentClassMethodParams[$key];
|
||||
if (!$this->nodeComparator->areNodesEqual($param->var, $arg->value)) {
|
||||
return \false;
|
||||
}
|
||||
}
|
||||
return \true;
|
||||
}
|
||||
private function isParentClassMethodVisibilityOrDefaultOverride(ClassMethod $classMethod, StaticCall $staticCall, Scope $scope) : bool
|
||||
{
|
||||
$classReflection = $this->reflectionResolver->resolveClassReflection($classMethod);
|
||||
if (!$classReflection instanceof ClassReflection) {
|
||||
return \false;
|
||||
}
|
||||
$methodName = $this->nodeNameResolver->getName($staticCall->name);
|
||||
if ($methodName === null) {
|
||||
return \false;
|
||||
}
|
||||
foreach ($classReflection->getParents() as $parentClassReflection) {
|
||||
if (!$parentClassReflection->hasMethod($methodName)) {
|
||||
continue;
|
||||
}
|
||||
$nativeParentClassReflection = $parentClassReflection->getNativeReflection();
|
||||
$nativeParentClassMethodReflection = $nativeParentClassReflection->getMethod($methodName);
|
||||
if (!$nativeParentClassMethodReflection->isProtected()) {
|
||||
return $this->isOverridingParentParameters($classMethod, $parentClassReflection, $methodName, $scope);
|
||||
}
|
||||
if (!$nativeParentClassMethodReflection->isPublic()) {
|
||||
return $this->isOverridingParentParameters($classMethod, $parentClassReflection, $methodName, $scope);
|
||||
}
|
||||
return \true;
|
||||
}
|
||||
return \false;
|
||||
}
|
||||
private function isOverridingParentParameters(ClassMethod $classMethod, ClassReflection $classReflection, string $methodName, Scope $scope) : bool
|
||||
{
|
||||
$extendedMethodReflection = $classReflection->getMethod($methodName, $scope);
|
||||
// 3rd party code
|
||||
if (!$extendedMethodReflection->isPrivate() && !$extendedMethodReflection->isPublic() && $classMethod->isPublic()) {
|
||||
return \true;
|
||||
}
|
||||
if ($extendedMethodReflection->isInternal()->yes()) {
|
||||
// we can't know for certain so we assume its a override with purpose
|
||||
return \true;
|
||||
}
|
||||
return $this->areParameterDefaultsDifferent($classMethod, $extendedMethodReflection);
|
||||
}
|
||||
private function areParameterDefaultsDifferent(ClassMethod $classMethod, ExtendedMethodReflection $extendedMethodReflection) : bool
|
||||
{
|
||||
$parametersAcceptorWithPhpDocs = ParametersAcceptorSelector::selectSingle($extendedMethodReflection->getVariants());
|
||||
foreach ($parametersAcceptorWithPhpDocs->getParameters() as $key => $parameterReflectionWithPhpDoc) {
|
||||
if (!isset($classMethod->params[$key])) {
|
||||
if ($parameterReflectionWithPhpDoc->getDefaultValue() instanceof Type) {
|
||||
continue;
|
||||
}
|
||||
return \true;
|
||||
}
|
||||
$methodParam = $classMethod->params[$key];
|
||||
if ($this->parameterDefaultsComparator->areDefaultValuesDifferent($parameterReflectionWithPhpDoc, $methodParam)) {
|
||||
return \true;
|
||||
}
|
||||
}
|
||||
return \false;
|
||||
}
|
||||
}
|
@ -1,52 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\DeadCode\Comparator\Parameter;
|
||||
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Param;
|
||||
use PHPStan\Reflection\ParameterReflection;
|
||||
use PHPStan\Type\Type;
|
||||
use Rector\Core\PhpParser\Comparing\NodeComparator;
|
||||
use Rector\DowngradePhp80\Reflection\DefaultParameterValueResolver;
|
||||
final class ParameterDefaultsComparator
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Core\PhpParser\Comparing\NodeComparator
|
||||
*/
|
||||
private $nodeComparator;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\DowngradePhp80\Reflection\DefaultParameterValueResolver
|
||||
*/
|
||||
private $defaultParameterValueResolver;
|
||||
public function __construct(NodeComparator $nodeComparator, DefaultParameterValueResolver $defaultParameterValueResolver)
|
||||
{
|
||||
$this->nodeComparator = $nodeComparator;
|
||||
$this->defaultParameterValueResolver = $defaultParameterValueResolver;
|
||||
}
|
||||
public function areDefaultValuesDifferent(ParameterReflection $parameterReflection, Param $param) : bool
|
||||
{
|
||||
if (!$parameterReflection->getDefaultValue() instanceof Type && !$param->default instanceof Expr) {
|
||||
return \false;
|
||||
}
|
||||
if ($this->isMutuallyExclusiveNull($parameterReflection, $param)) {
|
||||
return \true;
|
||||
}
|
||||
/** @var Expr $paramDefault */
|
||||
$paramDefault = $param->default;
|
||||
$defaultValueExpr = $this->defaultParameterValueResolver->resolveFromParameterReflection($parameterReflection);
|
||||
return !$this->nodeComparator->areNodesEqual($paramDefault, $defaultValueExpr);
|
||||
}
|
||||
private function isMutuallyExclusiveNull(ParameterReflection $parameterReflection, Param $param) : bool
|
||||
{
|
||||
if (!$parameterReflection->getDefaultValue() instanceof Type && $param->default instanceof Expr) {
|
||||
return \true;
|
||||
}
|
||||
if (!$parameterReflection->getDefaultValue() instanceof Type) {
|
||||
return \false;
|
||||
}
|
||||
return !$param->default instanceof Expr;
|
||||
}
|
||||
}
|
@ -1,36 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\DeadCode\Comparator\Parameter;
|
||||
|
||||
use PhpParser\Node\Expr\StaticCall;
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PHPStan\Analyser\Scope;
|
||||
use Rector\NodeTypeResolver\MethodParameterTypeResolver;
|
||||
final class ParameterTypeComparator
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\NodeTypeResolver\MethodParameterTypeResolver
|
||||
*/
|
||||
private $methodParameterTypeResolver;
|
||||
public function __construct(MethodParameterTypeResolver $methodParameterTypeResolver)
|
||||
{
|
||||
$this->methodParameterTypeResolver = $methodParameterTypeResolver;
|
||||
}
|
||||
public function isClassMethodIdenticalToParentStaticCall(ClassMethod $classMethod, StaticCall $staticCall, Scope $scope) : bool
|
||||
{
|
||||
$currentParameterTypes = $this->methodParameterTypeResolver->provideParameterTypesByClassMethod($classMethod, $scope);
|
||||
$parentParameterTypes = $this->methodParameterTypeResolver->provideParameterTypesByStaticCall($staticCall, $scope);
|
||||
foreach ($currentParameterTypes as $key => $currentParameterType) {
|
||||
if (!isset($parentParameterTypes[$key])) {
|
||||
continue;
|
||||
}
|
||||
$parentParameterType = $parentParameterTypes[$key];
|
||||
if (!$currentParameterType->equals($parentParameterType)) {
|
||||
return \false;
|
||||
}
|
||||
}
|
||||
return \true;
|
||||
}
|
||||
}
|
@ -1,170 +0,0 @@
|
||||
<?php
|
||||
|
||||
declare (strict_types=1);
|
||||
namespace Rector\DeadCode\Rector\ClassMethod;
|
||||
|
||||
use PhpParser\Node;
|
||||
use PhpParser\Node\Expr;
|
||||
use PhpParser\Node\Expr\StaticCall;
|
||||
use PhpParser\Node\Name;
|
||||
use PhpParser\Node\Stmt;
|
||||
use PhpParser\Node\Stmt\Class_;
|
||||
use PhpParser\Node\Stmt\ClassMethod;
|
||||
use PhpParser\Node\Stmt\Expression;
|
||||
use PhpParser\Node\Stmt\Return_;
|
||||
use PHPStan\Analyser\Scope;
|
||||
use Rector\Core\Rector\AbstractScopeAwareRector;
|
||||
use Rector\DeadCode\Comparator\CurrentAndParentClassMethodComparator;
|
||||
use Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer;
|
||||
use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
|
||||
use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
|
||||
/**
|
||||
* @see \Rector\Tests\DeadCode\Rector\ClassMethod\RemoveDelegatingParentCallRector\RemoveDelegatingParentCallRectorTest
|
||||
*/
|
||||
final class RemoveDelegatingParentCallRector extends AbstractScopeAwareRector
|
||||
{
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\DeadCode\Comparator\CurrentAndParentClassMethodComparator
|
||||
*/
|
||||
private $currentAndParentClassMethodComparator;
|
||||
/**
|
||||
* @readonly
|
||||
* @var \Rector\Php80\NodeAnalyzer\PhpAttributeAnalyzer
|
||||
*/
|
||||
private $phpAttributeAnalyzer;
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
private const ALLOWED_ANNOTATIONS = ['Route', 'required'];
|
||||
/**
|
||||
* @var string[]
|
||||
*/
|
||||
private const ALLOWED_ATTRIBUTES = ['Symfony\\Component\\Routing\\Annotation\\Route', 'Symfony\\Contracts\\Service\\Attribute\\Required'];
|
||||
public function __construct(CurrentAndParentClassMethodComparator $currentAndParentClassMethodComparator, PhpAttributeAnalyzer $phpAttributeAnalyzer)
|
||||
{
|
||||
$this->currentAndParentClassMethodComparator = $currentAndParentClassMethodComparator;
|
||||
$this->phpAttributeAnalyzer = $phpAttributeAnalyzer;
|
||||
}
|
||||
public function getRuleDefinition() : RuleDefinition
|
||||
{
|
||||
return new RuleDefinition('Removed dead parent call, that does not change anything', [new CodeSample(<<<'CODE_SAMPLE'
|
||||
class SomeClass
|
||||
{
|
||||
public function prettyPrint(array $stmts): string
|
||||
{
|
||||
return parent::prettyPrint($stmts);
|
||||
}
|
||||
}
|
||||
CODE_SAMPLE
|
||||
, <<<'CODE_SAMPLE'
|
||||
class SomeClass
|
||||
{
|
||||
}
|
||||
CODE_SAMPLE
|
||||
)]);
|
||||
}
|
||||
/**
|
||||
* @return array<class-string<Node>>
|
||||
*/
|
||||
public function getNodeTypes() : array
|
||||
{
|
||||
return [Class_::class];
|
||||
}
|
||||
/**
|
||||
* @param Class_ $node
|
||||
*/
|
||||
public function refactorWithScope(Node $node, Scope $scope) : ?Node
|
||||
{
|
||||
if ($this->shouldSkipClass($node)) {
|
||||
return null;
|
||||
}
|
||||
$hasChanged = \false;
|
||||
foreach ($node->stmts as $key => $stmt) {
|
||||
if (!$stmt instanceof ClassMethod) {
|
||||
continue;
|
||||
}
|
||||
$onlyStmt = $this->matchClassMethodOnlyStmt($stmt);
|
||||
if ($onlyStmt === null) {
|
||||
continue;
|
||||
}
|
||||
// are both return?
|
||||
if ($this->isMethodReturnType($stmt, 'void') && !$onlyStmt instanceof Return_) {
|
||||
continue;
|
||||
}
|
||||
$staticCall = $this->matchStaticCall($onlyStmt);
|
||||
if (!$staticCall instanceof StaticCall) {
|
||||
continue;
|
||||
}
|
||||
if (!$this->currentAndParentClassMethodComparator->isParentCallMatching($stmt, $staticCall, $scope)) {
|
||||
continue;
|
||||
}
|
||||
if ($this->shouldSkipWithAnnotationsOrAttributes($stmt)) {
|
||||
continue;
|
||||
}
|
||||
// the method is just delegation, nothing extra → remove it
|
||||
unset($node->stmts[$key]);
|
||||
$hasChanged = \true;
|
||||
}
|
||||
if ($hasChanged) {
|
||||
return $node;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
private function shouldSkipClass(Class_ $class) : bool
|
||||
{
|
||||
return !$class->extends instanceof Name;
|
||||
}
|
||||
private function isMethodReturnType(ClassMethod $classMethod, string $type) : bool
|
||||
{
|
||||
if ($classMethod->returnType === null) {
|
||||
return \false;
|
||||
}
|
||||
return $this->isName($classMethod->returnType, $type);
|
||||
}
|
||||
/**
|
||||
* @param \PhpParser\Node\Expr|\PhpParser\Node\Stmt $node
|
||||
*/
|
||||
private function matchStaticCall($node) : ?StaticCall
|
||||
{
|
||||
// must be static call
|
||||
if ($node instanceof Return_) {
|
||||
if ($node->expr instanceof StaticCall) {
|
||||
return $node->expr;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
if ($node instanceof StaticCall) {
|
||||
return $node;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
private function shouldSkipWithAnnotationsOrAttributes(ClassMethod $classMethod) : bool
|
||||
{
|
||||
$phpDocInfo = $this->phpDocInfoFactory->createFromNodeOrEmpty($classMethod);
|
||||
if ($phpDocInfo->hasByNames(self::ALLOWED_ANNOTATIONS)) {
|
||||
return \true;
|
||||
}
|
||||
return $this->phpAttributeAnalyzer->hasPhpAttributes($classMethod, self::ALLOWED_ATTRIBUTES);
|
||||
}
|
||||
/**
|
||||
* @return null|\PhpParser\Node\Stmt|\PhpParser\Node\Expr
|
||||
*/
|
||||
private function matchClassMethodOnlyStmt(ClassMethod $classMethod)
|
||||
{
|
||||
$classMethodStmts = $classMethod->stmts;
|
||||
if ($classMethodStmts === null) {
|
||||
return null;
|
||||
}
|
||||
if (\count($classMethodStmts) !== 1) {
|
||||
return null;
|
||||
}
|
||||
// recount empty notes
|
||||
$stmtsValues = \array_values($classMethodStmts);
|
||||
$stmtValue = $stmtsValues[0];
|
||||
if ($stmtValue instanceof Expression) {
|
||||
return $stmtValue->expr;
|
||||
}
|
||||
return $stmtValue;
|
||||
}
|
||||
}
|
@ -19,12 +19,12 @@ final class VersionResolver
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const PACKAGE_VERSION = 'e5e33ebc3be86879d802690ee851bcc923a5e5f6';
|
||||
public const PACKAGE_VERSION = '8fe22e43b593963c405fac48c5d093e1575afd49';
|
||||
/**
|
||||
* @api
|
||||
* @var string
|
||||
*/
|
||||
public const RELEASE_DATE = '2023-06-09 16:32:53';
|
||||
public const RELEASE_DATE = '2023-06-09 16:37:36';
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
|
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 ComposerAutoloaderInitac7d8fb677a63fa82d05400cd485ba11::getLoader();
|
||||
return ComposerAutoloaderInit51c321187b76c9986a7613d6daf92167::getLoader();
|
||||
|
5
vendor/composer/autoload_classmap.php
vendored
5
vendor/composer/autoload_classmap.php
vendored
@ -1678,9 +1678,6 @@ return array(
|
||||
'Rector\\Core\\ValueObject\\Reporting\\FileDiff' => $baseDir . '/src/ValueObject/Reporting/FileDiff.php',
|
||||
'Rector\\Core\\ValueObject\\SprintfStringAndArgs' => $baseDir . '/src/ValueObject/SprintfStringAndArgs.php',
|
||||
'Rector\\Core\\ValueObject\\Visibility' => $baseDir . '/src/ValueObject/Visibility.php',
|
||||
'Rector\\DeadCode\\Comparator\\CurrentAndParentClassMethodComparator' => $baseDir . '/rules/DeadCode/Comparator/CurrentAndParentClassMethodComparator.php',
|
||||
'Rector\\DeadCode\\Comparator\\Parameter\\ParameterDefaultsComparator' => $baseDir . '/rules/DeadCode/Comparator/Parameter/ParameterDefaultsComparator.php',
|
||||
'Rector\\DeadCode\\Comparator\\Parameter\\ParameterTypeComparator' => $baseDir . '/rules/DeadCode/Comparator/Parameter/ParameterTypeComparator.php',
|
||||
'Rector\\DeadCode\\ConditionEvaluator' => $baseDir . '/rules/DeadCode/ConditionEvaluator.php',
|
||||
'Rector\\DeadCode\\ConditionResolver' => $baseDir . '/rules/DeadCode/ConditionResolver.php',
|
||||
'Rector\\DeadCode\\Contract\\ConditionInterface' => $baseDir . '/rules/DeadCode/Contract/ConditionInterface.php',
|
||||
@ -1710,7 +1707,6 @@ return array(
|
||||
'Rector\\DeadCode\\Rector\\Cast\\RecastingRemovalRector' => $baseDir . '/rules/DeadCode/Rector/Cast/RecastingRemovalRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassConst\\RemoveUnusedPrivateClassConstantRector' => $baseDir . '/rules/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassLike\\RemoveAnnotationRector' => $baseDir . '/rules/DeadCode/Rector/ClassLike/RemoveAnnotationRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveDelegatingParentCallRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveEmptyClassMethodRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedConstructorParamRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedPrivateMethodParameterRector' => $baseDir . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php',
|
||||
@ -2041,7 +2037,6 @@ return array(
|
||||
'Rector\\NodeTypeResolver\\DependencyInjection\\BleedingEdgeIncludePurifier' => $baseDir . '/packages/NodeTypeResolver/DependencyInjection/BleedingEdgeIncludePurifier.php',
|
||||
'Rector\\NodeTypeResolver\\DependencyInjection\\PHPStanExtensionsConfigResolver' => $baseDir . '/packages/NodeTypeResolver/DependencyInjection/PHPStanExtensionsConfigResolver.php',
|
||||
'Rector\\NodeTypeResolver\\DependencyInjection\\PHPStanServicesFactory' => $baseDir . '/packages/NodeTypeResolver/DependencyInjection/PHPStanServicesFactory.php',
|
||||
'Rector\\NodeTypeResolver\\MethodParameterTypeResolver' => $baseDir . '/packages/NodeTypeResolver/MethodParameterTypeResolver.php',
|
||||
'Rector\\NodeTypeResolver\\NodeScopeAndMetadataDecorator' => $baseDir . '/packages/NodeTypeResolver/NodeScopeAndMetadataDecorator.php',
|
||||
'Rector\\NodeTypeResolver\\NodeTypeCorrector\\AccessoryNonEmptyStringTypeCorrector' => $baseDir . '/packages/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php',
|
||||
'Rector\\NodeTypeResolver\\NodeTypeCorrector\\GenericClassStringTypeCorrector' => $baseDir . '/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.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 ComposerAutoloaderInitac7d8fb677a63fa82d05400cd485ba11
|
||||
class ComposerAutoloaderInit51c321187b76c9986a7613d6daf92167
|
||||
{
|
||||
private static $loader;
|
||||
|
||||
@ -22,17 +22,17 @@ class ComposerAutoloaderInitac7d8fb677a63fa82d05400cd485ba11
|
||||
return self::$loader;
|
||||
}
|
||||
|
||||
spl_autoload_register(array('ComposerAutoloaderInitac7d8fb677a63fa82d05400cd485ba11', 'loadClassLoader'), true, true);
|
||||
spl_autoload_register(array('ComposerAutoloaderInit51c321187b76c9986a7613d6daf92167', 'loadClassLoader'), true, true);
|
||||
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInitac7d8fb677a63fa82d05400cd485ba11', 'loadClassLoader'));
|
||||
spl_autoload_unregister(array('ComposerAutoloaderInit51c321187b76c9986a7613d6daf92167', 'loadClassLoader'));
|
||||
|
||||
require __DIR__ . '/autoload_static.php';
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInitac7d8fb677a63fa82d05400cd485ba11::getInitializer($loader));
|
||||
call_user_func(\Composer\Autoload\ComposerStaticInit51c321187b76c9986a7613d6daf92167::getInitializer($loader));
|
||||
|
||||
$loader->setClassMapAuthoritative(true);
|
||||
$loader->register(true);
|
||||
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInitac7d8fb677a63fa82d05400cd485ba11::$files;
|
||||
$filesToLoad = \Composer\Autoload\ComposerStaticInit51c321187b76c9986a7613d6daf92167::$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 ComposerStaticInitac7d8fb677a63fa82d05400cd485ba11
|
||||
class ComposerStaticInit51c321187b76c9986a7613d6daf92167
|
||||
{
|
||||
public static $files = array (
|
||||
'ad155f8f1cf0d418fe49e248db8c661b' => __DIR__ . '/..' . '/react/promise/src/functions_include.php',
|
||||
@ -1929,9 +1929,6 @@ class ComposerStaticInitac7d8fb677a63fa82d05400cd485ba11
|
||||
'Rector\\Core\\ValueObject\\Reporting\\FileDiff' => __DIR__ . '/../..' . '/src/ValueObject/Reporting/FileDiff.php',
|
||||
'Rector\\Core\\ValueObject\\SprintfStringAndArgs' => __DIR__ . '/../..' . '/src/ValueObject/SprintfStringAndArgs.php',
|
||||
'Rector\\Core\\ValueObject\\Visibility' => __DIR__ . '/../..' . '/src/ValueObject/Visibility.php',
|
||||
'Rector\\DeadCode\\Comparator\\CurrentAndParentClassMethodComparator' => __DIR__ . '/../..' . '/rules/DeadCode/Comparator/CurrentAndParentClassMethodComparator.php',
|
||||
'Rector\\DeadCode\\Comparator\\Parameter\\ParameterDefaultsComparator' => __DIR__ . '/../..' . '/rules/DeadCode/Comparator/Parameter/ParameterDefaultsComparator.php',
|
||||
'Rector\\DeadCode\\Comparator\\Parameter\\ParameterTypeComparator' => __DIR__ . '/../..' . '/rules/DeadCode/Comparator/Parameter/ParameterTypeComparator.php',
|
||||
'Rector\\DeadCode\\ConditionEvaluator' => __DIR__ . '/../..' . '/rules/DeadCode/ConditionEvaluator.php',
|
||||
'Rector\\DeadCode\\ConditionResolver' => __DIR__ . '/../..' . '/rules/DeadCode/ConditionResolver.php',
|
||||
'Rector\\DeadCode\\Contract\\ConditionInterface' => __DIR__ . '/../..' . '/rules/DeadCode/Contract/ConditionInterface.php',
|
||||
@ -1961,7 +1958,6 @@ class ComposerStaticInitac7d8fb677a63fa82d05400cd485ba11
|
||||
'Rector\\DeadCode\\Rector\\Cast\\RecastingRemovalRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/Cast/RecastingRemovalRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassConst\\RemoveUnusedPrivateClassConstantRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassConst/RemoveUnusedPrivateClassConstantRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassLike\\RemoveAnnotationRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassLike/RemoveAnnotationRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveDelegatingParentCallRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveDelegatingParentCallRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveEmptyClassMethodRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveEmptyClassMethodRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedConstructorParamRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedConstructorParamRector.php',
|
||||
'Rector\\DeadCode\\Rector\\ClassMethod\\RemoveUnusedPrivateMethodParameterRector' => __DIR__ . '/../..' . '/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php',
|
||||
@ -2292,7 +2288,6 @@ class ComposerStaticInitac7d8fb677a63fa82d05400cd485ba11
|
||||
'Rector\\NodeTypeResolver\\DependencyInjection\\BleedingEdgeIncludePurifier' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/DependencyInjection/BleedingEdgeIncludePurifier.php',
|
||||
'Rector\\NodeTypeResolver\\DependencyInjection\\PHPStanExtensionsConfigResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/DependencyInjection/PHPStanExtensionsConfigResolver.php',
|
||||
'Rector\\NodeTypeResolver\\DependencyInjection\\PHPStanServicesFactory' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/DependencyInjection/PHPStanServicesFactory.php',
|
||||
'Rector\\NodeTypeResolver\\MethodParameterTypeResolver' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/MethodParameterTypeResolver.php',
|
||||
'Rector\\NodeTypeResolver\\NodeScopeAndMetadataDecorator' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeScopeAndMetadataDecorator.php',
|
||||
'Rector\\NodeTypeResolver\\NodeTypeCorrector\\AccessoryNonEmptyStringTypeCorrector' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeCorrector/AccessoryNonEmptyStringTypeCorrector.php',
|
||||
'Rector\\NodeTypeResolver\\NodeTypeCorrector\\GenericClassStringTypeCorrector' => __DIR__ . '/../..' . '/packages/NodeTypeResolver/NodeTypeCorrector/GenericClassStringTypeCorrector.php',
|
||||
@ -3133,9 +3128,9 @@ class ComposerStaticInitac7d8fb677a63fa82d05400cd485ba11
|
||||
public static function getInitializer(ClassLoader $loader)
|
||||
{
|
||||
return \Closure::bind(function () use ($loader) {
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInitac7d8fb677a63fa82d05400cd485ba11::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInitac7d8fb677a63fa82d05400cd485ba11::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInitac7d8fb677a63fa82d05400cd485ba11::$classMap;
|
||||
$loader->prefixLengthsPsr4 = ComposerStaticInit51c321187b76c9986a7613d6daf92167::$prefixLengthsPsr4;
|
||||
$loader->prefixDirsPsr4 = ComposerStaticInit51c321187b76c9986a7613d6daf92167::$prefixDirsPsr4;
|
||||
$loader->classMap = ComposerStaticInit51c321187b76c9986a7613d6daf92167::$classMap;
|
||||
|
||||
}, null, ClassLoader::class);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user