Skip to content

Commit b2cef72

Browse files
MacFJAMacFJA
authored
Merge pull request #56 from MacFJA/update-tools
Update PHP-CS-Fixer version
2 parents ec9dec1 + a925356 commit b2cef72

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+65
-63
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased v2.x]
88

9+
### Changed
10+
11+
- (dev) Update PHP-CS-Fixer to version `3.12.0`
12+
913
## [2.2.0]
1014

1115
### Added

‎src/Redis/Client/PhpiredisClient.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ class PhpiredisClient extends AbstractClient
3939

4040
/**
4141
* @param resource $redis
42+
*
4243
* @psalm-assert function_exists('phpiredis_command_bs')
4344
* @psalm-assert function_exists('phpiredis_multi_command_bs')
4445
*/

‎src/Redis/Client/PredisClient.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ protected function doPipeline(Command ...$commands): array
104104

105105
/**
106106
* @param array<float|int|string> $args
107+
*
107108
* @codeCoverageIgnore
108109
*/
109110
private static function createRawCommand(array $args): CommandInterface

‎src/Redis/Command/Aggregate.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ public function getSize(): ?int
219219
* @param array|mixed|string $data
220220
*
221221
* @return CursorResponse|PaginatedResponse<AggregateResponseItem>
222+
*
222223
* @phpstan-return CursorResponse|PaginatedResponse
223224
*/
224225
public function parseResponse($data)

‎src/Redis/Command/Option/CustomValidatorOption.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
/**
2929
* @template T of CommandOption
30+
*
3031
* @mixin T
3132
*/
3233
class CustomValidatorOption implements CommandOption, DecoratedCommandOption
@@ -47,6 +48,7 @@ public function __construct(CommandOption $decorated, Validatable $validator)
4748

4849
/**
4950
* @phpstan-param T $decorated
51+
*
5052
* @psalm-param CommandOption $decorated
5153
*
5254
* @param array<float|int|string> $allowed
@@ -60,6 +62,7 @@ public static function allowedValues(CommandOption $decorated, array $allowed):
6062

6163
/**
6264
* @phpstan-param T $decorated
65+
*
6366
* @psalm-param CommandOption $decorated
6467
*
6568
* @return static<T>

‎src/Redis/Command/Option/DecoratedOptionTrait.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@
2525

2626
/**
2727
* @template T of CommandOption
28+
*
2829
* @mixin T
2930
*/
3031
trait DecoratedOptionTrait
3132
{
3233
/**
3334
* @var CommandOption
35+
*
3436
* @phpstan-var T
3537
*/
3638
private $decorated;

‎src/Redis/Command/Option/FlagOption.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public function isActive(): bool
5959

6060
/**
6161
* @return bool
62+
*
6263
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
6364
*/
6465
public function getOptionData()

‎src/Redis/Command/Option/NotEmptyOption.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
/**
2727
* @template T of CommandOption
28+
*
2829
* @mixin T
2930
*/
3031
class NotEmptyOption implements CommandOption, DecoratedCommandOption

‎src/Redis/Command/Search.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,7 @@ public function setDialect(int $version): self
335335
* @param mixed $data
336336
*
337337
* @return PaginatedResponse
338+
*
338339
* @psalm-return PaginatedResponse<SearchResponseItem>
339340
*
340341
* @SuppressWarnings(PHPMD.CyclomaticComplexity)

‎src/Redis/Initializer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ class Initializer
6161
{
6262
/**
6363
* @codeCoverageIgnore
64+
*
6465
* @psalm-suppress UndefinedDocblockClass
6566
* @psalm-suppress UndefinedClass
6667
*

‎src/Redis/Response/AggregateResponseItem.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,11 @@ public function getFields(): array
5151
* @return null|array<mixed>|float|int|string
5252
*
5353
* @deprecated Use ::getFieldValue instead
54+
*
5455
* @codeCoverageIgnore
56+
*
5557
* @psalm-suppress
58+
*
5659
* @SuppressWarnings
5760
*/
5861
public function getValue(string $fieldName, $default = null)

‎src/Redis/Response/InfoResponse.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,8 @@ public function getFieldsAsOption(): array
159159
assert($object instanceof GroupedOption);
160160
$object->setDataOfOption('field', $fieldName);
161161
$object = self::setOptionFlag($object, $field, 'NOINDEX', 'no_index');
162-
$object = self::setOptionFlag($object, $field, 'SORTABLE', 'sortable');
163162

164-
return $object;
163+
return self::setOptionFlag($object, $field, 'SORTABLE', 'sortable');
165164
}, $fields);
166165
}
167166

