Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-30 12:39:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix PHP 8.4 implicit nullable parameter deprecations in Predis library

Browse source 
PHP 8.4 deprecates implicitly nullable parameter types. Parameters with a default value of `null` must now be explicitly marked as nullable (e.g., `?Type $var = null`).

This change updates the vendored `Predis` library in `plugins/cache-redis/` to comply with this requirement. It scans for function signatures like `Type $var = null` and updates them to `?Type $var = null`. This ensures compatibility with PHP 8.4 and PHP 8.5 while maintaining backward compatibility.

Affected files include `Predis` interfaces, connection classes, and command definitions.
Also updated PHPDoc `@method` annotations to reflect nullable types.
This commit is contained in:
google-labs-jules[bot] 2026-01-16 15:11:52 +00:00
parent c95f5fcf98
commit 2548ed59da
15 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php
View file

@ -52,7 +52,7 @@ class PredisCluster implements ClusterInterface, IteratorAggregate, Countable
/**
* @param StrategyInterface $strategy Optional cluster strategy.
*/
public function __construct(StrategyInterface $strategy = null)
public function __construct(?StrategyInterface $strategy = null)
{
$this->strategy = $strategy ?: new PredisStrategy();
$this->distributor = $this->strategy->getDistributor();

4
plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php
View file

@ -70,7 +70,7 @@ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable
*/
public function __construct(
FactoryInterface $connections,
StrategyInterface $strategy = null
?StrategyInterface $strategy = null
) {
$this->connections = $connections;
$this->strategy = $strategy ?: new RedisClusterStrategy();
@ -273,7 +273,7 @@ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable
*
* @param NodeConnectionInterface $connection Optional connection instance.
*/
public function askSlotMap(NodeConnectionInterface $connection = null)
public function askSlotMap(?NodeConnectionInterface $connection = null)
{
if (!$connection && !$connection = $this->getRandomConnection()) {
return;

2
plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php
View file

@ -31,7 +31,7 @@ class CompositeStreamConnection extends StreamConnection implements CompositeCon
*/
public function __construct(
ParametersInterface $parameters,
ProtocolProcessorInterface $protocol = null
?ProtocolProcessorInterface $protocol = null
) {
$this->parameters = $this->assertParameters($parameters);
$this->protocol = $protocol ?: new TextProtocolProcessor();

4
plugins/cache-redis/Predis/Connection/RelayMethods.php
View file

@ -32,7 +32,7 @@ trait RelayMethods
* @param string $pattern
* @return bool
*/
public function onInvalidated(?callable $callback, string $pattern = null)
public function onInvalidated(?callable $callback, ?string $pattern = null)
{
return $this->client->onInvalidated($callback, $pattern);
}
@ -129,7 +129,7 @@ trait RelayMethods
* @param ?int $db
* @return bool
*/
public function flushMemory(string $endpointId = null, int $db = null)
public function flushMemory(?string $endpointId = null, ?int $db = null)
{
return $this->client->flushMemory($endpointId, $db);
}

2
plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php
View file

@ -72,7 +72,7 @@ class MasterSlaveReplication implements ReplicationInterface
/**
* {@inheritdoc}
*/
public function __construct(ReplicationStrategy $strategy = null)
public function __construct(?ReplicationStrategy $strategy = null)
{
$this->strategy = $strategy ?: new ReplicationStrategy();
}

2
plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php
View file

@ -123,7 +123,7 @@ class SentinelReplication implements ReplicationInterface
$service,
array $sentinels,
ConnectionFactoryInterface $connectionFactory,
ReplicationStrategy $strategy = null
?ReplicationStrategy $strategy = null
) {
$this->sentinels = $sentinels;
$this->service = $service;