Skip to content

Commit 8484792

Browse files
vladvildanovvladvildanov
authored
Merge branch 'v2.x' into vv-set-explicit-null-argument-fix
2 parents 3e5594d + 5d22ed7 commit 8484792

19 files changed

+72
-39
lines changed

‎.github/workflows/stack.yml

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ jobs:
3333
- '8.3'
3434
redis:
3535
- latest
36+
- edge
3637

3738
continue-on-error: ${{ matrix.php == '8.3' }}
3839

‎examples/transaction_using_cas.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function zpop($client, $key)
3232
'cas' => true, // Initialize with support for CAS operations
3333
'watch' => $key, // Key that needs to be WATCHed to detect changes
3434
'retry' => 3, // Number of retries on aborted transactions, after
35-
// which the client bails out with an exception.
35+
// which the client bails out with an exception.
3636
];
3737

3838
$client->transaction($options, function ($tx) use ($key, &$element) {

‎src/Collection/Iterator/CursorBasedIterator.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ public function next()
176176
$this->fetch();
177177
}
178178

179-
if ($this->elements) {
180-
$this->extractNext();
181-
} elseif ($this->cursor) {
182-
goto tryFetch;
183-
} else {
184-
$this->valid = false;
185-
}
179+
if ($this->elements) {
180+
$this->extractNext();
181+
} elseif ($this->cursor) {
182+
goto tryFetch;
183+
} else {
184+
$this->valid = false;
185+
}
186186
}
187187

188188
/**

‎src/Command/Processor/KeyPrefixProcessor.php

+1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public function __construct($prefix)
9494
'SDIFF' => $prefixAll,
9595
'SDIFFSTORE' => $prefixAll,
9696
'SMEMBERS' => $prefixFirst,
97+
'SMISMEMBER' => $prefixFirst,
9798
'SRANDMEMBER' => $prefixFirst,
9899
'ZADD' => $prefixFirst,
99100
'ZINCRBY' => $prefixFirst,

‎src/Connection/RelayConnection.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class RelayConnection extends StreamConnection
5757
/**
5858
* The Relay instance.
5959
*
60-
* @var \Relay\Relay
60+
* @var Relay
6161
*/
6262
protected $client;
6363