‎tests/IndexBuilderTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class IndexBuilderTest extends TestCase
6464
{
6565
/**
6666
* @return array<Create|IndexBuilder>
67+
*
6768
* @medium
6869
*/
6970
public function testAllSetter(): array

‎tests/IndexTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
use MacFJA\RediSearch\Redis\Command\DropIndex;
3333
use MacFJA\RediSearch\Redis\Command\TagVals;
3434
use MacFJA\RediSearch\Redis\Response\InfoResponse;
35+
use PHPUnit\Framework\TestCase;
3536

3637
/**
3738
* @covers \MacFJA\RediSearch\Index
@@ -60,7 +61,7 @@
6061
*
6162
* @internal
6263
*/
63-
class IndexTest extends \PHPUnit\Framework\TestCase
64+
class IndexTest extends TestCase
6465
{
6566
public function testAddDocumentFromArray(): void
6667
{

‎tests/Query/Builder/FuzzyTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@
2323

2424
use MacFJA\RediSearch\Exception\OutOfRangeLevenshteinDistanceException;
2525
use MacFJA\RediSearch\Query\Builder\Fuzzy;
26+
use PHPUnit\Framework\TestCase;
2627

2728
/**
2829
* @covers \MacFJA\RediSearch\Exception\OutOfRangeLevenshteinDistanceException
2930
* @covers \MacFJA\RediSearch\Query\Builder\Fuzzy
3031
*
3132
* @internal
3233
*/
33-
class FuzzyTest extends \PHPUnit\Framework\TestCase
34+
class FuzzyTest extends TestCase
3435
{
3536
public function testTooLow(): void
3637
{

‎tests/Query/Builder/GeoFacetTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,15 @@
2323

2424
use MacFJA\RediSearch\Exception\UnknownUnitException;
2525
use MacFJA\RediSearch\Query\Builder\GeoFacet;
26+
use PHPUnit\Framework\TestCase;
2627

2728
/**
2829
* @covers \MacFJA\RediSearch\Exception\UnknownUnitException
2930
* @covers \MacFJA\RediSearch\Query\Builder\GeoFacet
3031
*
3132
* @internal
3233
*/
33-
class GeoFacetTest extends \PHPUnit\Framework\TestCase
34+
class GeoFacetTest extends TestCase
3435
{
3536
public function testWrongUnit(): void
3637
{

‎tests/Query/Builder/IncludeSpaceTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,20 @@
3939
use MacFJA\RediSearch\Query\Builder\TextFacet;
4040
use MacFJA\RediSearch\Query\Builder\Word;
4141
use MacFJA\RediSearch\Redis\Command\SearchCommand\GeoFilterOption;
42+
use PHPUnit\Framework\TestCase;
4243

4344
/**
4445
* @covers \MacFJA\RediSearch\Query\Builder
45-
*
4646
* @covers \MacFJA\RediSearch\Query\Builder\AbstractGroup
4747
* @covers \MacFJA\RediSearch\Query\Builder\AndGroup
4848
* @covers \MacFJA\RediSearch\Query\Builder\EncapsulationGroup
4949
* @covers \MacFJA\RediSearch\Query\Builder\ExactMatch
5050
* @covers \MacFJA\RediSearch\Query\Builder\FieldFacet
51-
*
5251
* @covers \MacFJA\RediSearch\Query\Builder\Fuzzy
5352
* @covers \MacFJA\RediSearch\Query\Builder\GeoFacet
5453
* @covers \MacFJA\RediSearch\Query\Builder\Negation
5554
* @covers \MacFJA\RediSearch\Query\Builder\NumericFacet
5655
* @covers \MacFJA\RediSearch\Query\Builder\Optional
57-
*
5856
* @covers \MacFJA\RediSearch\Query\Builder\OrGroup
5957
* @covers \MacFJA\RediSearch\Query\Builder\Prefix
6058
* @covers \MacFJA\RediSearch\Query\Builder\QueryElement::priority
@@ -69,7 +67,7 @@
6967
*
7068
* @internal
7169
*/
72-
class IncludeSpaceTest extends \PHPUnit\Framework\TestCase
70+
class IncludeSpaceTest extends TestCase
7371
{
7472
public function testGroupIncludeSpace(): void
7573
{

‎tests/Query/Builder/IncompleteFacetTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
/**
3636
* @covers \MacFJA\RediSearch\Exception\NotEnoughFieldsException
3737
* @covers \MacFJA\RediSearch\Exception\NotEnoughTermsException
38-
*
3938
* @covers \MacFJA\RediSearch\Query\Builder\FieldFacet
4039
* @covers \MacFJA\RediSearch\Query\Builder\GeoFacet
4140
* @covers \MacFJA\RediSearch\Query\Builder\NumericFacet

‎tests/Query/Builder/PriorityTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,20 @@
4040
use MacFJA\RediSearch\Query\Builder\TextFacet;
4141
use MacFJA\RediSearch\Query\Builder\Word;
4242
use MacFJA\RediSearch\Redis\Command\SearchCommand\GeoFilterOption;
43+
use PHPUnit\Framework\TestCase;
4344

4445
/**
4546
* @covers \MacFJA\RediSearch\Query\Builder
46-
*
4747
* @covers \MacFJA\RediSearch\Query\Builder\AbstractGroup
4848
* @covers \MacFJA\RediSearch\Query\Builder\AndGroup
4949
* @covers \MacFJA\RediSearch\Query\Builder\EncapsulationGroup
5050
* @covers \MacFJA\RediSearch\Query\Builder\ExactMatch
5151
* @covers \MacFJA\RediSearch\Query\Builder\FieldFacet
52-
*
5352
* @covers \MacFJA\RediSearch\Query\Builder\Fuzzy
5453
* @covers \MacFJA\RediSearch\Query\Builder\GeoFacet
5554
* @covers \MacFJA\RediSearch\Query\Builder\Negation
5655
* @covers \MacFJA\RediSearch\Query\Builder\NumericFacet
5756
* @covers \MacFJA\RediSearch\Query\Builder\Optional
58-
*
5957
* @covers \MacFJA\RediSearch\Query\Builder\OrGroup
6058
* @covers \MacFJA\RediSearch\Query\Builder\Prefix
6159
* @covers \MacFJA\RediSearch\Query\Builder\QueryElement::priority
@@ -70,7 +68,7 @@
7068
*
7169
* @internal
7270
*/
73-
class PriorityTest extends \PHPUnit\Framework\TestCase
71+
class PriorityTest extends TestCase
7472
{
7573
public function testGroupPriority(): void
7674
{

‎tests/Query/Builder/QueryElementAttributeTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
use MacFJA\RediSearch\Query\Builder\QueryElementAttribute;
2525
use MacFJA\RediSearch\Query\Builder\RawElement;
26+
use PHPUnit\Framework\TestCase;
2627

2728
/**
2829
* @covers \MacFJA\RediSearch\Query\Builder\QueryElementAttribute
@@ -32,7 +33,7 @@
3233
*
3334
* @internal
3435
*/
35-
class QueryElementAttributeTest extends \PHPUnit\Framework\TestCase
36+
class QueryElementAttributeTest extends TestCase
3637
{
3738
/**
3839
* @dataProvider dataProvider

‎tests/Query/BuilderTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
* @covers \MacFJA\RediSearch\Query\Builder\TextFacet
4848
* @covers \MacFJA\RediSearch\Query\Builder\Word
4949
* @covers \MacFJA\RediSearch\Query\Escaper
50-
*
5150
* @covers \MacFJA\RediSearch\Redis\Command\Search::addParam
5251
*
5352
* @uses \MacFJA\RediSearch\Redis\Command\AbstractCommand

‎tests/Query/EscaperTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@
2424
use function count;
2525

2626
use MacFJA\RediSearch\Query\Escaper;
27+
use PHPUnit\Framework\TestCase;
2728

2829
/**
2930
* @covers \MacFJA\RediSearch\Query\Escaper
3031
*
3132
* @internal
3233
*/
33-
class EscaperTest extends \PHPUnit\Framework\TestCase
34+
class EscaperTest extends TestCase
3435
{
3536
private const TEST_TO_FIXTURE = [
3637
'testEscapeFieldName' => 'field name',

‎tests/Redis/Command/AbstractCommandTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
use InvalidArgumentException;
2525
use MacFJA\RediSearch\Redis\Command\Option\NamelessOption;
2626
use MacFJA\RediSearch\tests\fixtures\Redis\Command\FakeAbstractCommand;
27+
use PHPUnit\Framework\TestCase;
2728

2829
/**
2930
* @covers \MacFJA\RediSearch\Redis\Command\AbstractCommand
@@ -33,7 +34,7 @@
3334
*
3435
* @internal
3536
*/
36-
class AbstractCommandTest extends \PHPUnit\Framework\TestCase
37+
class AbstractCommandTest extends TestCase
3738
{
3839
public function testGetRediSearchVersion(): void
3940
{

‎tests/Redis/Command/AddFieldOptionTraitTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
use BadMethodCallException;
2525
use MacFJA\RediSearch\tests\fixtures\Redis\Command\FakeAddFieldOptionTraitClass1;
2626
use MacFJA\RediSearch\tests\fixtures\Redis\Command\FakeAddFieldOptionTraitClass2;
27+
use PHPUnit\Framework\TestCase;
2728

2829
/**
2930
* @covers \MacFJA\RediSearch\Redis\Command\AddFieldOptionTrait
@@ -39,7 +40,7 @@
3940
*
4041
* @internal
4142
*/
42-
class AddFieldOptionTraitTest extends \PHPUnit\Framework\TestCase
43+
class AddFieldOptionTraitTest extends TestCase
4344
{
4445
public function testWrongParent(): void
4546
{

‎tests/Redis/Command/AggregateTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,12 @@
2828

2929
/**
3030
* @covers \MacFJA\RediSearch\Redis\Command\AbstractCommand
31-
*
3231
* @covers \MacFJA\RediSearch\Redis\Command\Aggregate
3332
* @covers \MacFJA\RediSearch\Redis\Command\AggregateCommand\ApplyOption
3433
* @covers \MacFJA\RediSearch\Redis\Command\AggregateCommand\GroupByOption
3534
* @covers \MacFJA\RediSearch\Redis\Command\AggregateCommand\LimitOption
3635
* @covers \MacFJA\RediSearch\Redis\Command\AggregateCommand\ReduceOption
3736
* @covers \MacFJA\RediSearch\Redis\Command\AggregateCommand\SortByOption
38-
*
3937
* @covers \MacFJA\RediSearch\Redis\Command\AggregateCommand\WithCursor
4038
*
4139
* @uses \MacFJA\RediSearch\Redis\Command\SearchCommand\LimitOption
@@ -188,7 +186,7 @@ public function testFullOption(): void
188186
'VERBATIM',
189187
'LOAD', 2, '@geo1', '@tag1',
190188
'GROUPBY', 1, '@text1', 'REDUCE', 'COUNT_DISTINCT', 1, '@user_id', 'REDUCE', 'AVG', 1, '@num1', 'AS', 'average',
191-
'APPLY', '@timestamp - (@timestamp % 86400)', 'AS', 'day',
189+
'APPLY', '@timestamp - (@timestamp % 86400)', 'AS', 'day',
192190
'SORTBY', 3, '@text1', '@num1', 'DESC', 'MAX', 10,
193191
'LIMIT', 12, 35,
194192
'FILTER', "@name=='foo' && @age < 20",
@@ -221,9 +219,9 @@ public function testApplyOrder(): void
221219
'@text1:"hello world"',
222220
'VERBATIM',
223221
'LOAD', 2, '@geo1', '@tag1',
224-
'APPLY', 'split(@tag1)', 'AS', 'tag2',
222+
'APPLY', 'split(@tag1)', 'AS', 'tag2',
225223
'GROUPBY', 1, '@text1', 'REDUCE', 'COUNT_DISTINCT', 1, '@user_id', 'REDUCE', 'AVG', 1, '@num1', 'AS', 'average',
226-
'APPLY', '@age - 1', 'AS', 'age',
224+
'APPLY', '@age - 1', 'AS', 'age',
227225
'SORTBY', 3, '@text1', '@num1', 'DESC', 'MAX', 10,
228226
'LIMIT', 12, 35,
229227
'FILTER', "@name=='foo' && @age < 20",

‎tests/Redis/Command/AggregationCommand/ReduceOptionTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
namespace MacFJA\RediSearch\tests\Redis\Command\AggregationCommand;
2323

2424
use MacFJA\RediSearch\Redis\Command\AggregateCommand\ReduceOption;
25+
use PHPUnit\Framework\TestCase;
2526

2627
/**
2728
* @covers \MacFJA\RediSearch\Redis\Command\AggregateCommand\ReduceOption
@@ -30,7 +31,7 @@
3031
*
3132
* @internal
3233
*/
33-
class ReduceOptionTest extends \PHPUnit\Framework\TestCase
34+
class ReduceOptionTest extends TestCase
3435
{
3536
public function testShorthands(): void
3637
{

‎tests/Redis/Command/AliasAddTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
/**
2828
* @covers \MacFJA\RediSearch\Redis\Command\AbstractCommand
29-
*
3029
* @covers \MacFJA\RediSearch\Redis\Command\AliasAdd
3130
*
3231
* @uses \MacFJA\RediSearch\Redis\Command\Option\AbstractCommandOption

0 commit comments

Comments
 (0)