Upgrade CS

composer.json

@@ -30,7 +30,7 @@
         "thecodingmachine/safe": "^1.0"
     },
     "require-dev": {
-        "cdn77/coding-standard": "^3.0",
+        "cdn77/coding-standard": "^4.0",
         "infection/infection": "^0.16.0",
         "nyholm/psr7": "^1.2",
         "php-http/curl-client": "^2.1",

phpcs.xml.dist

@@ -14,6 +14,7 @@
 
     <rule ref="Cdn77">
         <exclude name="SlevomatCodingStandard.Files.LineLength"/>
+        <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingNativeTypeHint" />
     </rule>
 
     <rule ref="SlevomatCodingStandard.Files.LineLength">

src/Client/Http/RequestFactory.php

@@ -8,7 +8,9 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\UriFactoryInterface;
+
 use function http_build_query;
+
 use const PHP_QUERY_RFC3986;
 
 final class RequestFactory

src/Client/PsrClickHouseAsyncClient.php

@@ -16,6 +16,7 @@
 use SimPod\ClickHouseClient\Output\Output;
 use SimPod\ClickHouseClient\Sql\SqlFactory;
 use SimPod\ClickHouseClient\Sql\ValueFormatter;
+
 use function GuzzleHttp\Promise\promise_for;
 
 class PsrClickHouseAsyncClient implements ClickHouseAsyncClient

src/Client/PsrClickHouseClient.php

@@ -17,6 +17,7 @@
 use SimPod\ClickHouseClient\Sql\Escaper;
 use SimPod\ClickHouseClient\Sql\SqlFactory;
 use SimPod\ClickHouseClient\Sql\ValueFormatter;
+
 use function array_key_first;
 use function array_keys;
 use function array_map;

src/Exception/UnsupportedValueType.php

@@ -5,6 +5,7 @@
 namespace SimPod\ClickHouseClient\Exception;
 
 use InvalidArgumentException;
+
 use function get_class;
 use function gettype;
 use function is_object;

src/Snippet/CurrentDatabase.php

@@ -6,6 +6,7 @@
 
 use SimPod\ClickHouseClient\Client\ClickHouseClient;
 use SimPod\ClickHouseClient\Format\JsonEachRow;
+
 use function assert;
 use function is_string;
 

src/Snippet/DatabaseSize.php

@@ -7,6 +7,7 @@
 use SimPod\ClickHouseClient\Client\ClickHouseClient;
 use SimPod\ClickHouseClient\Format\JsonEachRow;
 use SimPod\ClickHouseClient\Sql\Expression;
+
 use function assert;
 
 final class DatabaseSize

src/Snippet/Parts.php

@@ -6,6 +6,7 @@
 
 use SimPod\ClickHouseClient\Client\ClickHouseClient;
 use SimPod\ClickHouseClient\Format\JsonEachRow;
+
 use function Safe\sprintf;
 
 final class Parts

src/Snippet/ShowCreateTable.php

@@ -7,6 +7,7 @@
 use SimPod\ClickHouseClient\Client\ClickHouseClient;
 use SimPod\ClickHouseClient\Format\JsonEachRow;
 use Webmozart\Assert\Assert;
+
 use function trim;
 
 final class ShowCreateTable

src/Snippet/ShowDatabases.php

@@ -6,6 +6,7 @@
 
 use SimPod\ClickHouseClient\Client\ClickHouseClient;
 use SimPod\ClickHouseClient\Format\JsonEachRow;
+
 use function array_map;
 use function assert;
 use function is_string;

src/Snippet/Version.php

@@ -6,6 +6,7 @@
 
 use SimPod\ClickHouseClient\Client\ClickHouseClient;
 use SimPod\ClickHouseClient\Format\JsonEachRow;
+
 use function assert;
 use function is_string;
 

src/Sql/ValueFormatter.php

@@ -7,6 +7,7 @@
 use DateTimeImmutable;
 use DateTimeZone;
 use SimPod\ClickHouseClient\Exception\UnsupportedValueType;
+
 use function array_map;
 use function implode;
 use function is_array;
@@ -70,7 +71,8 @@ public function format($value, ?string $paramName = null, ?string $sql = null) :
         }
 
         if (is_array($value)) {
-            if ($paramName !== null && $sql !== null
+            if (
+                $paramName !== null && $sql !== null
                 && preg_match(sprintf('~\s+IN\s+\\(:%s\\)~', $paramName), $sql) === 1
             ) {
                 return implode(

tests/Client/SelectAsyncTest.php

@@ -9,6 +9,7 @@
 use SimPod\ClickHouseClient\Format\TabSeparated;
 use SimPod\ClickHouseClient\Tests\TestCaseBase;
 use SimPod\ClickHouseClient\Tests\WithClient;
+
 use function GuzzleHttp\Promise\all;
 
 final class SelectAsyncTest extends TestCaseBase

tests/Exception/UnsupportedValueTypeTest.php

@@ -8,6 +8,7 @@
 use SimPod\ClickHouseClient\Exception\UnsupportedValueType;
 use SimPod\ClickHouseClient\Tests\TestCaseBase;
 use stdClass;
+
 use function Safe\opendir;
 
 /** @covers \SimPod\ClickHouseClient\Exception\UnsupportedValueType */

tests/Snippet/ShowCreateTableTest.php

@@ -7,6 +7,7 @@
 use SimPod\ClickHouseClient\Snippet\ShowCreateTable;
 use SimPod\ClickHouseClient\Tests\TestCaseBase;
 use SimPod\ClickHouseClient\Tests\WithClient;
+
 use function Safe\preg_replace;
 use function str_replace;
 

tests/Snippet/ShowDatabasesTest.php

@@ -7,6 +7,7 @@
 use SimPod\ClickHouseClient\Snippet\ShowDatabases;
 use SimPod\ClickHouseClient\Tests\TestCaseBase;
 use SimPod\ClickHouseClient\Tests\WithClient;
+
 use function array_filter;
 use function array_shift;
 use function array_values;

tests/Sql/ValueFormatterTest.php

@@ -55,7 +55,7 @@ public function providerFormat() : iterable
 
         yield 'Stringable' => [
             "'stringable'",
-            new class() {
+            new class () {
                 public function __toString() : string
                 {
                     return 'stringable';

tests/WithClient.php

@@ -13,6 +13,7 @@
 use SimPod\ClickHouseClient\Client\Http\RequestFactory;
 use SimPod\ClickHouseClient\Client\PsrClickHouseAsyncClient;
 use SimPod\ClickHouseClient\Client\PsrClickHouseClient;
+
 use function assert;
 use function getenv;
 use function is_string;

tests/bootstrap.php

@@ -6,6 +6,7 @@
 
 use function date_default_timezone_set;
 use function error_reporting;
+
 use const E_ALL;
 
 require_once __DIR__ . '/../vendor/autoload.php';