Skip to content

Commit eab3788

Browse files
VincentLangletVincentLanglet
committed
Add PhpVersion param
1 parent af6a9c5 commit eab3788

14 files changed

+38
-33
lines changed

‎src/Analyser/MutatingScope.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -751,15 +751,15 @@ private function resolveType(string $exprString, Expr $node): Type
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) {
758758
return $this->getType($node->right)->isSmallerThan($this->getType($node->left))->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/Reflection/InitializerExprTypeResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -320,15 +320,15 @@ public function getType(Expr $expr, InitializerExprContext $context): Type
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) {
327327
return $this->getType($expr->right, $context)->isSmallerThan($this->getType($expr->left, $context))->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/Type/CompoundType.php

Lines changed: 2 additions & 1 deletion
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 */
@@ -16,6 +17,6 @@ public function isAcceptedWithReasonBy(Type $acceptingType, bool $strictTypes):
1617

1718
public function isGreaterThan(Type $otherType): TrinaryLogic;
1819

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

2122
}

‎src/Type/Enum/EnumCaseObjectType.php

Lines changed: 2 additions & 1 deletion
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;
@@ -184,7 +185,7 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,18 +325,18 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
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);
@@ -359,18 +359,18 @@ public function isGreaterThan(Type $otherType): TrinaryLogic
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);

‎src/Type/IntersectionType.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -807,9 +807,9 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
807807
return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThan($otherType));
808808
}
809809

810-
public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
810+
public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
811811
{
812-
return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThanOrEqual($otherType));
812+
return $this->intersectResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThanOrEqual($otherType, $phpVersion));
813813
}
814814

815815
public function isNull(): TrinaryLogic
@@ -881,9 +881,9 @@ public function isGreaterThan(Type $otherType): TrinaryLogic
881881
return $this->intersectResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThan($type));
882882
}
883883

884-
public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
884+
public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
885885
{
886-
return $this->intersectResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThanOrEqual($type));
886+
return $this->intersectResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThanOrEqual($type, $phpVersion));
887887
}
888888

889889
public function getSmallerType(): Type

‎src/Type/NullType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,14 +121,14 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
121121
return TrinaryLogic::createMaybe();
122122
}
123123

124-
public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
124+
public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
125125
{
126126
if ($otherType instanceof ConstantScalarType) {
127127
return TrinaryLogic::createFromBoolean(null <= $otherType->getValue());
128128
}
129129

130130
if ($otherType instanceof CompoundType) {
131-
return $otherType->isGreaterThanOrEqual($this);
131+
return $otherType->isGreaterThanOrEqual($this, $phpVersion);
132132
}
133133

134134
return TrinaryLogic::createMaybe();

‎src/Type/Traits/ConstantScalarTypeTrait.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
9191
return TrinaryLogic::createMaybe();
9292
}
9393

94-
public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
94+
public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
9595
{
9696
if ($otherType instanceof ConstantScalarType) {
9797
return TrinaryLogic::createFromBoolean($this->value <= $otherType->getValue());
9898
}
9999

100100
if ($otherType instanceof CompoundType) {
101-
return $otherType->isGreaterThanOrEqual($this);
101+
return $otherType->isGreaterThanOrEqual($this, $phpVersion);
102102
}
103103

104104
return TrinaryLogic::createMaybe();

‎src/Type/Traits/LateResolvableTypeTrait.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -372,9 +372,9 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
372372
return $this->resolve()->isSmallerThan($otherType);
373373
}
374374

375-
public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
375+
public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
376376
{
377-
return $this->resolve()->isSmallerThanOrEqual($otherType);
377+
return $this->resolve()->isSmallerThanOrEqual($otherType, $phpVersion);
378378
}
379379

380380
public function isNull(): TrinaryLogic
@@ -550,15 +550,15 @@ public function isGreaterThan(Type $otherType): TrinaryLogic
550550
return $otherType->isSmallerThan($result);
551551
}
552552

