Update PHP-CS-Fixer version

.php-cs-fixer.dist.php

@@ -48,8 +48,10 @@
         'no_alias_functions' => ['sets' => ['@all']],
         'no_php4_constructor' => true,
         'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'remove_inheritdoc' => true],
+        'no_unneeded_control_parentheses' => ['statements' => ['break', 'clone', 'continue', 'echo_print', 'others', 'return', 'switch_case', 'yield', 'yield_from']],
         'no_unreachable_default_argument_value' => true,
         'no_useless_sprintf' => true,
+        'ordered_imports' => ['imports_order' => ['const', 'function', 'class']],
         'php_unit_dedicate_assert' => true,
         'php_unit_dedicate_assert_internal_type' => true,
         'php_unit_expectation' => true,
@@ -71,4 +73,4 @@
             ->in(__DIR__.'/src')
             ->in(__DIR__.'/tests')
     )
-    ;
+;

CHANGELOG.md

@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Rework paginated responses
 - Add warning for Predis commands initialization
 - (dev) Remove deprecated `--no-suggest` option of Composer in the `Makefile`
+- (dev) Update PHP-CS-Fixer version
 
 ### Deprecated
 

src/Exception/OutOfRangeLevenshteinDistanceException.php

@@ -21,8 +21,9 @@
 
 namespace MacFJA\RediSearch\Exception;
 
-use OutOfRangeException;
 use function sprintf;
+
+use OutOfRangeException;
 use Throwable;
 
 class OutOfRangeLevenshteinDistanceException extends OutOfRangeException

src/Exception/UnexpectedServerResponseException.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Exception;
 
 use function is_string;
+
 use UnexpectedValueException;
 
 class UnexpectedServerResponseException extends UnexpectedValueException

src/Exception/UnknownUnitException.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Exception;
 
 use function sprintf;
+
 use Throwable;
 use UnexpectedValueException;
 

src/Index.php

@@ -24,6 +24,7 @@
 use function count;
 use function is_array;
 use function is_string;
+
 use MacFJA\RediSearch\Redis\Client;
 use MacFJA\RediSearch\Redis\Command\AbstractCommand;
 use MacFJA\RediSearch\Redis\Command\AliasAdd;

src/IndexBuilder.php

@@ -21,22 +21,23 @@
 
 namespace MacFJA\RediSearch;
 
-use BadMethodCallException;
 use function count;
 use function in_array;
-use InvalidArgumentException;
 use function is_array;
 use function is_float;
 use function is_int;
 use function is_string;
+use function strlen;
+
+use BadMethodCallException;
+use InvalidArgumentException;
 use MacFJA\RediSearch\Redis\Client;
 use MacFJA\RediSearch\Redis\Command\AbstractCommand;
 use MacFJA\RediSearch\Redis\Command\AddFieldOptionTrait;
 use MacFJA\RediSearch\Redis\Command\Create;
 use MacFJA\RediSearch\Redis\Command\CreateCommand\CreateCommandFieldOption;
 use MacFJA\RediSearch\Redis\Command\CreateCommand\JSONFieldOption;
 use RuntimeException;
-use function strlen;
 
 /**
  * @method IndexBuilder setIndex(string $name)

src/Query/Builder/AndGroup.php

@@ -28,7 +28,7 @@ class AndGroup extends AbstractGroup
     public function render(?callable $escaper = null): string
     {
         if (1 === count($this->elements)) {
-            return (reset($this->elements))->render($escaper);
+            return reset($this->elements)->render($escaper);
         }
 
         return implode(' ', array_map(static function (QueryElement $element) use ($escaper): string {

src/Query/Builder/FieldFacet.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Query\Builder;
 
 use function count;
+
 use MacFJA\RediSearch\Exception\NotEnoughFieldsException;
 use MacFJA\RediSearch\Query\Escaper;
 
@@ -49,7 +50,7 @@ public function render(?callable $escaper = null): string
     {
         return sprintf(
             '@%s:%s',
-            (OrGroup::fromStrings(...$this->fields)->render()),
+            OrGroup::fromStrings(...$this->fields)->render(),
             EncapsulationGroup::simple($this->element)->render()
         );
     }

src/Query/Builder/GeoFacet.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Query\Builder;
 
 use function count;
+
 use MacFJA\RediSearch\Exception\NotEnoughFieldsException;
 use MacFJA\RediSearch\Exception\UnknownUnitException;
 use MacFJA\RediSearch\Redis\Command\SearchCommand\GeoFilterOption;

src/Query/Builder/NumericFacet.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Query\Builder;
 
 use function is_array;
+
 use MacFJA\RediSearch\Exception\NotEnoughFieldsException;
 use MacFJA\RediSearch\Redis\Command\SearchCommand\NumericRangeTrait;
 

src/Query/Builder/QueryElementAttribute.php

@@ -26,9 +26,10 @@
 use function is_bool;
 use function is_float;
 use function is_int;
-use NumberFormatter;
 use function sprintf;
 
+use NumberFormatter;
+
 class QueryElementAttribute implements QueryElement, QueryElementDecorator
 {
     /** @var QueryElement */