@@ -151,7 +151,7 @@ protected function assertParameters(ParametersInterface $parameters)
151151
/**
152152
* Creates a new instance of the client.
153153
*
154-
* @return \Relay\Relay
154+
* @return Relay
155155
*/
156156
private function createClient()
157157
{
@@ -189,7 +189,7 @@ private function createClient()
189189
/**
190190
* Returns the underlying client.
191191
*
192-
* @return \Relay\Relay
192+
* @return Relay
193193
*/
194194
public function getClient()
195195
{

‎src/Pipeline/RelayPipeline.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class RelayPipeline extends Pipeline
3131
*/
3232
protected function executePipeline(ConnectionInterface $connection, SplQueue $commands)
3333
{
34-
/** @var \Predis\Connection\RelayConnection $connection */
34+
/** @var RelayConnection $connection */
3535
$client = $connection->getClient();
3636

3737
$throw = $this->client->getOptions()->exceptions;

‎tests/PHPUnit/ArrayHasSameValuesConstraint.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/**
1414
* PHPUnit constraint matching arrays with same elements even in different order.
1515
*/
16-
class ArrayHasSameValuesConstraint extends \PHPUnit\Framework\Constraint\Constraint
16+
class ArrayHasSameValuesConstraint extends PHPUnit\Framework\Constraint\Constraint
1717
{
1818
protected $array;
1919

‎tests/PHPUnit/PredisCommandTestCase.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ abstract class PredisCommandTestCase extends PredisTestCase
2222
/**
2323
* Returns the expected command for tests.
2424
*
25-
* @return Command\CommandInterface|string Instance or FQCN of the expected command
25+
* @return CommandInterface|string Instance or FQCN of the expected command
2626
*/
2727
abstract protected function getExpectedCommand(): string;
2828

@@ -36,13 +36,13 @@ abstract protected function getExpectedId(): string;
3636
/**
3737
* Returns a new command instance.
3838
*
39-
* @return Command\CommandInterface
39+
* @return CommandInterface
4040
*/
41-
public function getCommand(): Command\CommandInterface
41+
public function getCommand(): CommandInterface
4242
{
4343
$command = $this->getExpectedCommand();
4444

45-
return $command instanceof Command\CommandInterface ? $command : new $command();
45+
return $command instanceof CommandInterface ? $command : new $command();
4646
}
4747

4848
/**

‎tests/PHPUnit/PredisTestCase.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
/**
2222
* Base test case class for the Predis test suite.
2323
*/
24-
abstract class PredisTestCase extends \PHPUnit\Framework\TestCase
24+
abstract class PredisTestCase extends PHPUnit\Framework\TestCase
2525
{
2626
protected $redisServerVersion;
2727
protected $redisJsonVersion;
@@ -150,7 +150,7 @@ public function assertSameWithPrecision($expected, $actual, int $precision = 0,
150150
* Asserts that a string matches a given regular expression.
151151
*
152152
* @throws ExpectationFailedException
153-
* @throws \SebastianBergmann\RecursionContext\InvalidArgumentException
153+
* @throws SebastianBergmann\RecursionContext\InvalidArgumentException
154154
*/
155155
public static function assertMatchesRegularExpression(string $pattern, string $string, $message = ''): void
156156
{
@@ -295,7 +295,7 @@ protected function getMockConnectionOfType(string $interface, $parameters = null
295295
if (!is_a($interface, '\Predis\Connection\NodeConnectionInterface', true)) {
296296
$method = __METHOD__;
297297

298-
throw new \InvalidArgumentException(
298+
throw new InvalidArgumentException(
299299
"Argument `\$interface` for $method() expects a type implementing Predis\Connection\NodeConnectionInterface"
300300
);
301301
}
@@ -423,7 +423,7 @@ public function isRedisServerVersion(string $operator, string $version): bool
423423
* decorates test methods while the version of the Redis server used to run
424424
* integration tests is retrieved directly from the server by using `INFO`.
425425
*
426-
* @throws \PHPUnit\Framework\SkippedTestError When the required Redis server version is not met
426+
* @throws PHPUnit\Framework\SkippedTestError When the required Redis server version is not met
427427
*/
428428
protected function checkRequiredRedisServerVersion(): void
429429
{

‎tests/PHPUnit/RedisCommandConstraint.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/**
1717
* PHPUnit constraint to verify that a Redis command matches certain conditions.
1818
*/
19-
class RedisCommandConstraint extends \PHPUnit\Framework\Constraint\Constraint
19+
class RedisCommandConstraint extends PHPUnit\Framework\Constraint\Constraint
2020
{
2121
protected $commandID;
2222
protected $arguments;

‎tests/Predis/ClientTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ public function testConstructorWithClusterArgument(): void
225225
*/
226226
public function testConstructorWithReplicationArgument(): void
227227
{
228-
$replication = new Connection\Replication\MasterSlaveReplication();
228+
$replication = new MasterSlaveReplication();
229229

230230
$factory = new Connection\Factory();
231231
$replication->add($factory->create('tcp://host1?alias=master'));
@@ -912,7 +912,7 @@ public function testGetClientByMethodSupportsSelectingConnectionByRole(): void
912912
*/
913913
public function testGetClientByMethodSupportsSelectingConnectionByCommand(): void
914914
{
915-
$command = \Predis\Command\RawCommand::create('GET', 'key');
915+
$command = Command\RawCommand::create('GET', 'key');
916916
$connection = $this->getMockBuilder('Predis\Connection\ConnectionInterface')->getMock();
917917

918918
$aggregate = $this->getMockBuilder('Predis\Connection\AggregateConnectionInterface')
@@ -1209,7 +1209,7 @@ public function testGetIteratorWithTraversableConnections(): void
12091209
$connection2 = $this->getMockConnection('tcp://127.0.0.1:6382');
12101210
$connection3 = $this->getMockConnection('tcp://127.0.0.1:6383');
12111211

1212-
$aggregate = new \Predis\Connection\Cluster\PredisCluster();
1212+
$aggregate = new Connection\Cluster\PredisCluster();
12131213

12141214
$aggregate->add($connection1);
12151215
$aggregate->add($connection2);

‎tests/Predis/Collection/Iterator/HashKeyTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function testIterationWithNoResults(): void
6363
->with('key:hash', 0, [])
6464
->willReturn(
6565
[0, [],
66-
]);
66+
]);
6767

6868
$iterator = new HashKey($client, 'key:hash');
6969

‎tests/Predis/Command/Processor/KeyPrefixProcessorTest.php

+4
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,10 @@ public function commandArgumentsDataProvider(): array
633633
['key'],
634634
['prefix:key'],
635635
],
636+
['SMISMEMBER',
637+
['key', 'member1', 'member2', 'member3'],
638+
['prefix:key', 'member1', 'member2', 'member3'],
639+
],
636640
['SRANDMEMBER',
637641
['key', 1],
638642
['prefix:key', 1],

‎tests/Predis/Command/Redis/Search/FTCREATE_Test.php

+27
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Predis\Command\Argument\Search\SchemaFields\NumericField;
1717
use Predis\Command\Argument\Search\SchemaFields\TagField;
1818
use Predis\Command\Argument\Search\SchemaFields\TextField;
19+
use Predis\Command\Argument\Search\SchemaFields\VectorField;
1920
use Predis\Command\Redis\PredisCommandTestCase;
2021

2122
/**
@@ -86,6 +87,32 @@ public function testCreatesSearchIndexWithGivenArgumentsAndSchema(): void
8687
$this->assertEquals('OK', $actualResponse);
8788
}
8889

90+
/**
91+
* @group connected
92+
* @group relay-resp3
93+
* @return void
94+
* @requiresRediSearchVersion >= 2.9.0
95+
*/
96+
public function testCreatesSearchIndexWithFloat16Vector(): void
97+
{
98+
$redis = $this->getClient();
99+
100+
$schema = [
101+
new VectorField('float16',
102+
'FLAT',
103+
['TYPE', 'FLOAT16', 'DIM', 768, 'DISTANCE_METRIC', 'COSINE']
104+
),
105+
new VectorField('bfloat16',
106+
'FLAT',
107+
['TYPE', 'BFLOAT16', 'DIM', 768, 'DISTANCE_METRIC', 'COSINE']
108+
),
109+
];
110+
111+
$actualResponse = $redis->ftcreate('index', $schema);
112+
113+
$this->assertEquals('OK', $actualResponse);
114+
}
115+
89116
public function argumentsProvider(): array
90117
{
91118
return [

‎tests/Predis/Command/Redis/TimeSeries/TSINFO_Test.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ public function testParseResponse(): void
6363
* @group connected
6464
* @group relay-resp3
6565
* @return void
66-
* @requiresRedisTimeSeriesVersion >= 1.0.0
66+
* @requiresRedisTimeSeriesVersion <= 1.10.13
6767
*/
6868
public function testReturnsInformationAboutGivenTimeSeries(): void
6969
{
7070
$redis = $this->getClient();
7171
$expectedResponse = ['totalSamples', 0, 'memoryUsage', 4239, 'firstTimestamp', 0, 'lastTimestamp', 0,
7272
'retentionTime', 60000, 'chunkCount', 1, 'chunkSize', 4096, 'chunkType', 'compressed', 'duplicatePolicy',
73-
'max', 'labels', [['sensor_id', '2'], ['area_id', '32']], 'sourceKey', null, 'rules', []];
73+
'max', 'labels', [['sensor_id', '2'], ['area_id', '32']], 'sourceKey', null, 'rules', []];
7474

7575
$arguments = (new CreateArguments())
7676
->retentionMsecs(60000)

‎tests/Predis/CommunicationExceptionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function testCommunicationExceptionHandlingWhenShouldResetConnectionIsFal
117117
* @param int $code Exception code.
118118
* @param Exception $inner Inner exception.
119119
*
120-
* @return \Predis\CommunicationException
120+
* @return CommunicationException
121121
*/
122122
protected function createMockException(
123123
Connection\NodeConnectionInterface $connection,

‎tests/Predis/Configuration/Option/ConnectionsTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function testDefaultOptionValue(): void
3636
*/
3737
public function testAcceptsNamedArrayWithSchemeToConnectionClassMappings(): void
3838
{
39-
/** @var \Predis\Configuration\OptionsInterface */
39+
/** @var OptionsInterface */
4040
$options = $this->getMockBuilder('Predis\Configuration\OptionsInterface')->getMock();
4141

4242
$class = get_class($this->getMockBuilder('Predis\Connection\NodeConnectionInterface')->getMock());
@@ -139,7 +139,7 @@ public function testUsesParametersOptionToSetDefaultParameters(): void
139139
{
140140
$parameters = ['database' => 5, 'password' => 'mypassword'];
141141

142-
/** @var \Predis\Configuration\OptionsInterface|\PHPUnit\Framework\MockObject\MockObject\MockObject */
142+
/** @var OptionsInterface|\PHPUnit\Framework\MockObject\MockObject\MockObject */
143143
$options = $this->getMockBuilder('Predis\Configuration\OptionsInterface')->getMock();
144144
$options
145145
->expects($this->once())
@@ -184,7 +184,7 @@ public function testAcceptsCallableReturningConnectionFactoryInstance(): void
184184
{
185185
$option = new Connections();
186186

187-
/** @var \Predis\Configuration\OptionsInterface */
187+
/** @var OptionsInterface */
188188
$options = $this->getMockBuilder('Predis\Configuration\OptionsInterface')->getMock();
189189

190190
$callable = $this->getMockBuilder('stdClass')
@@ -211,7 +211,7 @@ public function testThrowsExceptionOnInvalidArguments(): void
211211

212212
$option = new Connections();
213213

214-
/** @var \Predis\Configuration\OptionsInterface */
214+
/** @var OptionsInterface */
215215
$options = $this->getMockBuilder('Predis\Configuration\OptionsInterface')->getMock();
216216

217217
$option->filter($options, new stdClass());

‎tests/Predis/Connection/Cluster/RedisClusterTest.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ public function testGetIteratorReturnsConnectionsMappedInSlotsMapFetchedFromRedi
336336
);
337337

338338
// TODO: I'm not sure about mocking a protected method, but it'll do for now
339-
/** @var Connection\Cluster\RedisCluster|MockObject */
339+
/** @var RedisCluster|MockObject */
340340
$cluster = $this->getMockBuilder('Predis\Connection\Cluster\RedisCluster')
341341
->onlyMethods(['getRandomConnection'])
342342
->setConstructorArgs([$factory])
@@ -716,7 +716,7 @@ public function testRetriesExecutingCommandOnConnectionFailureButDoNotAskSlotMap
716716
->willReturn($connection4);
717717

718718
// TODO: I'm not sure about mocking a protected method, but it'll do for now
719-
/** @var Connection\Cluster\RedisCluster|MockObject */
719+
/** @var RedisCluster|MockObject */
720720
$cluster = $this->getMockBuilder('Predis\Connection\Cluster\RedisCluster')
721721
->onlyMethods(['getRandomConnection'])
722722
->setConstructorArgs([$factory])
@@ -823,7 +823,7 @@ public function testAskSlotMapRetriesOnDifferentNodeOnConnectionFailure(): void
823823
->method('create');
824824

825825
// TODO: I'm not sure about mocking a protected method, but it'll do for now
826-
/** @var Connection\Cluster\RedisCluster|MockObject */
826+
/** @var RedisCluster|MockObject */
827827
$cluster = $this->getMockBuilder('Predis\Connection\Cluster\RedisCluster')
828828
->onlyMethods(['getRandomConnection'])
829829
->setConstructorArgs([$factory])
@@ -889,7 +889,7 @@ public function testAskSlotMapHonorsRetryLimitOnMultipleConnectionFailures(): vo
889889
->method('create');
890890

891891
// TODO: I'm not sure about mocking a protected method, but it'll do for now
892-
/** @var Connection\Cluster\RedisCluster|MockObject */
892+
/** @var RedisCluster|MockObject */
893893
$cluster = $this->getMockBuilder('Predis\Connection\Cluster\RedisCluster')
894894
->onlyMethods(['getRandomConnection'])
895895
->setConstructorArgs([$factory])
@@ -1427,7 +1427,7 @@ public function testQueryClusterNodeForSlotMapPauseDurationOnRetry()
14271427
->method('create');
14281428

14291429
// TODO: I'm not sure about mocking a protected method, but it'll do for now
1430-
/** @var Connection\Cluster\RedisCluster|MockObject */
1430+
/** @var RedisCluster|MockObject */
14311431
$cluster = $this->getMockBuilder('Predis\Connection\Cluster\RedisCluster')
14321432
->onlyMethods(['getRandomConnection'])
14331433
->setConstructorArgs([$factory])

‎tests/bootstrap.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
if (file_exists(__DIR__ . '/../autoload.php')) {
1414
require __DIR__ . '/../autoload.php';
15-
} elseif (@include('Predis/Autoloader.php')) {
15+
} elseif (@include ('Predis/Autoloader.php')) {
1616
Predis\Autoloader::register();
1717
} else {
1818
exit('ERROR: Unable to find a suitable mean to register Predis\Autoloader.');

0 commit comments

Comments
 (0)