Skip to content

Commit ad68a4f

Browse files
staabmstaabm
committed
Implement BinaryShiftLeftHandler, BinaryShiftRightHandler
1 parent 9eb83b7 commit ad68a4f

File tree

4 files changed

+145
-0
lines changed

4 files changed

+145
-0
lines changed

‎src/Analyser/Generator/ExprHandler/BinaryShiftLeftHandler.php‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace PHPStan\Analyser\Generator\ExprHandler;
4+
5+
use Generator;
6+
use PhpParser\Node\Expr;
7+
use PhpParser\Node\Stmt;
8+
use PHPStan\Analyser\ExpressionContext;
9+
use PHPStan\Analyser\Generator\ExprAnalysisRequest;
10+
use PHPStan\Analyser\Generator\ExprAnalysisResult;
11+
use PHPStan\Analyser\Generator\ExprHandler;
12+
use PHPStan\Analyser\Generator\GeneratorScope;
13+
use PHPStan\Analyser\SpecifiedTypes;
14+
use PHPStan\DependencyInjection\AutowiredService;
15+
use PHPStan\Reflection\InitializerExprTypeResolver;
16+
use function array_merge;
17+
18+
/**
19+
* @implements ExprHandler<Expr\BinaryOp\ShiftLeft>
20+
*/
21+
#[AutowiredService]
22+
final class BinaryShiftLeftHandler implements ExprHandler
23+
{
24+
25+
public function __construct(private InitializerExprTypeResolver $initializerExprTypeResolver)
26+
{
27+
}
28+
29+
public function supports(Expr $expr): bool
30+
{
31+
return $expr instanceof Expr\BinaryOp\ShiftLeft;
32+
}
33+
34+
public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context, ?callable $alternativeNodeCallback): Generator
35+
{
36+
$leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context, $alternativeNodeCallback);
37+
$rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context, $alternativeNodeCallback);
38+
39+
return new ExprAnalysisResult(
40+
$this->initializerExprTypeResolver->getShiftLeftTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),
41+
$this->initializerExprTypeResolver->getShiftLeftTypeFromTypes($expr->left, $expr->right, $leftResult->nativeType, $rightResult->nativeType),
42+
$rightResult->scope,
43+
hasYield: $leftResult->hasYield || $rightResult->hasYield,
44+
isAlwaysTerminating: $leftResult->isAlwaysTerminating || $rightResult->isAlwaysTerminating,
45+
throwPoints: array_merge($leftResult->throwPoints, $rightResult->throwPoints),
46+
impurePoints: array_merge($leftResult->impurePoints, $rightResult->impurePoints),
47+
specifiedTruthyTypes: new SpecifiedTypes(),
48+
specifiedFalseyTypes: new SpecifiedTypes(),
49+
specifiedNullTypes: new SpecifiedTypes(),
50+
);
51+
}
52+
53+
}

