Skip to content

Commit 3c322fc

Browse files
vladvildanovvladvildanov
authored
Codestyle changes related to php-cs-fixer update (#1311)
* Codestyle changes * Added missing type-hints
1 parent 95c23fb commit 3c322fc

25 files changed

+74
-75
lines changed

‎src/Client.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -346,29 +346,29 @@ public function createCommand($commandID, $arguments = [])
346346
}
347347

348348
/**
349-
* @param $name
349+
* @param string $name
350350
* @return ContainerInterface
351351
*/
352-
public function __get($name)
352+
public function __get(string $name)
353353
{
354354
return ContainerFactory::create($this, $name);
355355
}
356356

357357
/**
358-
* @param $name
359-
* @param $value
358+
* @param string $name
359+
* @param mixed $value
360360
* @return mixed
361361
*/
362-
public function __set($name, $value)
362+
public function __set(string $name, $value)
363363
{
364364
throw new RuntimeException('Not allowed');
365365
}
366366

367367
/**
368-
* @param $name
368+
* @param string $name
369369
* @return mixed
370370
*/
371-
public function __isset($name)
371+
public function __isset(string $name)
372372
{
373373
throw new RuntimeException('Not allowed');
374374
}

‎src/Command/Redis/Container/AbstractContainer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public function __construct(ClientInterface $client)
2929
/**
3030
* {@inheritDoc}
3131
*/
32-
public function __call($subcommandID, $arguments)
32+
public function __call(string $subcommandID, array $arguments)
3333
{
3434
array_unshift($arguments, strtoupper($subcommandID));
3535

‎src/Command/Redis/Container/ContainerInterface.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ interface ContainerInterface
1818
* Creates Redis container command with subcommand as virtual method name
1919
* and sends a request to the server.
2020
*
21-
* @param $subcommandID
22-
* @param $arguments
21+
* @param string $subcommandID
22+
* @param array $arguments
2323
* @return mixed
2424
*/
25-
public function __call($subcommandID, $arguments);
25+
public function __call(string $subcommandID, array $arguments);
2626

2727
/**
2828
* Returns containerCommandId of specific container command.

‎src/Command/Redis/SORT.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ public function setArguments(array $arguments)
6060
}
6161
}
6262

63-
if (isset($sortParams['LIMIT']) &&
64-
is_array($sortParams['LIMIT']) &&
65-
count($sortParams['LIMIT']) == 2) {
63+
if (isset($sortParams['LIMIT'])
64+
&& is_array($sortParams['LIMIT'])
65+
&& count($sortParams['LIMIT']) == 2) {
6666
$query[] = 'LIMIT';
6767
$query[] = $sortParams['LIMIT'][0];
6868
$query[] = $sortParams['LIMIT'][1];

‎src/Command/Traits/Keys.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public function setArguments(array $arguments, bool $withNumkeys = true)
2525
$argumentsLength = count($arguments);
2626

2727
if (
28-
static::$keysArgumentPositionOffset > $argumentsLength ||
29-
!is_array($arguments[static::$keysArgumentPositionOffset])
28+
static::$keysArgumentPositionOffset > $argumentsLength
29+
|| !is_array($arguments[static::$keysArgumentPositionOffset])
3030
) {
3131
throw new UnexpectedValueException('Wrong keys argument type or position offset');
3232
}

‎src/Configuration/Options.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ public function getDefault($option)
6767
public function defined($option)
6868
{
6969
return
70-
array_key_exists($option, $this->options) ||
71-
array_key_exists($option, $this->input)
70+
array_key_exists($option, $this->options)
71+
|| array_key_exists($option, $this->input)
7272
;
7373
}
7474

@@ -78,8 +78,8 @@ public function defined($option)
7878
public function __isset($option)
7979
{
8080
return (
81-
array_key_exists($option, $this->options) ||
82-
array_key_exists($option, $this->input)
81+
array_key_exists($option, $this->options)
82+
|| array_key_exists($option, $this->input)
8383
) && $this->__get($option) !== null;
8484
}
8585

‎src/Connection/RelayMethods.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function onFlushed(?callable $callback)
3232
* @param string $pattern
3333
* @return bool
3434
*/
35-
public function onInvalidated(?callable $callback, ?string $pattern = null)
35+
public function onInvalidated(?callable $callback, string $pattern = null)
3636
{
3737
return $this->client->onInvalidated($callback, $pattern);
3838
}
@@ -129,7 +129,7 @@ public function maxMemory()
129129
* @param ?int $db
130130
* @return bool
131131
*/
132-
public function flushMemory(?string $endpointId = null, int $db = null)
132+
public function flushMemory(string $endpointId = null, int $db = null)
133133
{
134134
return $this->client->flushMemory($endpointId, $db);
135135
}

‎src/PubSub/AbstractConsumer.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ abstract class AbstractConsumer implements Iterator
3232
public const STATUS_SUBSCRIBED = 2; // 0b0010
3333
public const STATUS_PSUBSCRIBED = 4; // 0b0100
3434

35-
protected $position = null;
35+
protected $position;
3636
protected $statusFlags = self::STATUS_VALID;
3737

3838
/**

‎tests/PHPUnit/OneOfConstraint.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected function matches($other): bool
4444
}
4545

4646
/**
47-
* @param $other
47+
* @param mixed $other
4848
* @return string
4949
*/
5050
protected function failureDescription($other): string

‎tests/PHPUnit/PredisTestCase.php

+9-10
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323
abstract class PredisTestCase extends \PHPUnit\Framework\TestCase
2424
{
25-
protected $redisServerVersion = null;
25+
protected $redisServerVersion;
2626
protected $redisJsonVersion;
2727

2828
/**
@@ -73,7 +73,7 @@ protected function sleep(float $seconds): void
7373
*
7474
* @return RedisCommandConstraint
7575
*/
76-
public function isRedisCommand($command = null, ?array $arguments = null): RedisCommandConstraint
76+
public function isRedisCommand($command = null, array $arguments = null): RedisCommandConstraint
7777
{
7878
return new RedisCommandConstraint($command, $arguments);
7979
}
@@ -224,7 +224,7 @@ protected function getCommandFactory(): Command\Factory
224224
*
225225
* @return Client
226226
*/
227-
protected function createClient(?array $parameters = null, ?array $options = null, ?bool $flushdb = true): Client
227+
protected function createClient(array $parameters = null, array $options = null, ?bool $flushdb = true): Client
228228
{
229229
$parameters = array_merge(
230230
$this->getDefaultParametersArray(),
@@ -300,7 +300,6 @@ protected function getMockConnectionOfType(string $interface, $parameters = null
300300
* the default connection parameters used by Predis or a set of connection
301301
* parameters specified in the optional second argument.
302302
*
303-
304303
* @param array|string|null $parameters Optional connection parameters
305304
*
306305
* @return MockObject|Connection\NodeConnectionInterface
@@ -362,9 +361,9 @@ protected function getRequiredRedisServerVersion(): ?string
362361
$this->getName(false)
363362
);
364363

365-
if (isset($annotations['method']['requiresRedisVersion'], $annotations['method']['group']) &&
366-
!empty($annotations['method']['requiresRedisVersion']) &&
367-
in_array('connected', $annotations['method']['group'])
364+
if (isset($annotations['method']['requiresRedisVersion'], $annotations['method']['group'])
365+
&& !empty($annotations['method']['requiresRedisVersion'])
366+
&& in_array('connected', $annotations['method']['group'])
368367
) {
369368
return $annotations['method']['requiresRedisVersion'][0];
370369
}
@@ -517,9 +516,9 @@ protected function getRequiredModuleVersion(string $module): ?string
517516
$this->getName(false)
518517
);
519518

520-
if (isset($annotations['method'][$moduleAnnotation], $annotations['method']['group']) &&
521-
!empty($annotations['method'][$moduleAnnotation]) &&
522-
in_array('connected', $annotations['method']['group'], true)
519+
if (isset($annotations['method'][$moduleAnnotation], $annotations['method']['group'])
520+
&& !empty($annotations['method'][$moduleAnnotation])
521+
&& in_array('connected', $annotations['method']['group'], true)
523522
) {
524523
return $annotations['method'][$moduleAnnotation][0];
525524
}

‎tests/PHPUnit/RedisCommandConstraint.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class RedisCommandConstraint extends \PHPUnit\Framework\Constraint\Constraint
2525
* @param string|CommandInterface $command Expected command instance or command ID
2626
* @param ?array $arguments Expected command arguments
2727
*/
28-
public function __construct($command, ?array $arguments = null)
28+
public function __construct($command, array $arguments = null)
2929
{
3030
if ($command instanceof CommandInterface) {
3131
$this->commandID = strtoupper($command->getId());

‎tests/Predis/Cluster/PredisStrategyTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ protected function getClusterStrategy(): StrategyInterface
310310
*
311311
* @return array
312312
*/
313-
protected function getExpectedCommands(?string $type = null): array
313+
protected function getExpectedCommands(string $type = null): array
314314
{
315315
$commands = [
316316
/* commands operating on the key space */

‎tests/Predis/Cluster/RedisStrategyTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ protected function getClusterStrategy(): StrategyInterface
333333
*
334334
* @return array
335335
*/
336-
protected function getExpectedCommands(?string $type = null): array
336+
protected function getExpectedCommands(string $type = null): array
337337
{
338338
$commands = [
339339
/* commands operating on the key space */

‎tests/Predis/Command/Redis/EVALSHA_RO_Test.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ public function testParseResponse(): void
6161
/**
6262
* @group connected
6363
* @dataProvider scriptsProvider
64-
* @param string $script
65-
* @param array $keys
66-
* @param array $arguments
67-
* @param $expectedResponse
64+
* @param string $script
65+
* @param array $keys
66+
* @param array $arguments
67+
* @param $expectedResponse
6868
* @return void
6969
* @requiresRedisVersion >= 7.0.0
7070
*/

‎tests/Predis/Command/Redis/EVAL_RO_Test.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ public function testParseResponse(): void
6161
/**
6262
* @group connected
6363
* @dataProvider scriptsProvider
64-
* @param array $dictionary
65-
* @param string $script
66-
* @param array $keys
67-
* @param array $arguments
68-
* @param $expectedResponse
64+
* @param array $dictionary
65+
* @param string $script
66+
* @param array $keys
67+
* @param array $arguments
68+
* @param $expectedResponse
6969
* @return void
7070
* @requiresRedisVersion >= 7.0.0
7171
*/

‎tests/Predis/Command/Redis/FCALL_RO_Test.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ protected function tearDown(): void
113113
);
114114

115115
if (
116-
isset($annotations['method']['group']) &&
117-
in_array('connected', $annotations['method']['group'], true)
116+
isset($annotations['method']['group'])
117+
&& in_array('connected', $annotations['method']['group'], true)
118118
) {
119119
$redis = $this->getClient();
120120
$redis->function->delete(self::LIB_NAME);

‎tests/Predis/Command/Redis/FCALL_Test.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ public function testParseResponse(): void
6060
/**
6161
* @group connected
6262
* @dataProvider functionsProvider
63-
* @param string $function
64-
* @param array $functionArguments
65-
* @param $expectedResponse
63+
* @param string $function
64+
* @param array $functionArguments
65+
* @param $expectedResponse
6666
* @return void
6767
* @requiresRedisVersion >= 7.0.0
6868
*/

‎tests/Predis/Command/Redis/LCS_Test.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ public function testParseResponse($actualResponse, $expectedResponse): void
5858
/**
5959
* @group connected
6060
* @dataProvider stringsProvider
61-
* @param array $stringsArguments
62-
* @param array $functionArguments
63-
* @param $expectedResponse
61+
* @param array $stringsArguments
62+
* @param array $functionArguments
63+
* @param $expectedResponse
6464
* @return void
6565
* @requiresRedisVersion >= 7.0.0
6666
*/

‎tests/Predis/Command/Redis/ZINTERCARD_Test.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ public function testThrowsExceptionOnWrongType(): void
110110
/**
111111
* @group connected
112112
* @dataProvider unexpectedValuesProvider
113-
* @param $keys
114-
* @param $limit
113+
* @param $keys
114+
* @param $limit
115115
* @param string $expectedExceptionMessage
116116
* @return void
117117
* @requiresRedisVersion >= 7.0.0

‎tests/Predis/Command/Redis/ZINTERSTORE_Test.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ public function testThrowsExceptionOnWrongType(): void
115115

116116
/**
117117
* @dataProvider unexpectedValueProvider
118-
* @param string $destination
119-
* @param $keys
120-
* @param $weights
118+
* @param string $destination
119+
* @param $keys
120+
* @param $weights
121121
* @param string $aggregate
122122
* @param string $expectedExceptionMessage
123123
* @return void

‎tests/Predis/Command/Redis/ZINTER_Test.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ public function testThrowsExceptionOnWrongType(): void
127127

128128
/**
129129
* @dataProvider unexpectedValueProvider
130-
* @param $keys
131-
* @param $weights
130+
* @param $keys
131+
* @param $weights
132132
* @param string $aggregate
133133
* @param bool $withScores
134134
* @param string $expectedExceptionMessage

‎tests/Predis/Command/Redis/ZRANGESTORE_Test.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ public function testStoresSortedSetRanges(
102102
/**
103103
* @group connected
104104
* @dataProvider unexpectedValuesProvider
105-
* @param int|string $min
106-
* @param int|string $max
107-
* @param string|bool $by
108-
* @param $rev
109-
* @param $limit
110-
* @param int $offset
111-
* @param int $count
112-
* @param string $expectedExceptionMessage
105+
* @param int|string $min
106+
* @param int|string $max
107+
* @param string|bool $by
108+
* @param $rev
109+
* @param $limit
110+
* @param int $offset
111+
* @param int $count
112+
* @param string $expectedExceptionMessage
113113
* @return void
114114
* @requiresRedisVersion >= 6.2.0
115115
*/

‎tests/Predis/Command/Redis/ZUNIONSTORE_Test.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ public function testThrowsExceptionOnWrongType(): void
115115

116116
/**
117117
* @dataProvider unexpectedValueProvider
118-
* @param string $destination
119-
* @param $keys
120-
* @param $weights
118+
* @param string $destination
119+
* @param $keys
120+
* @param $weights
121121
* @param string $aggregate
122122
* @param string $expectedExceptionMessage
123123
* @return void

‎tests/Predis/Command/Redis/ZUNION_Test.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ public function testThrowsExceptionOnWrongType(): void
101101

102102
/**
103103
* @dataProvider unexpectedValueProvider
104-
* @param $keys
105-
* @param $weights
104+
* @param $keys
105+
* @param $weights
106106
* @param string $aggregate
107107
* @param bool $withScores
108108
* @param string $expectedExceptionMessage

‎tests/Predis/Replication/ReplicationStrategyTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ public function testSetLuaScriptAsReadOperationWorksWithScriptCommandAndCallable
390390
*
391391
* @return array
392392
*/
393-
protected function getExpectedCommands(?string $type = null): array
393+
protected function getExpectedCommands(string $type = null): array
394394
{
395395
$commands = [
396396
/* commands operating on the connection */

0 commit comments

Comments
 (0)