Skip to content

[6.x] Fix the return type of spop for phpredis #36106

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 4 commits into from
Feb 1, 2021
Merged

[6.x] Fix the return type of spop for phpredis #36106

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1ad7a18
PhpRedis return value of spop compatibility
zingimmick Feb 1, 2021
d8b3bd3
fix style
zingimmick Feb 1, 2021
d0a9735
use func_get_args() instead of [$key, $count]
zingimmick Feb 1, 2021
59a8943
Update PhpRedisConnection.php
taylorotwell Feb 1, 2021
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
Prev Previous commit
Next Next commit
use func_get_args() instead of [$key, $count]
  • Loading branch information
@zingimmick
zingimmick authored Feb 1, 2021
commit d0a97359e23d734f443fe5ddeeb273aa69c3f53f
10 changes: 3 additions & 7 deletions src/Illuminate/Redis/Connections/PhpRedisConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,14 +195,10 @@ public function brpop(...$arguments)
* @param int|null $count
* @return mixed|false
*/
public function spop($key, $count = null)
public function spop($key, $count = 1)
{
$parameters = [$key];
if ($count !== null) {
$parameters[] = $count;
}

return $this->command('sPop', $parameters);
// use func_get_args() instead of [$key, $count] to fix the return type when called without the count argument.
return $this->command('spop', func_get_args());
}

/**
Expand Down