Skip to content

Fix RedisCluster::multi() return type #4283

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

Merged
merged 3 commits into from
Sep 4, 2025
Merged

Fix RedisCluster::multi() return type #4283

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c74a5d6
Fix `RedisCluster::multi()` return type
sayuprc Sep 4, 2025
ec5642d
Update test placement and contents
sayuprc Sep 4, 2025
119d21e
Remove unnecessary test cases
sayuprc Sep 4, 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
2 changes: 1 addition & 1 deletion resources/functionMap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8896,7 +8896,7 @@
'RedisCluster::mget' => ['array', 'array'=>'array'],
'RedisCluster::mset' => ['bool', 'array'=>'array'],
'RedisCluster::msetnx' => ['int', 'array'=>'array'],
'RedisCluster::multi' => ['Redis', 'mode='=>'int'],
'RedisCluster::multi' => ['__benevolent<RedisCluster|bool>', 'mode='=>'int'],
'RedisCluster::object' => ['string', 'string='=>'string', 'key='=>'string'],
'RedisCluster::persist' => ['bool', 'key'=>'string'],
'RedisCluster::pExpire' => ['bool', 'key'=>'string', 'ttl'=>'int'],
Expand Down
14 changes: 14 additions & 0 deletions tests/PHPStan/Rules/Debug/DumpTypeRuleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,18 @@ public function testBug11179NoNamespace(): void
]);
}

public function testBug13392(): void
{
$this->analyse([__DIR__ . '/data/bug-13392.php'], [
[
'Dumped type: RedisCluster',
15,
],
[
'Dumped type: (bool|RedisCluster)',
18,
],
]);
}

}
19 changes: 19 additions & 0 deletions tests/PHPStan/Rules/Debug/data/bug-13392.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php declare(strict_types = 1);

namespace Bug13392;

use RedisCluster;

interface Client
{
public function get(): RedisCluster;
}

function func(Client $client): void
{
$redisCluster = $client->get();
\PHPStan\dumpType($redisCluster);

$transaction = $redisCluster->multi();
\PHPStan\dumpType($transaction);
Copy link
Member

Choose a reason for hiding this comment

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

Instead of this, use assertType function and put this under tests/PHPStan/Analyser/nsrt. That's the usual place for type inference tests.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed in ec5642d.

}
Loading