‎src/Analyser/Generator/ExprHandler/BinaryShiftRightHandler.php‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?php declare(strict_types = 1);
2+
3+
namespace PHPStan\Analyser\Generator\ExprHandler;
4+
5+
use Generator;
6+
use PhpParser\Node\Expr;
7+
use PhpParser\Node\Stmt;
8+
use PHPStan\Analyser\ExpressionContext;
9+
use PHPStan\Analyser\Generator\ExprAnalysisRequest;
10+
use PHPStan\Analyser\Generator\ExprAnalysisResult;
11+
use PHPStan\Analyser\Generator\ExprHandler;
12+
use PHPStan\Analyser\Generator\GeneratorScope;
13+
use PHPStan\Analyser\SpecifiedTypes;
14+
use PHPStan\DependencyInjection\AutowiredService;
15+
use PHPStan\Reflection\InitializerExprTypeResolver;
16+
use function array_merge;
17+
18+
/**
19+
* @implements ExprHandler<Expr\BinaryOp\ShiftRight>
20+
*/
21+
#[AutowiredService]
22+
final class BinaryShiftRightHandler implements ExprHandler
23+
{
24+
25+
public function __construct(private InitializerExprTypeResolver $initializerExprTypeResolver)
26+
{
27+
}
28+
29+
public function supports(Expr $expr): bool
30+
{
31+
return $expr instanceof Expr\BinaryOp\ShiftRight;
32+
}
33+
34+
public function analyseExpr(Stmt $stmt, Expr $expr, GeneratorScope $scope, ExpressionContext $context, ?callable $alternativeNodeCallback): Generator
35+
{
36+
$leftResult = yield new ExprAnalysisRequest($stmt, $expr->left, $scope, $context, $alternativeNodeCallback);
37+
$rightResult = yield new ExprAnalysisRequest($stmt, $expr->right, $leftResult->scope, $context, $alternativeNodeCallback);
38+
39+
return new ExprAnalysisResult(
40+
$this->initializerExprTypeResolver->getShiftRightTypeFromTypes($expr->left, $expr->right, $leftResult->type, $rightResult->type),
41+
$this->initializerExprTypeResolver->getShiftRightTypeFromTypes($expr->left, $expr->right, $leftResult->nativeType, $rightResult->nativeType),
42+
$rightResult->scope,
43+
hasYield: $leftResult->hasYield || $rightResult->hasYield,
44+
isAlwaysTerminating: $leftResult->isAlwaysTerminating || $rightResult->isAlwaysTerminating,
45+
throwPoints: array_merge($leftResult->throwPoints, $rightResult->throwPoints),
46+
impurePoints: array_merge($leftResult->impurePoints, $rightResult->impurePoints),
47+
specifiedTruthyTypes: new SpecifiedTypes(),
48+
specifiedFalseyTypes: new SpecifiedTypes(),
49+
specifiedNullTypes: new SpecifiedTypes(),
50+
);
51+
}
52+
53+
}

‎src/Reflection/InitializerExprTypeResolver.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1685,6 +1685,11 @@ public function getShiftLeftType(Expr $left, Expr $right, callable $getTypeCallb
16851685
$leftType = $getTypeCallback($left);
16861686
$rightType = $getTypeCallback($right);
16871687

1688+
return $this->getShiftLeftTypeFromTypes($left, $right, $leftType, $rightType);
1689+
}
1690+
1691+
public function getShiftLeftTypeFromTypes(Expr $left, Expr $right, Type $leftType, Type $rightType): Type
1692+
{
16881693
if ($leftType instanceof NeverType || $rightType instanceof NeverType) {
16891694
return $this->getNeverType($leftType, $rightType);
16901695
}
@@ -1744,6 +1749,11 @@ public function getShiftRightType(Expr $left, Expr $right, callable $getTypeCall
17441749
$leftType = $getTypeCallback($left);
17451750
$rightType = $getTypeCallback($right);
17461751

1752+
return $this->getShiftRightTypeFromTypes($left, $right, $leftType, $rightType);
1753+
}
1754+
1755+
public function getShiftRightTypeFromTypes(Expr $left, Expr $right, Type $leftType, Type $rightType): Type
1756+
{
17471757
if ($leftType instanceof NeverType || $rightType instanceof NeverType) {
17481758
return $this->getNeverType($leftType, $rightType);
17491759
}

‎tests/PHPStan/Analyser/Generator/data/gnsr.php‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,35 @@ public function doConcat($a, $b, string $c, string $d): void
162162
assertNativeType('string', $c . $d);
163163
}
164164

165+
/**
166+
* @param int $a
167+
* @param int $b
168+
* @return void
169+
*/
170+
public function doShiftLeft($a, $b, int $c, int $d): void
171+
{
172+
assertType('int', $a << $b);
173+
assertNativeType('(float|int)', $a << $b);
174+
assertType('8', 1 << 3);
175+
assertNativeType('8', 1 << 3);
176+
assertType('int', $c << $d);
177+
assertNativeType('int', $c << $d);
178+
}
179+
180+
/**
181+
* @param int $a
182+
* @param int $b
183+
* @return void
184+
*/
185+
public function doShiftRight($a, $b, int $c, int $d): void
186+
{
187+
assertType('int', $a >> $b);
188+
assertNativeType('(float|int)', $a >> $b);
189+
assertType('0', 1 >> 3);
190+
assertNativeType('0', 1 >> 3);
191+
assertType('int', $c >> $d);
192+
assertNativeType('int', $c >> $d);
193+
}
165194
}
166195

167196
function (): void {

0 commit comments

Comments
 (0)