some improvements

.gitignore

@@ -1,3 +1,4 @@
 /vendor
 /.idea
-/tests/coverage
+/tests/coverage
+composer.lock

src/Client.php

@@ -47,7 +47,7 @@ class Client
     protected $cluster;
 
     /**
-     * Tells client to send queries over whole cluster selecting server by random
+     * Tells client to send queries over whole cluster selecting server by random.
      *
      * @var bool
      */
@@ -85,7 +85,7 @@ public function __construct($server, QueryMapperInterface $mapper = null, Transp
     }
 
     /**
-     * Sets flag to use random server in cluster
+     * Sets flag to use random server in cluster.
      *
      * @param bool $flag
      */
@@ -95,7 +95,7 @@ public function useRandomServer(bool $flag)
     }
 
     /**
-     * Returns flag which tells client to use random server in cluster
+     * Returns flag which tells client to use random server in cluster.
      *
      * @return bool
      */
@@ -197,7 +197,7 @@ public function getServer(): Server
     }
 
     /**
-     * Returns random server from cluster
+     * Returns random server from cluster.
      *
      * @return \Tinderbox\Clickhouse\Server
      */

src/Exceptions/QueryMapperException.php

@@ -4,12 +4,12 @@
 
 class QueryMapperException extends \Exception
 {
-    public static function wrongBindingsNumber($inQuery, $count)
+    public static function wrongBindingsNumber(int $inQuery, int $count): self
     {
         return new static('Wrong bindings count. Bindings found in query: '.$inQuery.' and given '.$count);
     }
 
-    public static function multipleBindingsType()
+    public static function multipleBindingsType(): self
     {
         return new static('Both named and unnamed bindings found');
     }

src/Query/Mapper/UnnamedMapper.php

@@ -20,17 +20,18 @@ class UnnamedMapper extends AbstractMapper implements QueryMapperInterface
      * @param string $query
      * @param array  $bindings
      *
+     * @throws QueryMapperException
+     *
      * @return string
      */
     public function bind(string $query, array $bindings): string
     {
         $this->checkBindings($query, $bindings);
         $escapedBindings = $this->escapeBindings($bindings);
 
-        $query = str_replace('%', '%%', $query);
-        $query = str_replace('?', '%s', $query);
+        $query = str_replace(['%', '?'], ['%%', '%s'], $query);
 
-        $query = call_user_func_array('sprintf', array_merge([$query], $escapedBindings));
+        $query = sprintf($query, ...$escapedBindings);
 
         return $query;
     }

src/Query/Result.php

@@ -142,7 +142,7 @@ public function current()
 
     public function next()
     {
-        ++$this->current;
+        $this->current++;
     }
 
     public function key()

src/Transport/ClickhouseCLIClientTransport.php

@@ -15,14 +15,14 @@
 class ClickhouseCLIClientTransport implements TransportInterface
 {
     /**
-     * Path to executable clickhouse cli client
+     * Path to executable clickhouse cli client.
      *
      * @var string
      */
     protected $executablePath;
 
     /**
-     * Last execute query
+     * Last execute query.
      *
      * @var string
      */
@@ -80,8 +80,9 @@ public function send(Server $server, string $query): bool
      * @param array                        $files
      * @param int                          $concurrency
      *
-     * @return array
      * @throws \Tinderbox\Clickhouse\Exceptions\ClientException
+     *
+     * @return array
      */
     public function sendAsyncFilesWithQuery(Server $server, string $query, array $files, int $concurrency = 5): array
     {
@@ -159,7 +160,7 @@ public function getAsync(Server $server, array $queries, int $concurrency = 5):
     }
 
     /**
-     * Puts query in tmp file
+     * Puts query in tmp file.
      *
      * @param string $query
      *
@@ -178,7 +179,7 @@ protected function writeQueryInFile(string $query) : string
     }
 
     /**
-     * Removes tmp file with query
+     * Removes tmp file with query.
      *
      * @param string $fileName
      */
@@ -188,7 +189,7 @@ protected function removeQueryFile(string $fileName)
     }
 
     /**
-     * Builds command for write
+     * Builds command for write.
      *
      * @param \Tinderbox\Clickhouse\Server $server
      * @param string                       $query
@@ -203,22 +204,22 @@ protected function buildCommandForWrite(Server $server, string $query, string $f
         $command = [];
 
         if (!is_null($file)) {
-            $command[] = "cat ".$file.' |';
+            $command[] = 'cat '.$file.' |';
         }
 
         $command = array_merge($command, [
             $this->executablePath,
             "--host='{$server->getHost()}'",
             "--port='{$server->getPort()}'",
             "--database='{$server->getDatabase()}'",
-            "--query={$query}"
+            "--query={$query}",
         ]);
 
         return implode(' ', $command);
     }
 
     /**
-     * Builds command to read
+     * Builds command to read.
      *
      * @param \Tinderbox\Clickhouse\Server $server
      * @param string                       $query
@@ -236,7 +237,7 @@ protected function buildCommandForRead(Server $server, string $query, $tables =
             "--host='{$server->getHost()}'",
             "--port='{$server->getPort()}'",
             "--database='{$server->getDatabase()}'",
-            "--max_query_size=".strlen($query),
+            '--max_query_size='.strlen($query),
         ];
 
         if ($tables instanceof TempTable || !empty($tables)) {
@@ -264,21 +265,22 @@ protected function parseTempTable(TempTable $table)
         list($structure, $withColumns) = $this->assembleTempTableStructure($table);
 
         return [
-            "--external",
+            '--external',
             ($withColumns ? '--structure=' : '--types=')."'{$structure}'",
             "--format='{$table->getFormat()}'",
             "--name='{$table->getName()}'",
-            "--file='{$table->getSource()}'"
+            "--file='{$table->getSource()}'",
         ];
     }
 
     /**
-     * Executes command and catches result or error via stdout and stderr
+     * Executes command and catches result or error via stdout and stderr.
      *
      * @param string $command
      *
-     * @return string
      * @throws \Tinderbox\Clickhouse\Exceptions\ClientException
+     *
+     * @return string
      */
     protected function executeCommand(string $command) : string
     {
@@ -307,7 +309,7 @@ protected function executeCommand(string $command) : string
     }
 
     /**
-     * Sets last executed query
+     * Sets last executed query.
      *
      * @param string $query
      */
@@ -317,7 +319,7 @@ protected function setLastQuery(string $query)
     }
 
     /**
-     * Returns last executed query
+     * Returns last executed query.
      *
      * @return string
      */
