support integer-ranges in pow() #1904

staabm · 2022-10-24T10:32:18Z

closes the last remaining todo of #5614

staabm · 2022-10-24T10:32:26Z

phpstan-bot · 2022-10-24T10:42:04Z

This pull request has been marked as ready for review.

ondrejmirtes

This doesn't handle unions of integer ranges on both sides. Instead of instanceof *Type, it'd be better to handle this with a new method on Type. But of course that needs to be designed in order to be useful, ideally to replace other instances of instancoef IntegerRangeType and even maybe TypeUtils::getConstantIntegers().

staabm · 2022-10-26T14:30:54Z

it'd be better to handle this with a new method on Type

if I get you right we are talking about methods such as the following, right?

diff --git a/src/Type/Type.php b/src/Type/Type.php
index f02971559..5a00d7f1c 100644
--- a/src/Type/Type.php
+++ b/src/Type/Type.php
@@ -112,6 +112,16 @@ interface Type

        public function shuffleArray(): Type;

+       public function subtract(Type $subtrahend): Type;
+
+       public function sum(Type $summand): Type;
+
+       public function multiply(Type $multiplicand): Type;
+
+       public function divide(Type $divisor): Type;
+
+       public function pow(Type $exponent): Type;
+

or do you have somthing different in mind?

ondrejmirtes · 2022-10-26T15:05:43Z

Yeah, that would be great, although "pow" isn't a word unlike the others, should be "exponentiate" probably.

ondrejmirtes · 2022-10-26T15:06:04Z

We'll be able to get rid of a lot of code in InitializerExprTypeResolver :)

phpstan-bot · 2022-10-27T09:26:58Z

This pull request has been marked as ready for review.

staabm · 2022-10-27T09:27:20Z

implemented Type->exponentiate() for now and will do the others in separate PRs

staabm · 2022-10-28T06:22:23Z

src/Reflection/InitializerExprTypeResolver.php

-			return TypeCombinator::union(...$resultTypes);
+		$exponentiatedTyped = $leftType->exponentiate($rightType);
+		if (!$exponentiatedTyped instanceof ErrorType) {
+			return $exponentiatedTyped;
 		}

 		return $this->resolveCommonMath(new BinaryOp\Pow($left, $right), $leftType, $rightType);


I kept this pass thru resolveCommonMath because otherwise we would loose support for operator-type specifiying extensions (even though atm, there is no test-coverage for using it with pow).

test added with #1933

src/Reflection/InitializerExprTypeResolver.php

src/Type/Accessory/AccessoryNumericStringType.php

src/Type/Accessory/AccessoryNonFalsyStringType.php

src/Type/Accessory/AccessoryNonEmptyStringType.php

src/Type/Accessory/AccessoryLiteralStringType.php

ondrejmirtes · 2022-10-30T14:39:50Z

src/Type/MixedType.php

@@ -685,6 +685,14 @@ public function tryRemove(Type $typeToRemove): ?Type
 		return null;
 	}

