-
Notifications
You must be signed in to change notification settings - Fork 556
Implement GMP operator type specifying extension #5223
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: 2.1.x
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -986,6 +986,12 @@ | |
| $leftType = $getTypeCallback($left); | ||
| $rightType = $getTypeCallback($right); | ||
|
|
||
| $specifiedTypes = $this->operatorTypeSpecifyingExtensionRegistryProvider->getRegistry() | ||
| ->callOperatorTypeSpecifyingExtensions(new BinaryOp\BitwiseAnd($left, $right), $leftType, $rightType); | ||
| if ($specifiedTypes !== null) { | ||
| return $specifiedTypes; | ||
| } | ||
|
|
||
| return $this->getBitwiseAndTypeFromTypes($leftType, $rightType); | ||
| } | ||
|
|
||
|
|
@@ -1044,6 +1050,12 @@ | |
| $leftType = $getTypeCallback($left); | ||
| $rightType = $getTypeCallback($right); | ||
|
|
||
| $specifiedTypes = $this->operatorTypeSpecifyingExtensionRegistryProvider->getRegistry() | ||
| ->callOperatorTypeSpecifyingExtensions(new BinaryOp\BitwiseOr($left, $right), $leftType, $rightType); | ||
| if ($specifiedTypes !== null) { | ||
| return $specifiedTypes; | ||
| } | ||
|
|
||
| return $this->getBitwiseOrTypeFromTypes($leftType, $rightType); | ||
| } | ||
|
|
||
|
|
@@ -1092,6 +1104,12 @@ | |
| $leftType = $getTypeCallback($left); | ||
| $rightType = $getTypeCallback($right); | ||
|
|
||
| $specifiedTypes = $this->operatorTypeSpecifyingExtensionRegistryProvider->getRegistry() | ||
| ->callOperatorTypeSpecifyingExtensions(new BinaryOp\BitwiseXor($left, $right), $leftType, $rightType); | ||
| if ($specifiedTypes !== null) { | ||
| return $specifiedTypes; | ||
| } | ||
|
|
||
| return $this->getBitwiseXorTypeFromTypes($leftType, $rightType); | ||
| } | ||
|
|
||
|
|
@@ -2034,6 +2052,12 @@ | |
| */ | ||
| private function resolveCommonMath(Expr\BinaryOp $expr, Type $leftType, Type $rightType): Type | ||
| { | ||
| $specifiedTypes = $this->operatorTypeSpecifyingExtensionRegistryProvider->getRegistry() | ||
| ->callOperatorTypeSpecifyingExtensions($expr, $leftType, $rightType); | ||
| if ($specifiedTypes !== null) { | ||
| return $specifiedTypes; | ||
| } | ||
|
|
||
| $types = TypeCombinator::union($leftType, $rightType); | ||
| $leftNumberType = $leftType->toNumber(); | ||
| $rightNumberType = $rightType->toNumber(); | ||
|
|
@@ -2073,12 +2097,6 @@ | |
| } | ||
| } | ||
|
|
||
| $specifiedTypes = $this->operatorTypeSpecifyingExtensionRegistryProvider->getRegistry() | ||
| ->callOperatorTypeSpecifyingExtensions($expr, $leftType, $rightType); | ||
| if ($specifiedTypes !== null) { | ||
| return $specifiedTypes; | ||
| } | ||
|
|
||
| if ( | ||
| $leftType->isArray()->yes() | ||
| || $rightType->isArray()->yes() | ||
|
|
@@ -2581,6 +2599,11 @@ | |
| { | ||
| $type = $getTypeCallback($expr); | ||
|
|
||
| // GMP supports unary minus and returns GMP | ||
| if ($type->isObject()->yes() && (new ObjectType('GMP'))->isSuperTypeOf($type)->yes()) { | ||
|
Check warning on line 2603 in src/Reflection/InitializerExprTypeResolver.php
|
||
| return new ObjectType('GMP'); | ||
| } | ||
|
|
||
| $type = $this->getUnaryMinusTypeFromType($expr, $type); | ||
| if ($type instanceof IntegerRangeType) { | ||
| return $getTypeCallback(new Expr\BinaryOp\Mul($expr, new Int_(-1))); | ||
|
|
@@ -2622,6 +2645,11 @@ | |
| { | ||
| $exprType = $getTypeCallback($expr); | ||
|
|
||
| // GMP supports bitwise not and returns GMP | ||
| if ($exprType->isObject()->yes() && (new ObjectType('GMP'))->isSuperTypeOf($exprType)->yes()) { | ||
|
Check warning on line 2649 in src/Reflection/InitializerExprTypeResolver.php
|
||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same for UnaryOperatorTypeSpecifyingExtension |
||
| return new ObjectType('GMP'); | ||
| } | ||
|
|
||
| return $this->getBitwiseNotTypeFromType($exprType); | ||
| } | ||
|
|
||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| <?php declare(strict_types = 1); | ||
|
|
||
| namespace PHPStan\Type\Php; | ||
|
|
||
| use PHPStan\DependencyInjection\AutowiredService; | ||
| use PHPStan\Type\BooleanType; | ||
| use PHPStan\Type\IntegerRangeType; | ||
| use PHPStan\Type\NeverType; | ||
| use PHPStan\Type\ObjectType; | ||
| use PHPStan\Type\OperatorTypeSpecifyingExtension; | ||
| use PHPStan\Type\Type; | ||
| use function in_array; | ||
|
|
||
| #[AutowiredService] | ||
| final class GmpOperatorTypeSpecifyingExtension implements OperatorTypeSpecifyingExtension | ||
| { | ||
|
|
||
| public function isOperatorSupported(string $operatorSigil, Type $leftSide, Type $rightSide): bool | ||
| { | ||
| if ($leftSide instanceof NeverType || $rightSide instanceof NeverType) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The BC math operator type specifying extension has a check Do we need something similar here or does it work on any php version ?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Anything since 5.6, according to the RFC that added it (linked in issue). I'm not sure how far back PHPStan support goes and by extension whether that'd be necessary. |
||
| return false; | ||
| } | ||
|
|
||
| if (!in_array($operatorSigil, ['+', '-', '*', '/', '**', '%', '&', '|', '^', '<<', '>>', '<', '<=', '>', '>=', '==', '!=', '<=>'], true)) { | ||
| return false; | ||
| } | ||
|
|
||
| $gmpType = new ObjectType('GMP'); | ||
| $leftIsGmp = $gmpType->isSuperTypeOf($leftSide)->yes(); | ||
|
Check warning on line 29 in src/Type/Php/GmpOperatorTypeSpecifyingExtension.php
|
||
| $rightIsGmp = $gmpType->isSuperTypeOf($rightSide)->yes(); | ||
|
Check warning on line 30 in src/Type/Php/GmpOperatorTypeSpecifyingExtension.php
|
||
|
|
||
| // At least one side must be GMP | ||
| if (!$leftIsGmp && !$rightIsGmp) { | ||
| return false; | ||
| } | ||
|
|
||
| // The other side must be GMP-compatible (GMP, int, or numeric-string) | ||
| // GMP operations with incompatible types (like stdClass) will error at runtime | ||
| return $this->isGmpCompatible($leftSide, $gmpType) && $this->isGmpCompatible($rightSide, $gmpType); | ||
| } | ||
|
|
||
| private function isGmpCompatible(Type $type, ObjectType $gmpType): bool | ||
| { | ||
| if ($gmpType->isSuperTypeOf($type)->yes()) { | ||
|
Check warning on line 44 in src/Type/Php/GmpOperatorTypeSpecifyingExtension.php
|
||
| return true; | ||
| } | ||
| if ($type->isInteger()->yes()) { | ||
| return true; | ||
| } | ||
| if ($type->isNumericString()->yes()) { | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
|
|
||
| public function specifyType(string $operatorSigil, Type $leftSide, Type $rightSide): Type | ||
| { | ||
| $gmpType = new ObjectType('GMP'); | ||
|
|
||
| // Comparison operators return bool or int (for spaceship) | ||
| if (in_array($operatorSigil, ['<', '<=', '>', '>=', '==', '!='], true)) { | ||
| return new BooleanType(); | ||
| } | ||
|
|
||
| if ($operatorSigil === '<=>') { | ||
| return IntegerRangeType::fromInterval(-1, 1); | ||
| } | ||
|
|
||
| // All arithmetic and bitwise operations on GMP return GMP | ||
| // GMP can operate with: GMP, int, or numeric-string | ||
| return $gmpType; | ||
| } | ||
|
|
||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
| <?php | ||
|
|
||
| namespace GmpOperatorsTest; | ||
|
|
||
| use function PHPStan\Testing\assertType; | ||
|
|
||
| // ============================================================================= | ||
| // Operator overloads | ||
| // ============================================================================= | ||
|
|
||
| function gmpArithmeticOperators(\GMP $a, \GMP $b): void | ||
| { | ||
| assertType('GMP', $a + $b); | ||
| assertType('GMP', $a - $b); | ||
| assertType('GMP', $a * $b); | ||
| assertType('GMP', $a / $b); | ||
| assertType('GMP', $a % $b); | ||
| assertType('GMP', $a ** $b); | ||
| assertType('GMP', -$a); | ||
| } | ||
|
|
||
| function gmpWithIntOperators(\GMP $a, int $i): void | ||
| { | ||
| // GMP on left | ||
| assertType('GMP', $a + $i); | ||
| assertType('GMP', $a - $i); | ||
| assertType('GMP', $a * $i); | ||
| assertType('GMP', $a / $i); | ||
| assertType('GMP', $a % $i); | ||
| assertType('GMP', $a ** $i); | ||
|
|
||
| // int on left (GMP on right) | ||
| assertType('GMP', $i + $a); | ||
| assertType('GMP', $i - $a); | ||
| assertType('GMP', $i * $a); | ||
| assertType('GMP', $i / $a); | ||
| assertType('GMP', $i % $a); | ||
| // Note: $i ** $a is not supported by GMP - exponent must be int | ||
| } | ||
|
|
||
| function gmpBitwiseOperators(\GMP $a, \GMP $b, int $i): void | ||
| { | ||
| // GMP bitwise with GMP | ||
| assertType('GMP', $a & $b); | ||
| assertType('GMP', $a | $b); | ||
| assertType('GMP', $a ^ $b); | ||
| assertType('GMP', ~$a); | ||
| assertType('GMP', $a << $b); | ||
| assertType('GMP', $a >> $b); | ||
|
|
||
| // GMP on left, int on right | ||
| assertType('GMP', $a & $i); | ||
| assertType('GMP', $a | $i); | ||
| assertType('GMP', $a ^ $i); | ||
| assertType('GMP', $a << $i); | ||
| assertType('GMP', $a >> $i); | ||
|
|
||
| // int on left, GMP on right | ||
| assertType('GMP', $i & $a); | ||
| assertType('GMP', $i | $a); | ||
| assertType('GMP', $i ^ $a); | ||
| } | ||
|
|
||
| function gmpComparisonOperators(\GMP $a, \GMP $b, int $i): void | ||
| { | ||
| // GMP compared with GMP | ||
| assertType('bool', $a < $b); | ||
| assertType('bool', $a <= $b); | ||
| assertType('bool', $a > $b); | ||
| assertType('bool', $a >= $b); | ||
| assertType('bool', $a == $b); | ||
| assertType('bool', $a != $b); | ||
| assertType('int<-1, 1>', $a <=> $b); | ||
|
|
||
| // GMP on left, int on right | ||
| assertType('bool', $a < $i); | ||
| assertType('bool', $a <= $i); | ||
| assertType('bool', $a > $i); | ||
| assertType('bool', $a >= $i); | ||
| assertType('bool', $a == $i); | ||
| assertType('bool', $a != $i); | ||
| assertType('int<-1, 1>', $a <=> $i); | ||
|
|
||
| // int on left, GMP on right | ||
| assertType('bool', $i < $a); | ||
| assertType('bool', $i <= $a); | ||
| assertType('bool', $i > $a); | ||
| assertType('bool', $i >= $a); | ||
| assertType('bool', $i == $a); | ||
| assertType('bool', $i != $a); | ||
| assertType('int<-1, 1>', $i <=> $a); | ||
| } | ||
|
|
||
| function gmpAssignmentOperators(\GMP $a, int $i): void | ||
| { | ||
| $x = $a; | ||
| $x += $i; | ||
| assertType('GMP', $x); | ||
|
|
||
| $y = $a; | ||
| $y -= $i; | ||
| assertType('GMP', $y); | ||
|
|
||
| $z = $a; | ||
| $z *= $i; | ||
| assertType('GMP', $z); | ||
| } | ||
|
|
||
| // ============================================================================= | ||
| // gmp_* functions (corresponding to operator overloads) | ||
| // ============================================================================= | ||
|
|
||
| function gmpArithmeticFunctions(\GMP $a, \GMP $b, int $i): void | ||
| { | ||
| // gmp_add corresponds to + | ||
| assertType('GMP', gmp_add($a, $b)); | ||
| assertType('GMP', gmp_add($a, $i)); | ||
| assertType('GMP', gmp_add($i, $a)); | ||
|
|
||
| // gmp_sub corresponds to - | ||
| assertType('GMP', gmp_sub($a, $b)); | ||
| assertType('GMP', gmp_sub($a, $i)); | ||
| assertType('GMP', gmp_sub($i, $a)); | ||
|
|
||
| // gmp_mul corresponds to * | ||
| assertType('GMP', gmp_mul($a, $b)); | ||
| assertType('GMP', gmp_mul($a, $i)); | ||
| assertType('GMP', gmp_mul($i, $a)); | ||
|
|
||
| // gmp_div_q corresponds to / | ||
| assertType('GMP', gmp_div_q($a, $b)); | ||
| assertType('GMP', gmp_div_q($a, $i)); | ||
|
|
||
| // gmp_div is alias of gmp_div_q | ||
| assertType('GMP', gmp_div($a, $b)); | ||
|
|
||
| // gmp_mod corresponds to % | ||
| assertType('GMP', gmp_mod($a, $b)); | ||
| assertType('GMP', gmp_mod($a, $i)); | ||
|
|
||
| // gmp_pow corresponds to ** | ||
| assertType('GMP', gmp_pow($a, 2)); | ||
| assertType('GMP', gmp_pow($a, $i)); | ||
|
|
||
| // gmp_neg corresponds to unary - | ||
| assertType('GMP', gmp_neg($a)); | ||
|
|
||
| // gmp_abs (no direct operator) | ||
| assertType('GMP', gmp_abs($a)); | ||
| } | ||
|
|
||
| function gmpBitwiseFunctions(\GMP $a, \GMP $b): void | ||
| { | ||
| // gmp_and corresponds to & | ||
| assertType('GMP', gmp_and($a, $b)); | ||
|
|
||
| // gmp_or corresponds to | | ||
| assertType('GMP', gmp_or($a, $b)); | ||
|
|
||
| // gmp_xor corresponds to ^ | ||
| assertType('GMP', gmp_xor($a, $b)); | ||
|
|
||
| // gmp_com corresponds to ~ | ||
| assertType('GMP', gmp_com($a)); | ||
| } | ||
|
|
||
| function gmpComparisonFunctions(\GMP $a, \GMP $b, int $i): void | ||
| { | ||
| // gmp_cmp returns -1, 0, or 1 in practice, but stubs say int | ||
| // TODO: Could be improved to int<-1, 1> like the <=> operator | ||
| assertType('int', gmp_cmp($a, $b)); | ||
| assertType('int', gmp_cmp($a, $i)); | ||
| } | ||
|
|
||
| function gmpFromInit(): void | ||
| { | ||
| $x = gmp_init('1'); | ||
| assertType('GMP', $x); | ||
|
|
||
| // Operator with gmp_init result | ||
| $y = $x * 2; | ||
| assertType('GMP', $y); | ||
|
|
||
| $z = $x + gmp_init('5'); | ||
| assertType('GMP', $z); | ||
| } | ||
|
|
||
| function gmpWithNumericString(\GMP $a, string $s): void | ||
| { | ||
| // GMP functions accept numeric strings | ||
| assertType('GMP', gmp_add($a, '123')); | ||
| assertType('GMP', gmp_mul($a, '456')); | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rather than an hardcoded check for this, I feel like it we should introduce an UnaryOperatorTypeSpecifyingExtension as explained here: #4980 (comment)
This is maybe better in a dedicated PR ?