@@ -327,7 +329,7 @@ protected function getLastQuery() : string
     }
 
     /**
-     * Cleans string from tabs and spaces
+     * Cleans string from tabs and spaces.
      *
      * @param string $string
      *

src/Transport/HttpTransport.php

@@ -137,10 +137,9 @@ public function sendAsyncFilesWithQuery(Server $server, string $query, array $fi
         $requests = function ($files) use ($server, $query) {
             foreach ($files as $file) {
                 $headers = array_merge($this->getHeaders(), [
-                    'Content-Length' => null
+                    'Content-Length' => null,
                 ]);
 
-
                 $request = new Request(
                     'POST', $this->buildRequestUri($server, ['query' => $query]), $headers, $this->getFileHandle($file)
                 );
@@ -160,7 +159,7 @@ public function sendAsyncFilesWithQuery(Server $server, string $query, array $fi
                 'rejected'    => $this->parseReason(),
                 'options'     => [
                     'connect_timeout' => $server->getOptions()->getTimeout(),
-                    'expect' => false
+                    'expect'          => false,
                 ],
             ]
         );
@@ -361,7 +360,7 @@ public function getAsync(Server $server, array $queries, int $concurrency = 5):
                 'rejected'    => $this->parseReason(),
                 'options'     => [
                     'connect_timeout' => $server->getOptions()->getTimeout(),
-                    'expect' => false
+                    'expect'          => false,
                 ],
             ]
         );
@@ -414,7 +413,7 @@ protected function assembleResult(ResponseInterface $response): Result
     protected function buildRequestUri(Server $server, array $query = []): string
     {
         $uri = $server->getOptions()->getProtocol().'://'.$server->getHost().':'.$server->getPort();
-        
+
         if (!is_null($server->getDatabase())) {
             $query['database'] = $server->getDatabase();
         }

tests/ClientExceptionsTest.php

@@ -10,42 +10,42 @@
  */
 class ClientExceptionsTest extends TestCase
 {
-    public function testInvalidServerProvided()
+    public function testInvalidServerProvided(): void
     {
         $e = ClientException::invalidServerProvided('null');
 
         $this->assertInstanceOf(ClientException::class, $e);
     }
 
-    public function testClusterIsNotProvided()
+    public function testClusterIsNotProvided(): void
     {
         $e = ClientException::clusterIsNotProvided();
 
         $this->assertInstanceOf(ClientException::class, $e);
     }
 
-    public function testConnectionError()
+    public function testConnectionError(): void
     {
         $e = ClientException::connectionError();
 
         $this->assertInstanceOf(ClientException::class, $e);
     }
 
-    public function testServerReturnedError()
+    public function testServerReturnedError(): void
     {
         $e = ClientException::serverReturnedError('Syntax error');
 
         $this->assertInstanceOf(ClientException::class, $e);
     }
 
-    public function testMalformedResponseFromServer()
+    public function testMalformedResponseFromServer(): void
     {
         $e = ClientException::malformedResponseFromServer('some text');
 
         $this->assertInstanceOf(ClientException::class, $e);
     }
 
-    public function testInsertFileNotFound()
+    public function testInsertFileNotFound(): void
     {
         $e = ClientException::insertFileNotFound('/tmp/test.csv');