+	public function exponentiate(Type $exponent): Type
+	{
+		return new BenevolentUnionType([


What if all numeric types are subtracted?

pow() supports a lot of types as exponent, see e.g. https://3v4l.org/ZtZVc

we would need a big union, which might not be really useful?

per https://www.php.net/manual/en/function.pow.php it supports mixed args, while phpstan only accepts int|float per functionMap.

src/Type/NullType.php

ondrejmirtes · 2022-10-30T14:40:50Z

src/Type/ObjectType.php

+	public function exponentiate(Type $exponent): Type
+	{
+		$object = new ObjectWithoutClassType();
+		if (!$exponent instanceof NeverType && !$object->isSuperTypeOf($this)->no() && !$object->isSuperTypeOf($exponent)->no()) {


Objects can be exponentiated? Huh?

yep, see

phpstan-src/tests/PHPStan/Analyser/data/pow.php

Lines 17 to 25 in 285b49f

function (\GMP $a, \GMP $b): void {

assertType('GMP', pow($a, $b));

assertType('GMP', $a ** $b);

};

function (\stdClass $a, \GMP $b): void {

assertType('GMP|stdClass', pow($a, $b));

assertType('GMP|stdClass', $a ** $b);

};

I moved this pre-exisiting logic from InitializerExprTypeResolver

src/Type/StaticType.php

src/Type/StringType.php

staabm · 2022-10-30T21:17:50Z

src/Type/FloatType.php

+		}
+
+		if ($exponent instanceof ConstantScalarType) {
+			if ($exponent->getValue() == 0) {


the cs-fixer will turn these into strict comparisons, which in turn breaks a lot of tests.
I think we should ignore these from the cs fixer

src/Type/Constant/ConstantIntegerType.php

ondrejmirtes · 2023-01-08T14:56:24Z

There are some conflicts.

staabm · 2023-01-08T20:55:29Z

resolved

ondrejmirtes

Otherwise 👍

ondrejmirtes · 2023-01-11T04:38:14Z

src/Type/FloatType.php

+	public function exponentiate(Type $exponent): Type
+	{
+		$helper = new ExponentiateHelper();
+		return $helper->exponentiate($this, $exponent);


It's weird to new this. Typically we inject these services through DI. But I understand that we're in a value object where DI is not accessible. In these cases I'd write this as a static method: ExponentiateHelper::exponentiate. Thanks.

good point, fixed.

ondrejmirtes · 2023-01-12T16:41:19Z

Thank you.

clxmstaab force-pushed the pow-interval branch from 24d9810 to f94aa04 Compare October 24, 2022 10:37

staabm marked this pull request as ready for review October 24, 2022 10:41

ondrejmirtes requested changes Oct 24, 2022

View reviewed changes

staabm marked this pull request as draft October 25, 2022 15:34

staabm force-pushed the pow-interval branch from ef66afe to 2e65824 Compare October 25, 2022 15:34

staabm force-pushed the pow-interval branch from 2e65824 to b23e226 Compare October 27, 2022 07:30

clxmstaab force-pushed the pow-interval branch 2 times, most recently from 1b6b658 to 47d98bf Compare October 27, 2022 09:24

staabm marked this pull request as ready for review October 27, 2022 09:26

clxmstaab force-pushed the pow-interval branch from 47d98bf to 44030cd Compare October 28, 2022 06:16

staabm commented Oct 28, 2022

View reviewed changes

staabm force-pushed the pow-interval branch from 44030cd to 2b7ed67 Compare October 28, 2022 06:36

staabm mentioned this pull request Oct 28, 2022

added operator-specifiying test for the pow-operator #1933

Merged

staabm force-pushed the pow-interval branch 2 times, most recently from 0ca4bbe to 7cc6be5 Compare October 30, 2022 13:46

ondrejmirtes requested changes Oct 30, 2022

View reviewed changes

staabm force-pushed the pow-interval branch from 811c855 to 2f34f83 Compare October 30, 2022 21:07

staabm commented Oct 30, 2022

View reviewed changes

staabm force-pushed the pow-interval branch 3 times, most recently from 7ca9ef5 to 8cdf131 Compare October 30, 2022 21:28

staabm commented Oct 30, 2022

View reviewed changes

src/Type/Constant/ConstantIntegerType.php Outdated Show resolved Hide resolved

staabm force-pushed the pow-interval branch from 8cdf131 to 2ea97a7 Compare October 31, 2022 07:38

staabm force-pushed the pow-interval branch from d49f1eb to 4116195 Compare November 8, 2022 19:40

staabm force-pushed the pow-interval branch from 4116195 to cdb0a58 Compare November 21, 2022 17:03

staabm force-pushed the pow-interval branch 2 times, most recently from 7595c93 to 2319a8f Compare December 13, 2022 20:34

ondrejmirtes force-pushed the 1.9.x branch from a5d90c1 to a69c7f0 Compare January 5, 2023 14:23

staabm force-pushed the pow-interval branch from 2319a8f to 682e318 Compare January 8, 2023 20:46

staabm force-pushed the pow-interval branch 2 times, most recently from 568f510 to a760a3c Compare January 9, 2023 13:16

clxmstaab force-pushed the pow-interval branch from 7a54fe3 to 18945c6 Compare January 10, 2023 12:43

ondrejmirtes requested changes Jan 11, 2023

View reviewed changes

staabm force-pushed the pow-interval branch 2 times, most recently from afe0b90 to 33c011a Compare January 11, 2023 18:50

staabm and others added 12 commits January 12, 2023 14:30

support integer-ranges in pow()

ece24e8

tests

1cc60ae

implement Type->exponentiate()

e20bcda

refined non-integer types

3d45a54

extracted callOperatorTypeSpecifyingExtensions()

a62a0a7

more tests

0ba9101

refactored logic into ExponentiateHelper

2d6c24c

Delete test.php

bb1d1c9

get rid of unnecessary instanceof

399a33a

cheap checks first

aa3de19

fix cs

09ba4d1

Update ExponentiateHelper.php

2275661

staabm force-pushed the pow-interval branch from 33c011a to 2275661 Compare January 12, 2023 13:30

ondrejmirtes merged commit ed14b2a into phpstan:1.9.x Jan 12, 2023

staabm deleted the pow-interval branch January 12, 2023 16:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

support integer-ranges in pow() #1904

support integer-ranges in pow() #1904

staabm commented Oct 24, 2022

staabm commented Oct 24, 2022

phpstan-bot commented Oct 24, 2022

ondrejmirtes left a comment

staabm commented Oct 26, 2022

ondrejmirtes commented Oct 26, 2022

ondrejmirtes commented Oct 26, 2022

phpstan-bot commented Oct 27, 2022

staabm commented Oct 27, 2022 •

edited

staabm Oct 28, 2022

staabm Oct 28, 2022

ondrejmirtes Oct 30, 2022

staabm Oct 30, 2022 •

edited

ondrejmirtes Oct 30, 2022

staabm Oct 30, 2022 •

edited

staabm Oct 30, 2022

ondrejmirtes commented Jan 8, 2023

staabm commented Jan 8, 2023

ondrejmirtes left a comment

ondrejmirtes Jan 11, 2023

staabm Jan 11, 2023

ondrejmirtes commented Jan 12, 2023

	function (\GMP $a, \GMP $b): void {
	assertType('GMP', pow($a, $b));
	assertType('GMP', $a ** $b);
	};

	function (\stdClass $a, \GMP $b): void {
	assertType('GMP\|stdClass', pow($a, $b));
	assertType('GMP\|stdClass', $a ** $b);
	};

support integer-ranges in pow() #1904

support integer-ranges in pow() #1904

Conversation

staabm commented Oct 24, 2022

staabm commented Oct 24, 2022

phpstan-bot commented Oct 24, 2022

ondrejmirtes left a comment

Choose a reason for hiding this comment

staabm commented Oct 26, 2022

ondrejmirtes commented Oct 26, 2022

ondrejmirtes commented Oct 26, 2022

phpstan-bot commented Oct 27, 2022

staabm commented Oct 27, 2022 • edited

staabm Oct 28, 2022

Choose a reason for hiding this comment

staabm Oct 28, 2022

Choose a reason for hiding this comment

ondrejmirtes Oct 30, 2022

Choose a reason for hiding this comment

staabm Oct 30, 2022 • edited

Choose a reason for hiding this comment

ondrejmirtes Oct 30, 2022

Choose a reason for hiding this comment

staabm Oct 30, 2022 • edited

Choose a reason for hiding this comment

staabm Oct 30, 2022

Choose a reason for hiding this comment

ondrejmirtes commented Jan 8, 2023

staabm commented Jan 8, 2023

ondrejmirtes left a comment

Choose a reason for hiding this comment

ondrejmirtes Jan 11, 2023

Choose a reason for hiding this comment

staabm Jan 11, 2023

Choose a reason for hiding this comment

ondrejmirtes commented Jan 12, 2023

staabm commented Oct 27, 2022 •

edited

staabm Oct 30, 2022 •

edited

staabm Oct 30, 2022 •

edited