Skip to content

Commit d18e468

Browse files
vladvildanovvladvildanov
committed
Codestyle fixes
1 parent 4178b45 commit d18e468

24 files changed

+78
-80
lines changed

‎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/Argument/Search/SchemaFields/AbstractField.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ abstract class AbstractField implements FieldInterface
2424
protected $fieldArguments = [];
2525

2626
/**
27-
* @param string $fieldType
28-
* @param string $identifier
29-
* @param string $alias
30-
* @param bool|string $sortable
31-
* @param bool $noIndex
32-
* @param bool $allowsMissing
27+
* @param string $fieldType
28+
* @param string $identifier
29+
* @param string $alias
30+
* @param bool|string $sortable
31+
* @param bool $noIndex
32+
* @param bool $allowsMissing
3333
* @return void
3434
*/
3535
protected function setCommonOptions(

‎src/Command/Argument/Search/SchemaFields/GeoField.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
class GeoField extends AbstractField
1616
{
1717
/**
18-
* @param string $identifier
19-
* @param string $alias
18+
* @param string $identifier
19+
* @param string $alias
2020
* @param bool|string $sortable
21-
* @param bool $noIndex
22-
* @param bool $allowsMissing
21+
* @param bool $noIndex
22+
* @param bool $allowsMissing
2323
*/
2424
public function __construct(
2525
string $identifier,

‎src/Command/Argument/Search/SchemaFields/NumericField.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
class NumericField extends AbstractField
1616
{
1717
/**
18-
* @param string $identifier
19-
* @param string $alias
18+
* @param string $identifier
19+
* @param string $alias
2020
* @param bool|string $sortable
21-
* @param bool $noIndex
22-
* @param bool $allowsMissing
21+
* @param bool $noIndex
22+
* @param bool $allowsMissing
2323
*/
2424
public function __construct(
2525
string $identifier,

‎src/Command/Argument/Search/SchemaFields/TagField.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
class TagField extends AbstractField
1616
{
1717
/**
18-
* @param string $identifier
19-
* @param string $alias
18+
* @param string $identifier
19+
* @param string $alias
2020
* @param bool|string $sortable
21-
* @param bool $noIndex
22-
* @param string $separator
23-
* @param bool $caseSensitive
24-
* @param bool $allowsEmpty
21+
* @param bool $noIndex
22+
* @param string $separator
23+
* @param bool $caseSensitive
24+
* @param bool $allowsEmpty
2525
*/
2626
public function __construct(
2727
string $identifier,

‎src/Command/Argument/Search/SchemaFields/TextField.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
class TextField extends AbstractField
1616
{
1717
/**
18-
* @param string $identifier
19-
* @param string $alias
18+
* @param string $identifier
19+
* @param string $alias
2020
* @param bool|string $sortable
21-
* @param bool $noIndex
22-
* @param bool $noStem
23-
* @param string $phonetic
24-
* @param int $weight
25-
* @param bool $withSuffixTrie
26-
* @param bool $allowsEmpty
27-
* @param bool $allowsMissing
21+
* @param bool $noIndex
22+
* @param bool $noStem
23+
* @param string $phonetic
24+
* @param int $weight
25+
* @param bool $withSuffixTrie
26+
* @param bool $allowsEmpty
27+
* @param bool $allowsMissing
2828
*/
2929
public function __construct(
3030
string $identifier,

‎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/Argument/Search/SchemaFields/TagFieldTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ public function tagFieldsProvider(): array
5353
['field_name', 'TAG', 'NOINDEX'],
5454
],
5555
'with INDEXEMPTY modifier' => [
56-
['field_name', '', AbstractField::NOT_SORTABLE, false, ',', false ,true],
57-
['field_name', 'TAG', "INDEXEMPTY"],
56+
['field_name', '', AbstractField::NOT_SORTABLE, false, ',', false, true],
57+
['field_name', 'TAG', 'INDEXEMPTY'],
5858
],
5959
'with INDEXMISSING modifier' => [
60-
['field_name', '', AbstractField::NOT_SORTABLE, false, ',', false ,false, true],
61-
['field_name', 'TAG', "INDEXMISSING"],
60+
['field_name', '', AbstractField::NOT_SORTABLE, false, ',', false, false, true],
61+
['field_name', 'TAG', 'INDEXMISSING'],
6262
],
6363
];
6464
}

‎tests/Predis/Command/Argument/Search/SchemaFields/TextFieldTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ public function textFieldsProvider(): array
5353
['field_name', 'TEXT', 'NOINDEX'],
5454
],
5555
'with INDEXEMPTY modifier' => [
56-
['field_name', '', AbstractField::NOT_SORTABLE, false, false, '', 1 ,false, true],
57-
['field_name', 'TEXT', "INDEXEMPTY"],
56+
['field_name', '', AbstractField::NOT_SORTABLE, false, false, '', 1, false, true],
57+
['field_name', 'TEXT', 'INDEXEMPTY'],
5858
],
5959
'with INDEXMISSING modifier' => [
60-
['field_name', '', AbstractField::NOT_SORTABLE, false, false, '', 1 ,false, false, true],
61-
['field_name', 'TEXT', "INDEXMISSING"],
60+
['field_name', '', AbstractField::NOT_SORTABLE, false, false, '', 1, false, false, true],
61+
['field_name', 'TEXT', 'INDEXMISSING'],
6262
],
6363
];
6464
}

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

-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
use Predis\Command\Argument\Search\SchemaFields\NumericField;
1818
use Predis\Command\Argument\Search\SchemaFields\TagField;
1919
use Predis\Command\Argument\Search\SchemaFields\TextField;
20-
use Predis\Command\Argument\Search\SchemaFields\VectorField;
2120
use Predis\Command\Redis\PredisCommandTestCase;
2221

2322
/**

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
use Predis\Command\Argument\Search\CreateArguments;
1616
use Predis\Command\Argument\Search\SchemaFields\NumericField;
17-
use Predis\Command\Argument\Search\SchemaFields\TagField;
1817
use Predis\Command\Argument\Search\SchemaFields\TextField;
1918
use Predis\Command\Argument\Search\SearchArguments;
2019
use Predis\Command\Redis\PredisCommandTestCase;
@@ -137,7 +136,7 @@ public function testSearchHashEmptyValues(): void
137136
{
138137
$redis = $this->getClient();
139138

140-
$hashResponse = $redis->hmset('test:1', ['text_empty' => ""]);
139+
$hashResponse = $redis->hmset('test:1', ['text_empty' => '']);
141140
$this->assertEquals('OK', $hashResponse);
142141

143142
$schema = [
@@ -166,7 +165,7 @@ public function testSearchHashEmptyValues(): void
166165
$searchArgs->dialect(5);
167166

168167
$this->assertSame(
169-
[1, "test:1", ['text_empty', ""]],
168+
[1, 'test:1', ['text_empty', '']],
170169
$redis->ftsearch('idx', '@text_empty:("")', $searchArgs)
171170
);
172171

@@ -219,7 +218,7 @@ public function testSearchJsonEmptyValues(): void
219218
$searchArgs->dialect(5);
220219

221220
$this->assertSame(
222-
[1, "test:1", ['$', '[{"text_empty":""}]']],
221+
[1, 'test:1', ['$', '[{"text_empty":""}]']],
223222
$redis->ftsearch('idx', '@text_empty:("")', $searchArgs)
224223
);
225224

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function testReturnsInformationAboutGivenTimeSeries(): void
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,

0 commit comments

Comments
 (0)