Skip to content

Commit da80fc7

Browse files
kamil-zacekkamil-zacek
committed
Introduce isDeprecated to CallableParametersAcceptor
1 parent 46b9819 commit da80fc7

14 files changed

+83
-1
lines changed

‎src/Analyser/MutatingScope.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1342,6 +1342,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
13421342
$cachedClosureData['invalidateExpressions'],
13431343
$cachedClosureData['usedVariables'],
13441344
TrinaryLogic::createYes(),
1345+
TrinaryLogic::createNo(),
13451346
);
13461347
}
13471348
if (self::$resolveClosureTypeDepth >= 2) {
@@ -1557,6 +1558,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
15571558
$invalidateExpressions,
15581559
$usedVariables,
15591560
TrinaryLogic::createYes(),
1561+
TrinaryLogic::createNo(),
15601562
);
15611563
} elseif ($node instanceof New_) {
15621564
if ($node->class instanceof Name) {
@@ -2552,6 +2554,7 @@ private function createFirstClassCallable(
25522554
[],
25532555
[],
25542556
$acceptsNamedArguments,
2557+
$variant->isDeprecated(),
25552558
);
25562559
}
25572560

‎src/Reflection/Callables/CallableParametersAcceptor.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ public function getThrowPoints(): array;
1919

2020
public function isPure(): TrinaryLogic;
2121

22+
public function isDeprecated(): TrinaryLogic;
23+
2224
public function acceptsNamedArguments(): TrinaryLogic;
2325

2426
/**

‎src/Reflection/Callables/FunctionCallableVariant.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@ public function isPure(): TrinaryLogic
135135
return $certainCount > 0 ? TrinaryLogic::createNo() : TrinaryLogic::createMaybe();
136136
}
137137

138+
public function isDeprecated(): TrinaryLogic
139+
{
140+
return $this->function->isDeprecated();
141+
}
142+
138143
public function getImpurePoints(): array
139144
{
140145
if ($this->impurePoints !== null) {

‎src/Reflection/ExtendedCallableFunctionVariant.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ public function __construct(
3232
?TemplateTypeVarianceMap $callSiteVarianceMap,
3333
private array $throwPoints,
3434
private TrinaryLogic $isPure,
35+
private TrinaryLogic $isDeprecated,
3536
private array $impurePoints,
3637
private array $invalidateExpressions,
3738
private array $usedVariables,
@@ -60,6 +61,11 @@ public function isPure(): TrinaryLogic
6061
return $this->isPure;
6162
}
6263

64+
public function isDeprecated(): TrinaryLogic
65+
{
66+
return $this->isDeprecated;
67+
}
68+
6369
public function getImpurePoints(): array
6470
{
6571
return $this->impurePoints;

‎src/Reflection/GenericParametersAcceptorResolver.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public static function resolve(array $argTypes, ParametersAcceptor $parametersAc
123123
$result,
124124
$originalParametersAcceptor->getThrowPoints(),
125125
$originalParametersAcceptor->isPure(),
126+
$originalParametersAcceptor->isDeprecated(),
126127
$originalParametersAcceptor->getImpurePoints(),
127128
$originalParametersAcceptor->getInvalidateExpressions(),
128129
$originalParametersAcceptor->getUsedVariables(),

‎src/Reflection/InaccessibleMethod.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ public function isPure(): TrinaryLogic
6262
return TrinaryLogic::createMaybe();
6363
}
6464

65+
public function isDeprecated(): TrinaryLogic
66+
{
67+
return $this->methodReflection->isDeprecated();
68+
}
69+
6570
public function getImpurePoints(): array
6671
{
6772
return [

‎src/Reflection/ParametersAcceptorSelector.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,7 @@ public static function combineAcceptors(array $acceptors): ExtendedParametersAcc
611611
$callableOccurred = false;
612612
$throwPoints = [];
613613
$isPure = TrinaryLogic::createNo();
614+
$isDeprecated = TrinaryLogic::createNo();
614615
$impurePoints = [];
615616
$invalidateExpressions = [];
616617
$usedVariables = [];
@@ -627,6 +628,7 @@ public static function combineAcceptors(array $acceptors): ExtendedParametersAcc
627628
$callableOccurred = true;
628629
$throwPoints = array_merge($throwPoints, $acceptor->getThrowPoints());
629630
$isPure = $isPure->or($acceptor->isPure());
631+
$isDeprecated = $isDeprecated->or($acceptor->isDeprecated());
630632
$impurePoints = array_merge($impurePoints, $acceptor->getImpurePoints());
631633
$invalidateExpressions = array_merge($invalidateExpressions, $acceptor->getInvalidateExpressions());
632634
$usedVariables = array_merge($usedVariables, $acceptor->getUsedVariables());
@@ -729,6 +731,7 @@ public static function combineAcceptors(array $acceptors): ExtendedParametersAcc
729731
null,
730732
$throwPoints,
731733
$isPure,
734+
$isDeprecated,
732735
$impurePoints,
733736
$invalidateExpressions,
734737
$usedVariables,
@@ -765,6 +768,7 @@ private static function wrapAcceptor(ParametersAcceptor $acceptor): ExtendedPara
765768
TemplateTypeVarianceMap::createEmpty(),
766769
$acceptor->getThrowPoints(),
767770
$acceptor->isPure(),
771+
$acceptor->isDeprecated(),
768772
$acceptor->getImpurePoints(),
769773
$acceptor->getInvalidateExpressions(),
770774
$acceptor->getUsedVariables(),

‎src/Reflection/ResolvedFunctionVariantWithCallable.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public function __construct(
2424
private ResolvedFunctionVariant $parametersAcceptor,
2525
private array $throwPoints,
2626
private TrinaryLogic $isPure,
27+
private TrinaryLogic $isDeprecated,
2728
private array $impurePoints,
2829
private array $invalidateExpressions,
2930
private array $usedVariables,
@@ -97,6 +98,11 @@ public function isPure(): TrinaryLogic
9798
return $this->isPure;
9899
}
99100

101+
public function isDeprecated(): TrinaryLogic
102+
{
103+
return $this->isDeprecated;
104+
}
105+
100106
public function getImpurePoints(): array
101107
{
102108
return $this->impurePoints;

‎src/Reflection/TrivialParametersAcceptor.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ public function isPure(): TrinaryLogic
7272
return TrinaryLogic::createMaybe();
7373
}
7474

75+
public function isDeprecated(): TrinaryLogic
76+
{
77+
return TrinaryLogic::createNo();
78+
}
79+
7580
public function getImpurePoints(): array
7681
{
7782
return [

‎src/Rules/RuleLevelHelper.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ private function transformAcceptedType(Type $acceptingType, Type $acceptedType):
9191
$acceptedType->getResolvedTemplateTypeMap(),
9292
$acceptedType->getTemplateTags(),
9393
$acceptedType->isPure(),
94+
$acceptedType->isDeprecated(),
9495
);
9596
}
9697

@@ -112,6 +113,7 @@ private function transformAcceptedType(Type $acceptingType, Type $acceptedType):
112113
$acceptedType->getInvalidateExpressions(),
113114
$acceptedType->getUsedVariables(),
114115
$acceptedType->acceptsNamedArguments(),
116+
$acceptedType->isDeprecated(),
115117
);
116118
}
117119

‎src/Type/CallableType.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ class CallableType implements CompoundType, CallableParametersAcceptor
6565

6666
private TrinaryLogic $isPure;
6767

68+
private TrinaryLogic $isDeprecated;
69+
6870
/**
6971
* @api
7072
* @param list<ParameterReflection>|null $parameters
@@ -78,6 +80,7 @@ public function __construct(
7880
?TemplateTypeMap $resolvedTemplateTypeMap = null,
7981
private array $templateTags = [],
8082
?TrinaryLogic $isPure = null,
83+
?TrinaryLogic $isDeprecated = null,
8184
)
8285
{
8386
$this->parameters = $parameters ?? [];
@@ -86,6 +89,7 @@ public function __construct(
8689
$this->templateTypeMap = $templateTypeMap ?? TemplateTypeMap::createEmpty();
8790
$this->resolvedTemplateTypeMap = $resolvedTemplateTypeMap ?? TemplateTypeMap::createEmpty();
8891
$this->isPure = $isPure ?? TrinaryLogic::createMaybe();
92+
$this->isDeprecated = $isDeprecated ?? TrinaryLogic::createNo();
8993
}
9094

9195
/**
@@ -101,6 +105,14 @@ public function isPure(): TrinaryLogic
101105
return $this->isPure;
102106
}
103107

108+
public function isDeprecated(): TrinaryLogic
109+
{
110+
return $this->isDeprecated;
111+
}
112+
113+
/**
114+
* @return list<string>
115+
*/
104116
public function getReferencedClasses(): array
105117
{
106118
$classes = [];
@@ -231,6 +243,7 @@ function (): string {
231243
$this->resolvedTemplateTypeMap,
232244
$this->templateTags,
233245
$this->isPure,
246+
$this->isDeprecated,
234247
);
235248

236249
return $printer->print($selfWithoutParameterNames->toPhpDocNode());
@@ -445,6 +458,7 @@ public function traverse(callable $cb): Type
445458
$this->resolvedTemplateTypeMap,
446459
$this->templateTags,
447460
$this->isPure,
461+
$this->isDeprecated,
448462
);
449463
}
450464