553-
public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
553+
public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
554554
{
555555
$result = $this->resolve();
556556

557557
if ($result instanceof CompoundType) {
558-
return $result->isGreaterThanOrEqual($otherType);
558+
return $result->isGreaterThanOrEqual($otherType, $phpVersion);
559559
}
560560

561-
return $otherType->isSmallerThanOrEqual($result);
561+
return $otherType->isSmallerThanOrEqual($result, $phpVersion);
562562
}
563563

564564
public function exponentiate(Type $exponent): Type

‎src/Type/Traits/UndecidedComparisonCompoundTypeTrait.php

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

33
namespace PHPStan\Type\Traits;
44

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

@@ -15,7 +16,7 @@ public function isGreaterThan(Type $otherType): TrinaryLogic
1516
return TrinaryLogic::createMaybe();
1617
}
1718

18-
public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
19+
public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
1920
{
2021
return TrinaryLogic::createMaybe();
2122
}

‎src/Type/Traits/UndecidedComparisonTypeTrait.php

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

33
namespace PHPStan\Type\Traits;
44

5+
use PHPStan\Php\PhpVersion;
56
use PHPStan\TrinaryLogic;
67
use PHPStan\Type\MixedType;
78
use PHPStan\Type\Type;
@@ -14,7 +15,7 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
1415
return TrinaryLogic::createMaybe();
1516
}
1617

17-
public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
18+
public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
1819
{
1920
return TrinaryLogic::createMaybe();
2021
}

‎src/Type/Type.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public function toArrayKey(): Type;
217217

218218
public function isSmallerThan(Type $otherType): TrinaryLogic;
219219

220-
public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic;
220+
public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic;
221221

222222
/**
223223
* Is Type of a known constant value? Includes literal strings, integers, floats, true, false, null, and array shapes.

‎src/Type/UnionType.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -788,9 +788,9 @@ public function isSmallerThan(Type $otherType): TrinaryLogic
788788
return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThan($otherType));
789789
}
790790

791-
public function isSmallerThanOrEqual(Type $otherType): TrinaryLogic
791+
public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
792792
{
793-
return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThanOrEqual($otherType));
793+
return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $type->isSmallerThanOrEqual($otherType, $phpVersion));
794794
}
795795

796796
public function isNull(): TrinaryLogic
@@ -868,9 +868,9 @@ public function isGreaterThan(Type $otherType): TrinaryLogic
868868
return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThan($type));
869869
}
870870

871-
public function isGreaterThanOrEqual(Type $otherType): TrinaryLogic
871+
public function isGreaterThanOrEqual(Type $otherType, PhpVersion $phpVersion): TrinaryLogic
872872
{
873-
return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThanOrEqual($type));
873+
return $this->notBenevolentUnionResults(static fn (Type $type): TrinaryLogic => $otherType->isSmallerThanOrEqual($type, $phpVersion));
874874
}
875875

876876
public function toBoolean(): BooleanType

‎tests/PHPStan/Rules/Api/data/class-implements-out-of-phpstan.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use PhpParser\Node\Expr\FuncCall;
66
use PHPStan\Analyser\Scope;
77
use PHPStan\DependencyInjection\Type\DynamicThrowTypeExtensionProvider;
8+
use PHPStan\Php\PhpVersion;
89
use PHPStan\Reflection\ClassMemberAccessAnswerer;
910
use PHPStan\Reflection\ExtendedMethodReflection;
1011
use PHPStan\Reflection\FunctionReflection;
@@ -252,7 +253,7 @@ public function isSmallerThan(Type $otherType): \PHPStan\TrinaryLogic
252253
// TODO: Implement isSmallerThan() method.
253254
}
254255

255-
public function isSmallerThanOrEqual(Type $otherType): \PHPStan\TrinaryLogic
256+
public function isSmallerThanOrEqual(Type $otherType, PhpVersion $phpVersion): \PHPStan\TrinaryLogic
256257
{
257258
// TODO: Implement isSmallerThanOrEqual() method.
258259
}

0 commit comments

Comments
 (0)