Skip to content
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

Jump to bottom

Fix MinMaxReturnTypeProvider when handling TDependentListKeys #8567

Merged
merged 1 commit into from
Oct 11, 2022
Merged

Fix MinMaxReturnTypeProvider when handling TDependentListKeys #8567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/Psalm/Internal/Provider/ReturnTypeProvider/MinMaxReturnTypeProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@
use Psalm\Plugin\EventHandler\Event\FunctionReturnTypeProviderEvent;
use Psalm\Plugin\EventHandler\FunctionReturnTypeProviderInterface;
use Psalm\Type;
use Psalm\Type\Atomic\TDependentListKey;
use Psalm\Type\Atomic\TInt;
use Psalm\Type\Atomic\TIntRange;
use Psalm\Type\Atomic\TLiteralInt;
use Psalm\Type\Atomic\TPositiveInt;
use Psalm\Type\Union;
use UnexpectedValueException;

use function array_filter;
use function assert;
use function count;
use function get_class;
use function in_array;
use function max;
use function min;
Expand Down Expand Up @@ -72,11 +71,12 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
} elseif ($atomic_type instanceof TPositiveInt) {
$min_bounds[] = 1;
$max_bounds[] = null;
} elseif (get_class($atomic_type) === TInt::class) {
} elseif ($atomic_type instanceof TDependentListKey) {
$min_bounds[] = 0;
$max_bounds[] = null;
} else {//already guarded by the `instanceof TInt` check above
$min_bounds[] = null;
$max_bounds[] = null;
} else {
throw new UnexpectedValueException('Unexpected type');
}
}
} else {
Expand Down
53 changes: 53 additions & 0 deletions tests/ReturnTypeProvider/MinMaxReturnTypeProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php

namespace Psalm\Tests\ReturnTypeProvider;

use Psalm\Tests\TestCase;
use Psalm\Tests\Traits\ValidCodeAnalysisTestTrait;

class MinMaxReturnTypeProviderTest extends TestCase
{
use ValidCodeAnalysisTestTrait;

public function providerValidCodeParse(): iterable
{
yield 'literalInt' => [
'<?php
$min = min(1, 2);
$max = max(3, 4);
',
[
'$min' => 'int',
'$max' => 'int',
],
];
yield 'nonInt' => [
'<?php
$min = min("a", "b");
$max = max("x", "y");
',
[
'$min' => 'string',
'$max' => 'string',
],
];
yield 'maxIntRange' => [
'<?php
$headers = fgetcsv(fopen("test.txt", "r"));
$h0 = $h1 = null;
foreach($headers as $i => $v) {
if ($v === "") $h0 = $i;
if ($v === "") $h1 = $i;
}
if ($h0 === null || $h1 === null) throw new \Exception();

$min = min($h0, $h1);
$max = max($h0, $h1);
',
[
'$min' => 'int<0, max>',
'$max' => 'int<0, max>',
],
];
}
}