@@ -495,6 +509,7 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
495509
$this->resolvedTemplateTypeMap,
496510
$this->templateTags,
497511
$this->isPure,
512+
$this->isDeprecated,
498513
);
499514
}
500515

‎src/Type/ClosureType.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ class ClosureType implements TypeWithClassName, CallableParametersAcceptor
7979

8080
private TrinaryLogic $acceptsNamedArguments;
8181

82+
private TrinaryLogic $isDeprecated;
83+
8284
/**
8385
* @api
8486
* @param list<ParameterReflection>|null $parameters
@@ -101,6 +103,7 @@ public function __construct(
101103
private array $invalidateExpressions = [],
102104
private array $usedVariables = [],
103105
?TrinaryLogic $acceptsNamedArguments = null,
106+
?TrinaryLogic $isDeprecated = null,
104107
)
105108
{
106109
if ($acceptsNamedArguments === null) {
@@ -116,6 +119,7 @@ public function __construct(
116119
$this->resolvedTemplateTypeMap = $resolvedTemplateTypeMap ?? TemplateTypeMap::createEmpty();
117120
$this->callSiteVarianceMap = $callSiteVarianceMap ?? TemplateTypeVarianceMap::createEmpty();
118121
$this->impurePoints = $impurePoints ?? [new SimpleImpurePoint('functionCall', 'call to an unknown Closure', false)];
122+
$this->isDeprecated = $isDeprecated ?? TrinaryLogic::createNo();
119123
}
120124

121125
/**
@@ -150,6 +154,11 @@ public function isPure(): TrinaryLogic
150154
return $certainCount > 0 ? TrinaryLogic::createNo() : TrinaryLogic::createMaybe();
151155
}
152156

157+
public function isDeprecated(): TrinaryLogic
158+
{
159+
return $this->isDeprecated;
160+
}
161+
153162
public function getClassName(): string
154163
{
155164
return $this->objectType->getClassName();
@@ -262,6 +271,7 @@ function (): string {
262271
$this->impurePoints,
263272
$this->invalidateExpressions,
264273
$this->usedVariables,
274+
$this->isDeprecated,
265275
);
266276

267277
return $printer->print($selfWithoutParameterNames->toPhpDocNode());
@@ -584,6 +594,7 @@ public function traverse(callable $cb): Type
584594
$this->invalidateExpressions,
585595
$this->usedVariables,
586596
$this->acceptsNamedArguments,
597+
$this->isDeprecated,
587598
);
588599
}
589600

@@ -634,6 +645,7 @@ public function traverseSimultaneously(Type $right, callable $cb): Type
634645
$this->invalidateExpressions,
635646
$this->usedVariables,
636647
$this->acceptsNamedArguments,
648+
$this->isDeprecated,
637649
);
638650
}
639651

‎src/Type/ClosureTypeFactory.php

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use PHPStan\Reflection\ParameterReflection;
1919
use PHPStan\Reflection\PassedByReference;
2020
use PHPStan\ShouldNotHappenException;
21+
use PHPStan\TrinaryLogic;
2122
use ReflectionFunction;
2223
use function array_map;
2324
use function count;
@@ -113,7 +114,21 @@ public function getDefaultValue(): ?Type
113114

114115
}, $betterReflectionFunction->getParameters());
115116

116-
return new ClosureType($parameters, TypehintHelper::decideTypeFromReflection(ReflectionType::fromTypeOrNull($betterReflectionFunction->getReturnType())), $betterReflectionFunction->isVariadic());
117+
return new ClosureType(
118+
$parameters,
119+
TypehintHelper::decideTypeFromReflection(ReflectionType::fromTypeOrNull($betterReflectionFunction->getReturnType())),
120+
$betterReflectionFunction->isVariadic(),
121+
null,
122+
null,
123+
null,
124+
[],
125+
[],
126+
null,
127+
[],
128+
[],
129+
null,
130+
TrinaryLogic::createFromBoolean($betterReflectionFunction->isDeprecated()),
131+
);
117132
}
118133

119134
}

‎src/Type/Php/ClosureFromCallableDynamicReturnTypeExtension.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
5454
$variant->getInvalidateExpressions(),
5555
$variant->getUsedVariables(),
5656
$variant->acceptsNamedArguments(),
57+
$variant->isDeprecated(),
5758
);
5859
}
5960

0 commit comments

Comments
 (0)