Skip to content

Commit ac91552

Browse files
VincentLangletondrejmirtes
VincentLanglet
and
ondrejmirtes
authored
Add PhpVersion parameter to various Type methods
Co-authored-by: Ondřej Mirtes <ondrej@mirtes.cz>
1 parent c3cad7d commit ac91552

23 files changed

+155
-136
lines changed

‎UPGRADING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,3 +178,5 @@ As a replacement you can implement [`PHPStan\Type\ExpressionTypeResolverExtensio
178178
* Parameter `$callableParameters` of [`MutatingScope::enterAnonymousFunction()`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.MutatingScope.html#_enterAnonymousFunction) and [`enterArrowFunction()`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.MutatingScope.html#_enterArrowFunction) made required
179179
* Parameter `StatementContext $context` of [`NodeScopeResolver::processStmtNodes()`](https://apiref.phpstan.org/2.0.x/PHPStan.Analyser.NodeScopeResolver.html#_processStmtNodes) made required
180180
* ClassPropertiesNode - remove `$extensions` parameter from [`getUninitializedProperties()`](https://apiref.phpstan.org/2.0.x/PHPStan.Node.ClassPropertiesNode.html#_getUninitializedProperties)
181+
* `Type::getSmallerType()`, `Type::getSmallerOrEqualType()`, `Type::getGreaterType()`, `Type::getGreaterOrEqualType()`, `Type::isSmallerThan()`, `Type::isSmallerThanOrEqual()` now require [`PhpVersion`](https://apiref.phpstan.org/2.0.x/PHPStan.Php.PhpVersion.html) as argument.
182+
* `CompoundType::isGreaterThan()`, `CompoundType::isGreaterThanOrEqual()` now require [`PhpVersion`](https://apiref.phpstan.org/2.0.x/PHPStan.Php.PhpVersion.html) as argument.

‎src/Analyser/MutatingScope.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -747,19 +747,19 @@ private function resolveType(string $exprString, Expr $node): Type
747747
}
748748

749749
if ($node instanceof Expr\BinaryOp\Smaller) {
750-
return $this->getType($node->left)->isSmallerThan($this->getType($node->right))->toBooleanType();
750+
return $this->getType($node->left)->isSmallerThan($this->getType($node->right), $this->phpVersion)->toBooleanType();
751751
}
752752

753753
if ($node instanceof Expr\BinaryOp\SmallerOrEqual) {
754-
return $this->getType($node->left)->isSmallerThanOrEqual($this->getType($node->right))->toBooleanType();
754+
return $this->getType($node->left)->isSmallerThanOrEqual($this->getType($node->right), $this->phpVersion)->toBooleanType();
755755
}
756756

757757
if ($node instanceof Expr\BinaryOp\Greater) {
758-
return $this->getType($node->right)->isSmallerThan($this->getType($node->left))->toBooleanType();
758+
return $this->getType($node->right)->isSmallerThan($this->getType($node->left), $this->phpVersion)->toBooleanType();
759759
}
760760

761761
if ($node instanceof Expr\BinaryOp\GreaterOrEqual) {
762-
return $this->getType($node->right)->isSmallerThanOrEqual($this->getType($node->left))->toBooleanType();
762+
return $this->getType($node->right)->isSmallerThanOrEqual($this->getType($node->left), $this->phpVersion)->toBooleanType();
763763
}
764764

765765
if ($node instanceof Expr\BinaryOp\Equal) {

‎src/Analyser/TypeSpecifier.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
use PHPStan\Node\Expr\AlwaysRememberedExpr;
2323
use PHPStan\Node\IssetExpr;
2424
use PHPStan\Node\Printer\ExprPrinter;
25+
use PHPStan\Php\PhpVersion;
2526
use PHPStan\Reflection\Assertions;
2627
use PHPStan\Reflection\ParametersAcceptor;
2728
use PHPStan\Reflection\ParametersAcceptorSelector;
@@ -100,6 +101,7 @@ final class TypeSpecifier
100101
public function __construct(
101102
private ExprPrinter $exprPrinter,
102103
private ReflectionProvider $reflectionProvider,
104+
private PhpVersion $phpVersion,
103105
private array $functionTypeSpecifyingExtensions,
104106
private array $methodTypeSpecifyingExtensions,
105107
private array $staticMethodTypeSpecifyingExtensions,
@@ -406,7 +408,7 @@ public function specifyTypesInCondition(
406408
$result = $result->unionWith(
407409
$this->create(
408410
$expr->left,
409-
$orEqual ? $rightType->getSmallerOrEqualType() : $rightType->getSmallerType(),
411+
$orEqual ? $rightType->getSmallerOrEqualType($this->phpVersion) : $rightType->getSmallerType($this->phpVersion),
410412
TypeSpecifierContext::createTruthy(),
411413
$scope,
412414
)->setRootExpr($expr),
@@ -416,7 +418,7 @@ public function specifyTypesInCondition(
416418
$result = $result->unionWith(
417419
$this->create(
418420
$expr->right,
419-
$orEqual ? $leftType->getGreaterOrEqualType() : $leftType->getGreaterType(),
421+
$orEqual ? $leftType->getGreaterOrEqualType($this->phpVersion) : $leftType->getGreaterType($this->phpVersion),
420422
TypeSpecifierContext::createTruthy(),
421423
$scope,
422424
)->setRootExpr($expr),
@@ -427,7 +429,7 @@ public function specifyTypesInCondition(
427429
$result = $result->unionWith(
428430
$this->create(
429431
$expr->left,
430-
$orEqual ? $rightType->getGreaterType() : $rightType->getGreaterOrEqualType(),
432+
$orEqual ? $rightType->getGreaterType($this->phpVersion) : $rightType->getGreaterOrEqualType($this->phpVersion),
431433
TypeSpecifierContext::createTruthy(),
432434
$scope,
433435
)->setRootExpr($expr),
@@ -437,7 +439,7 @@ public function specifyTypesInCondition(
437439
$result = $result->unionWith(
438440
$this->create(
439441
$expr->right,
440-
$orEqual ? $leftType->getSmallerType() : $leftType->getSmallerOrEqualType(),
442+
$orEqual ? $leftType->getSmallerType($this->phpVersion) : $leftType->getSmallerOrEqualType($this->phpVersion),
441443
TypeSpecifierContext::createTruthy(),
442444
$scope,
443445
)->setRootExpr($expr),

‎src/Analyser/TypeSpecifierFactory.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PHPStan\Broker\BrokerFactory;
66
use PHPStan\DependencyInjection\Container;
77
use PHPStan\Node\Printer\ExprPrinter;
8+
use PHPStan\Php\PhpVersion;
89
use PHPStan\Reflection\ReflectionProvider;
910
use function array_merge;
1011

@@ -24,6 +25,7 @@ public function create(): TypeSpecifier
2425
$typeSpecifier = new TypeSpecifier(
2526
$this->container->getByType(ExprPrinter::class),
2627
$this->container->getByType(ReflectionProvider::class),
28+
$this->container->getByType(PhpVersion::class),
2729
$this->container->getServicesByTag(self::FUNCTION_TYPE_SPECIFYING_EXTENSION_TAG),
2830
$this->container->getServicesByTag(self::METHOD_TYPE_SPECIFYING_EXTENSION_TAG),
2931
$this->container->getServicesByTag(self::STATIC_METHOD_TYPE_SPECIFYING_EXTENSION_TAG),

‎src/Reflection/InitializerExprTypeResolver.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,19 +316,19 @@ public function getType(Expr $expr, InitializerExprContext $context): Type
316316
}
317317

318318
if ($expr instanceof Expr\BinaryOp\Smaller) {
319-
return $this->getType($expr->left, $context)->isSmallerThan($this->getType($expr->right, $context))->toBooleanType();
319+
return $this->getType($expr->left, $context)->isSmallerThan($this->getType($expr->right, $context), $this->phpVersion)->toBooleanType();
320320
}
321321

322322
if ($expr instanceof Expr\BinaryOp\SmallerOrEqual) {
323-
return $this->getType($expr->left, $context)->isSmallerThanOrEqual($this->getType($expr->right, $context))->toBooleanType();
323+
return $this->getType($expr->left, $context)->isSmallerThanOrEqual($this->getType($expr->right, $context), $this->phpVersion)->toBooleanType();
324324
}
325325

326326
if ($expr instanceof Expr\BinaryOp\Greater) {
327-
return $this->getType($expr->right, $context)->isSmallerThan($this->getType($expr->left, $context))->toBooleanType();
327+
return $this->getType($expr->right, $context)->isSmallerThan($this->getType($expr->left, $context), $this->phpVersion)->toBooleanType();
328328
}
329329

330330
if ($expr instanceof Expr\BinaryOp\GreaterOrEqual) {
331-
return $this->getType($expr->right, $context)->isSmallerThanOrEqual($this->getType($expr->left, $context))->toBooleanType();
331+
return $this->getType($expr->right, $context)->isSmallerThanOrEqual($this->getType($expr->left, $context), $this->phpVersion)->toBooleanType();
332332
}
333333

334334
if ($expr instanceof Expr\BinaryOp\LogicalXor) {

‎src/Rules/Functions/RandomIntParametersRule.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PhpParser\Node;
66
use PhpParser\Node\Expr\FuncCall;
77
use PHPStan\Analyser\Scope;
8+
use PHPStan\Php\PhpVersion;
89
use PHPStan\Reflection\ReflectionProvider;
910
use PHPStan\Rules\Rule;
1011
use PHPStan\Rules\RuleErrorBuilder;
@@ -21,7 +22,11 @@
2122
final class RandomIntParametersRule implements Rule
2223
{
2324

24-
public function __construct(private ReflectionProvider $reflectionProvider, private bool $reportMaybes)
25+
public function __construct(
26+
private ReflectionProvider $reflectionProvider,
27+
private PhpVersion $phpVersion,
28+
private bool $reportMaybes,
29+
)
2530
{
2631
}
2732

@@ -55,7 +60,7 @@ public function processNode(Node $node, Scope $scope): array
5560
return [];
5661
}
5762

58-
$isSmaller = $maxType->isSmallerThan($minType);
63+
$isSmaller = $maxType->isSmallerThan($minType, $this->phpVersion);
5964

6065
if ($isSmaller->yes() || $isSmaller->maybe() && $this->reportMaybes) {
6166
$message = 'Parameter #1 $min (%s) of function random_int expects lower number than parameter #2 $max (%s).';

‎src/Type/CompoundType.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace PHPStan\Type;
44

5+
use PHPStan\Php\PhpVersion;
56
use PHPStan\TrinaryLogic;
67

78
/** @api */
@@ -14,8 +15,8 @@ public function isAcceptedBy(Type $acceptingType, bool $strictTypes): TrinaryLog
1415

1516
public function isAcceptedWithReasonBy(Type $acceptingType, bool $strictTypes): AcceptsResult;
1617

17-
public function isGreaterThan(Type $otherType): TrinaryLogic;
18+
public function isGreaterThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic;
1819

19-
public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic;
20+
public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic;
2021

2122
}

‎src/Type/Constant/ConstantBooleanType.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,31 +40,31 @@ public function describe(VerbosityLevel $level): string
4040
return $this->value ? 'true' : 'false';
4141
}
4242

43-
public function getSmallerType(): Type
43+
public function getSmallerType(PhpVersion $phpVersion): Type
4444
{
4545
if ($this->value) {
4646
return StaticTypeFactory::falsey();
4747
}
4848
return new NeverType();
4949
}
5050

51-
public function getSmallerOrEqualType(): Type
51+
public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
5252
{
5353
if ($this->value) {
5454
return new MixedType();
5555
}
5656
return StaticTypeFactory::falsey();
5757
}
5858

59-
public function getGreaterType(): Type
59+
public function getGreaterType(PhpVersion $phpVersion): Type
6060
{
6161
if ($this->value) {
6262
return new NeverType();
6363
}
6464
return StaticTypeFactory::truthy();
6565
}
6666

67-
public function getGreaterOrEqualType(): Type
67+
public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
6868
{
6969
if ($this->value) {
7070
return StaticTypeFactory::truthy();

‎src/Type/Constant/ConstantStringType.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Nette\Utils\Strings;
77
use PhpParser\Node\Name;
88
use PHPStan\Analyser\OutOfClassScope;
9+
use PHPStan\Php\PhpVersion;
910
use PHPStan\PhpDocParser\Ast\ConstExpr\ConstExprStringNode;
1011
use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
1112
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
@@ -461,7 +462,7 @@ public function generalize(GeneralizePrecision $precision): Type
461462
return new StringType();
462463
}
463464

464-
public function getSmallerType(): Type
465+
public function getSmallerType(PhpVersion $phpVersion): Type
465466
{
466467
$subtractedTypes = [
467468
new ConstantBooleanType(true),
@@ -480,7 +481,7 @@ public function getSmallerType(): Type
480481
return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
481482
}
482483

483-
public function getSmallerOrEqualType(): Type
484+
public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
484485
{
485486
$subtractedTypes = [
486487
IntegerRangeType::createAllGreaterThan((float) $this->value),
@@ -493,7 +494,7 @@ public function getSmallerOrEqualType(): Type
493494
return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
494495
}
495496

496-
public function getGreaterType(): Type
497+
public function getGreaterType(PhpVersion $phpVersion): Type
497498
{
498499
$subtractedTypes = [
499500
new ConstantBooleanType(false),
@@ -507,7 +508,7 @@ public function getGreaterType(): Type
507508
return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
508509
}
509510

510-
public function getGreaterOrEqualType(): Type
511+
public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
511512
{
512513
$subtractedTypes = [
513514
IntegerRangeType::createAllSmallerThan((float) $this->value),

‎src/Type/Enum/EnumCaseObjectType.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace PHPStan\Type\Enum;
44

5+
use PHPStan\Php\PhpVersion;
56
use PHPStan\PhpDocParser\Ast\ConstExpr\ConstFetchNode;
67
use PHPStan\PhpDocParser\Ast\Type\ConstTypeNode;
78
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
@@ -179,12 +180,12 @@ public function generalize(GeneralizePrecision $precision): Type
179180
return new parent($this->getClassName(), null, $this->getClassReflection());
180181
}
181182

182-
public function isSmallerThan(Type $otherType): TrinaryLogic
183+
public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
183184
{
184185
return TrinaryLogic::createNo();
185186
}
186187

187-
public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
188+
public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
188189
{
189190
return TrinaryLogic::createNo();
190191
}

‎src/Type/IntegerRangeType.php

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -308,75 +308,75 @@ public function generalize(GeneralizePrecision $precision): Type
308308
return new IntegerType();
309309
}
310310

311-
public function isSmallerThan(Type $otherType): TrinaryLogic
311+
public function isSmallerThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
312312
{
313313
if ($this->min === null) {
314314
$minIsSmaller = TrinaryLogic::createYes();
315315
} else {
316-
$minIsSmaller = (new ConstantIntegerType($this->min))->isSmallerThan($otherType);
316+
$minIsSmaller = (new ConstantIntegerType($this->min))->isSmallerThan($otherType, $phpVersion);
317317
}
318318

319319
if ($this->max === null) {
320320
$maxIsSmaller = TrinaryLogic::createNo();
321321
} else {
322-
$maxIsSmaller = (new ConstantIntegerType($this->max))->isSmallerThan($otherType);
322+
$maxIsSmaller = (new ConstantIntegerType($this->max))->isSmallerThan($otherType, $phpVersion);
323323
}
324324

325325
return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
326326
}
327327

328-
public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
328+
public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
329329
{
330330
if ($this->min === null) {
331331
$minIsSmaller = TrinaryLogic::createYes();
332332
} else {
333-
$minIsSmaller = (new ConstantIntegerType($this->min))->isSmallerThanOrEqual($otherType);
333+
$minIsSmaller = (new ConstantIntegerType($this->min))->isSmallerThanOrEqual($otherType, $phpVersion);
334334
}
335335

336336
if ($this->max === null) {
337337
$maxIsSmaller = TrinaryLogic::createNo();
338338
} else {
339-
$maxIsSmaller = (new ConstantIntegerType($this->max))->isSmallerThanOrEqual($otherType);
339+
$maxIsSmaller = (new ConstantIntegerType($this->max))->isSmallerThanOrEqual($otherType, $phpVersion);
340340
}
341341

342342
return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
343343
}
344344

345-
public function isGreaterThan(Type $otherType): TrinaryLogic
345+
public function isGreaterThan(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
346346
{
347347
if ($this->min === null) {
348348
$minIsSmaller = TrinaryLogic::createNo();
349349
} else {
350-
$minIsSmaller = $otherType->isSmallerThan((new ConstantIntegerType($this->min)));
350+
$minIsSmaller = $otherType->isSmallerThan((new ConstantIntegerType($this->min)), $phpVersion);
351351
}
352352

353353
if ($this->max === null) {
354354
$maxIsSmaller = TrinaryLogic::createYes();
355355
} else {
356-
$maxIsSmaller = $otherType->isSmallerThan((new ConstantIntegerType($this->max)));
356+
$maxIsSmaller = $otherType->isSmallerThan((new ConstantIntegerType($this->max)), $phpVersion);
357357
}
358358

359359
return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
360360
}
361361

362-
public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
362+
public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
363363
{
364364
if ($this->min === null) {
365365
$minIsSmaller = TrinaryLogic::createNo();
366366
} else {
367-
$minIsSmaller = $otherType->isSmallerThanOrEqual((new ConstantIntegerType($this->min)));
367+
$minIsSmaller = $otherType->isSmallerThanOrEqual((new ConstantIntegerType($this->min)), $phpVersion);
368368
}
369369

370370
if ($this->max === null) {
371371
$maxIsSmaller = TrinaryLogic::createYes();
372372
} else {
373-
$maxIsSmaller = $otherType->isSmallerThanOrEqual((new ConstantIntegerType($this->max)));
373+
$maxIsSmaller = $otherType->isSmallerThanOrEqual((new ConstantIntegerType($this->max)), $phpVersion);
374374
}
375375

376376
return TrinaryLogic::extremeIdentity($minIsSmaller, $maxIsSmaller);
377377
}
378378

379-
public function getSmallerType(): Type
379+
public function getSmallerType(PhpVersion $phpVersion): Type
380380
{
381381
$subtractedTypes = [
382382
new ConstantBooleanType(true),
@@ -389,7 +389,7 @@ public function getSmallerType(): Type
389389
return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
390390
}
391391

392-
public function getSmallerOrEqualType(): Type
392+
public function getSmallerOrEqualType(PhpVersion $phpVersion): Type
393393
{
394394
$subtractedTypes = [];
395395

@@ -400,7 +400,7 @@ public function getSmallerOrEqualType(): Type
400400
return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
401401
}
402402

403-
public function getGreaterType(): Type
403+
public function getGreaterType(PhpVersion $phpVersion): Type
404404
{
405405
$subtractedTypes = [
406406
new NullType(),
@@ -418,7 +418,7 @@ public function getGreaterType(): Type
418418
return TypeCombinator::remove(new MixedType(), TypeCombinator::union(...$subtractedTypes));
419419
}
420420

421-
public function getGreaterOrEqualType(): Type
421+
public function getGreaterOrEqualType(PhpVersion $phpVersion): Type
422422
{
423423
$subtractedTypes = [];
424424

@@ -692,7 +692,7 @@ public function toPhpDocNode(): TypeNode
692692

693693
public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
694694
{
695-
if ($this->isSmallerThan($type)->yes() || $this->isGreaterThan($type)->yes()) {
695+
if ($this->isSmallerThan($type, $phpVersion)->yes() || $this->isGreaterThan($type, $phpVersion)->yes()) {
696696
return new ConstantBooleanType(false);
697697
}
698698

0 commit comments

Comments
 (0)