src/Query/Builder/TagFacet.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Query\Builder;
 
 use function count;
+
 use MacFJA\RediSearch\Exception\NotEnoughFieldsException;
 use MacFJA\RediSearch\Exception\NotEnoughTermsException;
 

src/Query/Builder/TextFacet.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Query\Builder;
 
 use function count;
+
 use MacFJA\RediSearch\Exception\NotEnoughFieldsException;
 use MacFJA\RediSearch\Exception\NotEnoughTermsException;
 

src/Redis/Client/AbstractClient.php

@@ -22,9 +22,10 @@
 namespace MacFJA\RediSearch\Redis\Client;
 
 use function count;
+use function strlen;
+
 use MacFJA\RediSearch\Redis\Client;
 use MacFJA\RediSearch\Redis\Command;
-use function strlen;
 
 abstract class AbstractClient implements Client
 {

src/Redis/Client/AmpRedisClient.php

@@ -21,10 +21,11 @@
 
 namespace MacFJA\RediSearch\Redis\Client;
 
-use Amp\Promise;
 use function Amp\Promise\wait;
-use Amp\Redis\Redis;
 use function function_exists;
+
+use Amp\Promise;
+use Amp\Redis\Redis;
 use MacFJA\RediSearch\Redis\Client;
 use MacFJA\RediSearch\Redis\Command;
 use RuntimeException;

src/Redis/Client/CredisClient.php

@@ -21,8 +21,9 @@
 
 namespace MacFJA\RediSearch\Redis\Client;
 
-use Credis_Client;
 use function is_array;
+
+use Credis_Client;
 use MacFJA\RediSearch\Redis\Client;
 use MacFJA\RediSearch\Redis\Command;
 use RuntimeException;

src/Redis/Client/PhpiredisClient.php

@@ -21,9 +21,10 @@
 
 namespace MacFJA\RediSearch\Redis\Client;
 
-use Exception;
 use function function_exists;
 use function is_resource;
+
+use Exception;
 use MacFJA\RediSearch\Redis\Client;
 use MacFJA\RediSearch\Redis\Command;
 use RuntimeException;

src/Redis/Client/PhpredisClient.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis\Client;
 
 use function count;
+
 use MacFJA\RediSearch\Redis\Client;
 use MacFJA\RediSearch\Redis\Command;
 use Redis;

src/Redis/Client/PredisClient.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis\Client;
 
 use function assert;
+
 use MacFJA\RediSearch\Redis\Client;
 use MacFJA\RediSearch\Redis\Command;
 use Predis\ClientContextInterface;

src/Redis/Client/Rediska/RediskaRediSearchCommand.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis\Client\Rediska;
 
 use function count;
+
 use MacFJA\RediSearch\Redis\Client\AbstractClient;
 use Rediska_Command_Abstract;
 use Rediska_Connection_Exec;

src/Redis/Client/RediskaClient.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis\Client;
 
 use function in_array;
+
 use MacFJA\RediSearch\Redis\Client;
 use MacFJA\RediSearch\Redis\Command;
 use MacFJA\RediSearch\Redis\Initializer;

src/Redis/Command/AbstractCommand.php

@@ -22,8 +22,9 @@
 namespace MacFJA\RediSearch\Redis\Command;
 
 use function count;
-use InvalidArgumentException;
 use function is_array;
+
+use InvalidArgumentException;
 use MacFJA\RediSearch\Redis\Command;
 use MacFJA\RediSearch\Redis\Command\Option\CommandOption;
 

src/Redis/Command/AddFieldOptionTrait.php

@@ -21,8 +21,9 @@
 
 namespace MacFJA\RediSearch\Redis\Command;
 
-use BadMethodCallException;
 use function get_class;
+
+use BadMethodCallException;
 use MacFJA\RediSearch\Redis\Command\CreateCommand\CreateCommandFieldOption;
 use MacFJA\RediSearch\Redis\Command\CreateCommand\GeoFieldOption;
 use MacFJA\RediSearch\Redis\Command\CreateCommand\JSONFieldOption;

src/Redis/Command/Aggregate.php

@@ -24,6 +24,7 @@
 use function assert;
 use function count;
 use function is_array;
+
 use MacFJA\RediSearch\Exception\UnexpectedServerResponseException;
 use MacFJA\RediSearch\Redis\Command\AggregateCommand\ApplyOption;
 use MacFJA\RediSearch\Redis\Command\AggregateCommand\GroupByOption;

src/Redis/Command/AggregateCommand/GroupByOption.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis\Command\AggregateCommand;
 
 use function count;
+
 use MacFJA\RediSearch\Redis\Command\Option\AbstractCommandOption;
 use MacFJA\RediSearch\Redis\Command\PrefixFieldName;
 

src/Redis/Command/AggregateCommand/ReduceOption.php

@@ -24,6 +24,7 @@
 use function count;
 use function is_bool;
 use function is_string;
+
 use MacFJA\RediSearch\Redis\Command\Option\AbstractCommandOption;
 use MacFJA\RediSearch\Redis\Command\PrefixFieldName;
 

src/Redis/Command/AggregateCommand/SortByOption.php

@@ -23,6 +23,7 @@
 
 use function count;
 use function is_int;
+
 use MacFJA\RediSearch\Redis\Command\Option\AbstractCommandOption;
 use MacFJA\RediSearch\Redis\Command\PrefixFieldName;
 

src/Redis/Command/CursorRead.php

@@ -25,6 +25,7 @@
 use function count;
 use function is_array;
 use function is_int;
+
 use MacFJA\RediSearch\Exception\UnexpectedServerResponseException;
 use MacFJA\RediSearch\Redis\Command\Option\FlagOption;
 use MacFJA\RediSearch\Redis\Command\Option\NamedOption;

src/Redis/Command/Info.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis\Command;
 
 use function is_array;
+
 use MacFJA\RediSearch\Exception\UnexpectedServerResponseException;
 use MacFJA\RediSearch\Redis\Command\Option\NamelessOption;
 use MacFJA\RediSearch\Redis\Response\InfoResponse;

src/Redis/Command/Option/AbstractCommandOption.php

@@ -21,8 +21,9 @@
 
 namespace MacFJA\RediSearch\Redis\Command\Option;
 
-use Composer\Semver\Semver;
 use function is_scalar;
+
+use Composer\Semver\Semver;
 use UnexpectedValueException;
 
 abstract class AbstractCommandOption implements CommandOption

src/Redis/Command/Option/GroupedOption.php

@@ -22,10 +22,11 @@
 namespace MacFJA\RediSearch\Redis\Command\Option;
 
 use function array_key_exists;
-use BadMethodCallException;
 use function in_array;
 use function is_bool;
 use function is_scalar;
+
+use BadMethodCallException;
 use OutOfRangeException;
 
 class GroupedOption extends AbstractCommandOption

src/Redis/Command/Option/NotEmptyOption.php

@@ -29,7 +29,10 @@
  */
 class NotEmptyOption implements CommandOption, DecoratedCommandOption
 {
-    use DecoratedOptionTrait { isValid as decoratedIsValid; render as decoratedRender; }
+    use DecoratedOptionTrait {
+        isValid as decoratedIsValid;
+        render as decoratedRender;
+    }
 
     /**
      * @phpstan-param T $decorated

src/Redis/Command/Option/WithPublicGroupedSetterTrait.php

@@ -21,10 +21,11 @@
 
 namespace MacFJA\RediSearch\Redis\Command\Option;
 
-use BadMethodCallException;
 use function count;
 use function get_class;
 use function in_array;
+
+use BadMethodCallException;
 use InvalidArgumentException;
 
 trait WithPublicGroupedSetterTrait

src/Redis/Command/Search.php

@@ -24,6 +24,7 @@
 use function assert;
 use function count;
 use function is_array;
+
 use MacFJA\RediSearch\Exception\UnexpectedServerResponseException;
 use MacFJA\RediSearch\Redis\Command\Option\CustomValidatorOption as CV;
 use MacFJA\RediSearch\Redis\Command\Option\FlagOption;

src/Redis/Command/SearchCommand/LimitOption.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis\Command\SearchCommand;
 
 use function is_int;
+
 use MacFJA\RediSearch\Redis\Command\Option\AbstractCommandOption;
 
 class LimitOption extends AbstractCommandOption

src/Redis/Command/SpellCheck.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis\Command;
 
 use function is_array;
+
 use MacFJA\RediSearch\Exception\UnexpectedServerResponseException;
 use MacFJA\RediSearch\Redis\Command\Option\CustomValidatorOption;
 use MacFJA\RediSearch\Redis\Command\Option\NamedOption;

src/Redis/Command/SpellCheckCommand/TermsOption.php

@@ -22,6 +22,7 @@
 namespace MacFJA\RediSearch\Redis\Command\SpellCheckCommand;
 
 use function is_string;
+
 use MacFJA\RediSearch\Redis\Command\Option\AbstractCommandOption;
 
 class TermsOption extends AbstractCommandOption

src/Redis/Command/SugGet.php

@@ -23,6 +23,7 @@
 
 use function count;
 use function is_array;
+
 use MacFJA\RediSearch\Exception\UnexpectedServerResponseException;
 use MacFJA\RediSearch\Redis\Command\Option\CustomValidatorOption as CV;
 use MacFJA\RediSearch\Redis\Command\Option\FlagOption;