Skip to content

Improve count on list with greater/smaller-than #4507

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 10 commits into
base: 2.1.x
Choose a base branch
from
+118 −1
Open

Improve count on list with greater/smaller-than #4507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2f6d369
Improve `count` on `list` with greater/smaller-than
staabm Oct 31, 2025
a34755e
Update bug-13747.php
staabm Oct 31, 2025
b2494e8
Update TypeSpecifier.php
staabm Oct 31, 2025
3501ad1
Update bug-13747.php
staabm Oct 31, 2025
9c4b491
Update bug-13747.php
staabm Oct 31, 2025
4ade53d
Update TypeSpecifier.php
staabm Oct 31, 2025
b9ebfb8
more tests
staabm Oct 31, 2025
7666ba4
test limits
staabm Oct 31, 2025
335960e
Update bug-13747.php
staabm Nov 2, 2025
fc8643e
test different count() variants
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
25 changes: 24 additions & 1 deletion src/Analyser/TypeSpecifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
use PHPStan\Type\Accessory\AccessoryNonEmptyStringType;
use PHPStan\Type\Accessory\AccessoryNonFalsyStringType;
use PHPStan\Type\Accessory\HasOffsetType;
use PHPStan\Type\Accessory\HasOffsetValueType;
use PHPStan\Type\Accessory\HasPropertyType;
use PHPStan\Type\Accessory\NonEmptyArrayType;
use PHPStan\Type\ArrayType;
Expand Down Expand Up @@ -92,6 +93,8 @@
final class TypeSpecifier
{

private const MAX_ACCESSORIES_LIMIT = 8;

/** @var MethodTypeSpecifyingExtension[][]|null */
private ?array $methodTypeSpecifyingExtensionsByClass = null;

Expand Down Expand Up @@ -1197,7 +1200,27 @@ private function specifyTypesForCountFuncCall(
$builderData[] = [$offsetType, $arrayType->getOffsetValueType($offsetType), !$hasOffset->yes()];
}
} else {
$resultTypes[] = TypeCombinator::intersect($arrayType, new NonEmptyArrayType());
$intersection = [];
$intersection[] = $arrayType;
$intersection[] = new NonEmptyArrayType();

$zero = new ConstantIntegerType(0);
$i = 0;
foreach ($builderData as [$offsetType, $valueType]) {
// non-empty-list already implies the offset 0
if ($zero->isSuperTypeOf($offsetType)->yes()) {
continue;
}

if ($i > self::MAX_ACCESSORIES_LIMIT) {
break;
}

$intersection[] = new HasOffsetValueType($offsetType, $valueType);
$i++;
}

$resultTypes[] = TypeCombinator::intersect(...$intersection);
continue;
}

Expand Down
1 change: 1 addition & 0 deletions tests/PHPStan/Analyser/nsrt/bug-11642.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ function doFoo() {
if (count($entries) !== count($payload->ids)) {
exit();
}
assertType('int<1, max>', count($entries));

assertType('non-empty-list<stdClass>', $entries);
if (count($entries) > 3) {
Expand Down
93 changes: 93 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-13747.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<?php declare(strict_types = 1);

namespace Bug13747;

use function PHPStan\Testing\assertType;

class HelloWorld
{
/** @param list<int> $list */
public function count($list): void
{
if (count($list) === 0) {
return;
}

if (count($list) > 2) {
assertType('non-empty-list<int>&hasOffsetValue(1, int)&hasOffsetValue(2, int)', $list);
assertType('int<3, max>', count($list));
} else {
assertType('non-empty-list<int>', $list);
}
assertType('non-empty-list<int>', $list);

if (count($list, COUNT_NORMAL) > 2) {
assertType('non-empty-list<int>&hasOffsetValue(1, int)&hasOffsetValue(2, int)', $list);
assertType('int<3, max>', count($list, COUNT_NORMAL));
} else {
assertType('non-empty-list<int>', $list);
}

assertType('non-empty-list<int>', $list);
if (count($list, COUNT_RECURSIVE) > 2) { // COUNT_RECURSIVE on non-recursive array
assertType('non-empty-list<int>&hasOffsetValue(1, int)&hasOffsetValue(2, int)', $list);
assertType('int<3, max>', count($list, COUNT_RECURSIVE));
} else {
assertType('non-empty-list<int>', $list);
}
}

/** @param list<int> $list */
public function doFoo($list): void
{
if (count($list) === 0) {
return;
}

if (count($list) >= 2) {
assertType('non-empty-list<int>&hasOffsetValue(1, int)', $list);
assertType('int<2, max>', count($list));
} else {
assertType('non-empty-list<int>', $list);
}
}

/** @param list<int> $list */
public function doBar($list): void
{
if (count($list) === 0) {
return;
}

if (2 <= count($list)) {
assertType('non-empty-list<int>&hasOffsetValue(1, int)', $list);
assertType('int<2, max>', count($list));
} else {
assertType('non-empty-list<int>', $list);
assertType('1', count($list));
}
}

/** @param list<int> $list */
public function checkLimit($list): void
{
if (count($list) === 0) {
return;
}

if (count($list) > 9) {
assertType('non-empty-list<int>&hasOffsetValue(1, int)&hasOffsetValue(2, int)&hasOffsetValue(3, int)&hasOffsetValue(4, int)&hasOffsetValue(5, int)&hasOffsetValue(6, int)&hasOffsetValue(7, int)&hasOffsetValue(8, int)&hasOffsetValue(9, int)', $list);
assertType('int<10, max>', count($list));
} else {
assertType('non-empty-list<int>', $list);
}

if (count($list) > 10) {
assertType('non-empty-list<int>&hasOffsetValue(1, int)&hasOffsetValue(2, int)&hasOffsetValue(3, int)&hasOffsetValue(4, int)&hasOffsetValue(5, int)&hasOffsetValue(6, int)&hasOffsetValue(7, int)&hasOffsetValue(8, int)&hasOffsetValue(9, int)', $list);
assertType('int<11, max>', count($list));
} else {
assertType('non-empty-list<int>', $list);
}

}
}
Loading