Skip to content

Improve inference on FuncCall === FuncCall #4513

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: 2.1.x
Choose a base branch
from
+98 −2
Open

Improve inference on FuncCall === FuncCall #4513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9867a23
Improve inference on FuncCall === FuncCall
staabm Nov 2, 2025
d267c73
cleanup
staabm Nov 2, 2025
48f5ada
more tests
staabm Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions src/Analyser/TypeSpecifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2242,13 +2242,40 @@ public function resolveEqual(Expr\BinaryOp\Equal $expr, Scope $scope, TypeSpecif

public function resolveIdentical(Expr\BinaryOp\Identical $expr, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
{
// Normalize to: fn() === expr
$leftExpr = $expr->left;
$rightExpr = $expr->right;

// Normalize to: fn() === expr
if ($rightExpr instanceof FuncCall && !$leftExpr instanceof FuncCall) {
[$leftExpr, $rightExpr] = [$rightExpr, $leftExpr];
$specifiedTypes = $this->resolveNormalizedIdentical(new Expr\BinaryOp\Identical(
$rightExpr,
$leftExpr,
), $scope, $context);
} else {
$specifiedTypes = $this->resolveNormalizedIdentical(new Expr\BinaryOp\Identical(
$leftExpr,
$rightExpr,
), $scope, $context);
}
Comment on lines +2248 to +2259
Copy link
Contributor Author

@staabm staabm Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

moved already existing normalization logic here


// merge result of fn1() === fn2() and fn2() === fn1()
if ($rightExpr instanceof FuncCall && $leftExpr instanceof FuncCall) {
Copy link
Contributor Author

@staabm staabm Nov 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the actual new logic

return $specifiedTypes->unionWith(
$this->resolveNormalizedIdentical(new Expr\BinaryOp\Identical(
$rightExpr,
$leftExpr,
), $scope, $context),
);
}

return $specifiedTypes;
}

private function resolveNormalizedIdentical(Expr\BinaryOp\Identical $expr, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
{
$leftExpr = $expr->left;
$rightExpr = $expr->right;

$unwrappedLeftExpr = $leftExpr;
if ($leftExpr instanceof AlwaysRememberedExpr) {
$unwrappedLeftExpr = $leftExpr->getExpr();
Expand Down
69 changes: 69 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-13749.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?php declare(strict_types = 1);

namespace Bug13749;

use function PHPStan\Testing\assertType;

class HelloWorld
{
/**
* @param non-empty-string $nonES
*/
public function sayNonEmpty(string $s, string $nonES): void
{
if (strlen($nonES) === strlen($s)) {
assertType('non-empty-string', $s);
}
if (strlen($nonES) >= strlen($s)) {
assertType('string', $s); // could be non-empty-string
}

if (strlen($s) === strlen($nonES)) {
assertType('non-empty-string', $s);
}
if (strlen($s) >= strlen($nonES)) {
assertType('non-empty-string', $s);
}
}

/**
* @param non-falsy-string $nonFalsy
*/
public function sayNonFalsy(string $s, string $nonFalsy): void
{
if (strlen($nonFalsy) === strlen($s)) {
assertType('non-empty-string', $s);
}
if (strlen($nonFalsy) >= strlen($s)) {
assertType('string', $s); // could be non-empty-string
}

if (strlen($s) === strlen($nonFalsy)) {
assertType('non-empty-string', $s);
}
if (strlen($s) >= strlen($nonFalsy)) {
assertType('non-empty-string', $s);
}
}

/**
* @param non-empty-array $nonEmptyArr
*/
public function sayCount(array $arr, array $nonEmptyArr): void
{
if (count($arr) === count($nonEmptyArr)) {
assertType('non-empty-array', $arr);
assertType('non-empty-array', $nonEmptyArr);
}
assertType('array', $arr);
assertType('non-empty-array', $nonEmptyArr);

if (count($nonEmptyArr) === count($arr)) {
assertType('non-empty-array', $arr);
assertType('non-empty-array', $nonEmptyArr);
}
assertType('array', $arr);
assertType('non-empty-array', $nonEmptyArr);
}

}
Loading