smi2 / phpClickHouse

src/Query/WriteToFile.php

Indentation +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
         }
         if ($format)
         {
-           $this->setFormat($format);
+            $this->setFormat($format);
         }
         $this->file_name=$file_name;
     }

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
     const FORMAT_TabSeparatedWithNames = 'TabSeparatedWithNames';
     const FORMAT_CSV                   = 'CSV';
 
-    private $support_format=['TabSeparated','TabSeparatedWithNames','CSV'];
+    private $support_format = ['TabSeparated', 'TabSeparatedWithNames', 'CSV'];
     /**
      * @var string
      */
@@ -22,19 +22,19 @@ 
     /**
      * @var string
      */
-    private $format='CSV';
+    private $format = 'CSV';
 
     /**
      * @var bool
      */
-    private $gzip=false;
+    private $gzip = false;
     /**
      * WriteToFile constructor.
      * @param string $file_name
      * @param bool $overwrite
      * @param null $format
      */
-    public function __construct($file_name,$overwrite=true,$format=null) {
+    public function __construct($file_name, $overwrite = true, $format = null) {
 
 
         if (!$file_name)
@@ -53,7 +53,7 @@ 
                 throw new QueryException('Can`t delete: ' . $file_name);
             }
         }
-        $dir=dirname($file_name);
+        $dir = dirname($file_name);
         if (!is_writable($dir))
         {
             throw new QueryException('Can`t writable dir: ' . $dir);
@@ -62,7 +62,7 @@ 
         {
            $this->setFormat($format);
         }
-        $this->file_name=$file_name;
+        $this->file_name = $file_name;
     }
 
     /**
@@ -78,7 +78,7 @@ 
      */
     public function setGzip($flag)
     {
-        $this->gzip=$flag;
+        $this->gzip = $flag;
     }
 
     /**
@@ -86,11 +86,11 @@ 
      */
     public function setFormat($format)
     {
-        if (!in_array($format,$this->support_format))
+        if (!in_array($format, $this->support_format))
         {
             throw new QueryException('Unsupport format: ' . $format);
         }
-        $this->format=$format;
+        $this->format = $format;
     }
     /**
      * @return int

src/Query/Degeneration/Bindings.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function bindParams(array $bindings)
     {
-        $this->bindings=[];
+        $this->bindings = [];
         foreach ($bindings as $column => $value) {
             $this->bindParam($column, $value);
         }

src/Query/Degeneration/Conditions.php

Spacing +20 added lines, -20 removed lines

@@ -17,44 +17,44 @@ 
     public function bindParams(array $bindings)
     {
         foreach ($bindings as $column => $value) {
-            $this->bindings[$column]=$value;
+            $this->bindings[$column] = $value;
         }
     }
 
 
-    static function __ifsets($matches,$markers,$else=false)
+    static function __ifsets($matches, $markers, $else = false)
     {
-        $content_false='';
+        $content_false = '';
 
         if ($else)
         {
-            list($condition, $preset ,$variable, $content_true, $content_false) = $matches;
+            list($condition, $preset, $variable, $content_true, $content_false) = $matches;
         }
         else
         {
-            list($condition, $preset ,$variable, $content_true) = $matches;
+            list($condition, $preset, $variable, $content_true) = $matches;
         }
-        $preset=strtolower($preset);
+        $preset = strtolower($preset);
 
-        if ($preset=='set')
+        if ($preset == 'set')
         {
-            return (isset($markers[$variable]) && !empty($markers[$variable]))   ? $content_true: $content_false;
+            return (isset($markers[$variable]) && !empty($markers[$variable])) ? $content_true : $content_false;
         }
-        if ($preset=='bool')
+        if ($preset == 'bool')
         {
-            return (isset($markers[$variable]) && is_bool($markers[$variable]) && $markers[$variable]==true)
+            return (isset($markers[$variable]) && is_bool($markers[$variable]) && $markers[$variable] == true)
                 ? $content_true
                 : $content_false;
         }
-        if ($preset=='string')
+        if ($preset == 'string')
         {
             return (isset($markers[$variable]) && is_string($markers[$variable]) && strlen($markers[$variable]))
                 ? $content_true
                 : $content_false;
         }
-        if ($preset=='int')
+        if ($preset == 'int')
         {
-            return (isset($markers[$variable]) && intval($markers[$variable])<>0 )
+            return (isset($markers[$variable]) && intval($markers[$variable]) <> 0)
                 ? $content_true
                 : $content_false;
         }
@@ -68,29 +68,29 @@ 
      */
     public function process($sql)
     {
-        $markers=$this->bindings;
+        $markers = $this->bindings;
 
         // 2. process if/else conditions
-        $sql = preg_replace_callback('#\{if\s(.+?)}(.+?)\{else}(.+?)\{/if}#sui', function ($matches) use ($markers) {
+        $sql = preg_replace_callback('#\{if\s(.+?)}(.+?)\{else}(.+?)\{/if}#sui', function($matches) use ($markers) {
             list($condition, $variable, $content_true, $content_false) = $matches;
 
-            return (isset($markers[$variable]) && ( $markers[$variable] || is_numeric($markers[$variable]) ) )
+            return (isset($markers[$variable]) && ($markers[$variable] || is_numeric($markers[$variable])))
                 ? $content_true
                 : $content_false;
         }, $sql);
 
         // 3. process if conditions
-        $sql = preg_replace_callback('#\{if\s(.+?)}(.+?)\{/if}#sui', function ($matches) use ($markers) {
+        $sql = preg_replace_callback('#\{if\s(.+?)}(.+?)\{/if}#sui', function($matches) use ($markers) {
             list($condition, $variable, $content) = $matches;
 
-            if (isset($markers[$variable]) && ( $markers[$variable] || is_numeric($markers[$variable]) )) {
+            if (isset($markers[$variable]) && ($markers[$variable] || is_numeric($markers[$variable]))) {
                 return $content;
             }
         }, $sql);
 
         // 1. process if[set|int]/else conditions
-        $sql = preg_replace_callback('#\{if(.{1,}?)\s(.+?)}(.+?)\{else}(.+?)\{/if}#sui',  function ($matches) use ($markers) {return  self::__ifsets($matches,$markers,true);  }, $sql);
-        $sql = preg_replace_callback('#\{if(.{1,}?)\s(.+?)}(.+?)\{/if}#sui',  function ($matches) use ($markers) { return self::__ifsets($matches,$markers,false);  }, $sql);
+        $sql = preg_replace_callback('#\{if(.{1,}?)\s(.+?)}(.+?)\{else}(.+?)\{/if}#sui', function($matches) use ($markers) {return  self::__ifsets($matches, $markers, true); }, $sql);
+        $sql = preg_replace_callback('#\{if(.{1,}?)\s(.+?)}(.+?)\{/if}#sui', function($matches) use ($markers) { return self::__ifsets($matches, $markers, false); }, $sql);
 
         return $sql;
     }

Braces +1 added lines, -2 removed lines

@@ -29,8 +29,7 @@
         if ($else)
         {
             list($condition, $preset ,$variable, $content_true, $content_false) = $matches;
-        }
-        else
+        } else
         {
             list($condition, $preset ,$variable, $content_true) = $matches;
         }

src/Client.php

Indentation +1 added lines, -1 removed lines

@@ -177,7 +177,7 @@
      */
     public function setTimeout($timeout)
     {
-       return $this->settings()->max_execution_time($timeout);
+        return $this->settings()->max_execution_time($timeout);
     }
 
     /**

Braces +7 added lines, -8 removed lines

@@ -295,8 +295,7 @@ 
             if (!$useSessionId)
             {
                 $this->settings()->makeSessionId();
-            }
-            else
+            } else
             {
                 $this->settings()->session_id($useSessionId);
             }
@@ -415,7 +414,9 @@ 
      */
     public function progressFunction($callback)
     {
-        if (!is_callable($callback)) throw new \InvalidArgumentException('Not is_callable progressFunction');
+        if (!is_callable($callback)) {
+            throw new \InvalidArgumentException('Not is_callable progressFunction');
+        }
 
         if (!$this->settings()->is('send_progress_in_http_headers'))
         {
@@ -540,7 +541,7 @@ 
                 }
                 $preparedValues[] = array_values($row);
             }
-        }else{ //одна строка
+        } else{ //одна строка
             $preparedFields = array_keys($values);
             $preparedValues = [array_values($values)];
         }
@@ -609,8 +610,7 @@ 
             {
                 $sql = 'INSERT INTO ' . $table_name . ' FORMAT '.$format;
 
-            }
-            else
+            } else
             {
                 $sql = 'INSERT INTO ' . $table_name . ' ( ' . implode(',', $columns_array) . ' ) FORMAT '.$format;
 
@@ -654,8 +654,7 @@ 
         {
             $sql = 'INSERT INTO ' . $table_name . ' FORMAT '.$format;
 
-        }
-        else
+        } else
         {
             $sql = 'INSERT INTO ' . $table_name . ' ( ' . implode(',', $columns_array) . ' ) FORMAT '.$format;
 

Spacing +44 added lines, -44 removed lines

@@ -39,11 +39,11 @@ 
     /**
      * @var bool
      */
-    private $_connect_user_readonly=false;
+    private $_connect_user_readonly = false;
     /**
      * @var array
      */
-    private $_support_format=['TabSeparated','TabSeparatedWithNames','CSV','CSVWithNames','JSONEachRow'];
+    private $_support_format = ['TabSeparated', 'TabSeparatedWithNames', 'CSV', 'CSVWithNames', 'JSONEachRow'];
 
     /**
      * Client constructor.
@@ -120,7 +120,7 @@ 
      */
     public function setReadOnlyUser($flag)
     {
-        $this->_connect_user_readonly=$flag;
+        $this->_connect_user_readonly = $flag;
         $this->settings()->setReadOnlyUser($this->_connect_user_readonly);
     }
     /**
@@ -163,10 +163,10 @@ 
 
         if (is_array($host))
         {
-            $host=array_rand(array_flip($host));
+            $host = array_rand(array_flip($host));
         }
 
-        $this->_connect_host=$host;
+        $this->_connect_host = $host;
         $this->transport()->setHost($host);
     }
 
@@ -289,7 +289,7 @@ 
     /**
      * @return $this
      */
-    public function useSession($useSessionId=false)
+    public function useSession($useSessionId = false)
     {
         if (!$this->settings()->getSessionId())
         {
@@ -346,7 +346,7 @@ 
      */
     public function enableLogQueries($flag = true)
     {
-        $this->settings()->set('log_queries',intval($flag));
+        $this->settings()->set('log_queries', intval($flag));
         return $this;
     }
 
@@ -368,7 +368,7 @@ 
      * @param bool $flag
      * @return $this
      */
-    public function https($flag=true)
+    public function https($flag = true)
     {
         $this->settings()->https($flag);
         return $this;
@@ -382,7 +382,7 @@ 
      */
     public function enableExtremes($flag = true)
     {
-        $this->settings()->set('extremes',intval($flag));
+        $this->settings()->set('extremes', intval($flag));
         return $this;
     }
 
@@ -397,9 +397,9 @@ 
      * @throws Exception\TransportException
      * @throws \Exception
      */
-    public function select($sql, $bindings = [], $whereInFile = null, $writeToFile=null)
+    public function select($sql, $bindings = [], $whereInFile = null, $writeToFile = null)
     {
-        return $this->transport()->select($sql, $bindings, $whereInFile,$writeToFile);
+        return $this->transport()->select($sql, $bindings, $whereInFile, $writeToFile);
     }
 
     /**
@@ -446,9 +446,9 @@ 
      * @throws Exception\TransportException
      * @throws \Exception
      */
-    public function selectAsync($sql, $bindings = [], $whereInFile = null,$writeToFile=null)
+    public function selectAsync($sql, $bindings = [], $whereInFile = null, $writeToFile = null)
     {
-        return $this->transport()->selectAsync($sql, $bindings, $whereInFile,$writeToFile);
+        return $this->transport()->selectAsync($sql, $bindings, $whereInFile, $writeToFile);
     }
 
     /**
@@ -485,7 +485,7 @@ 
      */
     public function showCreateTable($table)
     {
-        return ($this->select('SHOW CREATE TABLE '.$table)->fetchOne('statement'));
+        return ($this->select('SHOW CREATE TABLE ' . $table)->fetchOne('statement'));
     }
 
     /**
@@ -545,17 +545,17 @@ 
       */
     public function prepareInsertAssocBulk(array $values)
     {
-        if (isset($values[0]) && is_array($values[0])){ //случай, когда много строк вставляется
+        if (isset($values[0]) && is_array($values[0])) { //случай, когда много строк вставляется
             $preparedFields = array_keys($values[0]);
             $preparedValues = [];
-            foreach ($values as $idx => $row){
+            foreach ($values as $idx => $row) {
                 $_fields = array_keys($row);
-                if ($_fields !== $preparedFields){
-                    throw new QueryException("Fields not match: ".implode(',',$_fields)." and ".implode(',', $preparedFields)." on element $idx");
+                if ($_fields !== $preparedFields) {
+                    throw new QueryException("Fields not match: " . implode(',', $_fields) . " and " . implode(',', $preparedFields) . " on element $idx");
                 }
                 $preparedValues[] = array_values($row);
             }
-        }else{ //одна строка
+        } else { //одна строка
             $preparedFields = array_keys($values);
             $preparedValues = [array_values($values)];
         }
@@ -588,7 +588,7 @@ 
      */
     public function insertBatchTSVFiles($table_name, $file_names, $columns_array)
     {
-        return $this->insertBatchFiles($table_name,$file_names,$columns_array,'TabSeparated');
+        return $this->insertBatchFiles($table_name, $file_names, $columns_array, 'TabSeparated');
     }
 
     /**
@@ -601,17 +601,17 @@ 
      * @return array
      * @throws Exception\TransportException
      */
-    public function insertBatchFiles($table_name, $file_names, $columns_array,$format="CSV")
+    public function insertBatchFiles($table_name, $file_names, $columns_array, $format = "CSV")
     {
         if (is_string($file_names))
         {
-            $file_names=[$file_names];
+            $file_names = [$file_names];
         }
         if ($this->getCountPendingQueue() > 0) {
             throw new QueryException('Queue must be empty, before insertBatch, need executeAsync');
         }
 
-        if (!in_array($format,$this->_support_format))
+        if (!in_array($format, $this->_support_format))
         {
             throw new QueryException('Format not support in insertBatchFiles');
         }
@@ -620,17 +620,17 @@ 
 
         foreach ($file_names as $fileName) {
             if (!is_file($fileName) || !is_readable($fileName)) {
-                throw  new QueryException('Cant read file: ' . $fileName.' '.(is_file($fileName)?'':' is not file'));
+                throw  new QueryException('Cant read file: ' . $fileName . ' ' . (is_file($fileName) ? '' : ' is not file'));
             }
 
             if (!$columns_array)
             {
-                $sql = 'INSERT INTO ' . $table_name . ' FORMAT '.$format;
+                $sql = 'INSERT INTO ' . $table_name . ' FORMAT ' . $format;
 
             }
             else
             {
-                $sql = 'INSERT INTO ' . $table_name . ' ( ' . implode(',', $columns_array) . ' ) FORMAT '.$format;
+                $sql = 'INSERT INTO ' . $table_name . ' ( ' . implode(',', $columns_array) . ' ) FORMAT ' . $format;
 
             }
             $result[$fileName] = $this->transport()->writeAsyncCSV($sql, $fileName);
@@ -657,25 +657,25 @@ 
      * @param string $format ['TabSeparated','TabSeparatedWithNames','CSV','CSVWithNames']
      * @return Transport\CurlerRequest
      */
-    public function insertBatchStream($table_name, $columns_array,$format="CSV")
+    public function insertBatchStream($table_name, $columns_array, $format = "CSV")
     {
         if ($this->getCountPendingQueue() > 0) {
             throw new QueryException('Queue must be empty, before insertBatch, need executeAsync');
         }
 
-        if (!in_array($format,$this->_support_format))
+        if (!in_array($format, $this->_support_format))
         {
             throw new QueryException('Format not support in insertBatchFiles');
         }
 
         if (!$columns_array)
         {
-            $sql = 'INSERT INTO ' . $table_name . ' FORMAT '.$format;
+            $sql = 'INSERT INTO ' . $table_name . ' FORMAT ' . $format;
 
         }
         else
         {
-            $sql = 'INSERT INTO ' . $table_name . ' ( ' . implode(',', $columns_array) . ' ) FORMAT '.$format;
+            $sql = 'INSERT INTO ' . $table_name . ' ( ' . implode(',', $columns_array) . ' ) FORMAT ' . $format;
 
         }
 
@@ -742,16 +742,16 @@ 
      * @throws Exception\TransportException
      * @throws \Exception
      */
-    public function tablesSize($flatList=false)
+    public function tablesSize($flatList = false)
     {
-        $z=$this->select('
+        $z = $this->select('
             SELECT table,database,
             formatReadableSize(sum(bytes)) as size,
             sum(bytes) as sizebytes,
             min(min_date) as min_date,
             max(max_date) as max_date
             FROM system.parts 
-            WHERE active AND database=\''.$this->settings()->getDatabase().'\'
+            WHERE active AND database=\''.$this->settings()->getDatabase() . '\'
             GROUP BY table,database
         ');
 
@@ -774,12 +774,12 @@ 
      * @throws Exception\TransportException
      * @throws \Exception
      */
-    public function isExists($database,$table)
+    public function isExists($database, $table)
     {
         return $this->select('
             SELECT *
             FROM system.tables 
-            WHERE name=\''.$table.'\' AND database=\''.$database.'\''
+            WHERE name=\''.$table . '\' AND database=\'' . $database . '\''
         )->rowsAsTree('name');
     }
 
@@ -798,7 +798,7 @@ 
         return $this->select('
             SELECT *
             FROM system.parts 
-            WHERE like(table,\'%' . $table . '%\') AND database=\''.$this->settings()->getDatabase().'\' 
+            WHERE like(table,\'%' . $table . '%\') AND database=\'' . $this->settings()->getDatabase() . '\' 
             ORDER BY max_date ' . ($limit > 0 ? ' LIMIT ' . intval($limit) : '')
         )->rowsAsTree('name');
     }
@@ -814,8 +814,8 @@ 
     public function dropPartition($dataBaseTableName, $partition_id)
     {
 
-        $partition_id=trim($partition_id,'\'');
-        $this->settings()->set('replication_alter_partitions_sync',2);
+        $partition_id = trim($partition_id, '\'');
+        $this->settings()->set('replication_alter_partitions_sync', 2);
         $state = $this->write('ALTER TABLE {dataBaseTableName} DROP PARTITION :partion_id', [
             'dataBaseTableName'  => $dataBaseTableName,
             'partion_id' => $partition_id
@@ -833,12 +833,12 @@ 
      */
     public function truncateTable($tableName)
     {
-        $partions=$this->partitions($tableName);
-        $out=[];
+        $partions = $this->partitions($tableName);
+        $out = [];
         foreach ($partions as $part_key=>$part)
         {
-            $part_id=$part['partition'];
-            $out[$part_id]=$this->dropPartition($tableName,$part_id);
+            $part_id = $part['partition'];
+            $out[$part_id] = $this->dropPartition($tableName, $part_id);
         }
         return $out;
     }
@@ -873,9 +873,9 @@ 
             }
         }
 
-        $result=[];
+        $result = [];
         foreach ($drop as $partition_id) {
-            $result[$partition_id]=$this->dropPartition($table_name, $partition_id);
+            $result[$partition_id] = $this->dropPartition($table_name, $partition_id);
         }
 
         return $result;

src/Transport/CurlerRequest.php

Braces +4 added lines, -4 removed lines

@@ -353,8 +353,9 @@ 
     public function getHeaders()
     {
         $head=[];
-        foreach ($this->headers as $key=>$value)
-            $head[]= sprintf("%s: %s", $key, $value);
+        foreach ($this->headers as $key=>$value) {
+                    $head[]= sprintf("%s: %s", $key, $value);
+        }
         return $head;
     }
 
@@ -394,8 +395,7 @@ 
         if ($flag) {
             $this->_httpCompression = $flag;
             $this->options[CURLOPT_ENCODING] = 'gzip';
-        }
-        else
+        } else
         {
             $this->_httpCompression = false;
             unset($this->options[CURLOPT_ENCODING]);

Spacing +11 added lines, -11 removed lines

@@ -47,7 +47,7 @@ 
     /**
      * @var CurlerResponse
      */
-    private $resp=null;
+    private $resp = null;
 
     /**
      * @var bool
@@ -77,7 +77,7 @@ 
     /**
      * @var callable
      */
-    private $callback_function=null;
+    private $callback_function = null;
 
     /**
      * @var bool
@@ -109,13 +109,13 @@ 
             CURLOPT_SSL_VERIFYHOST => 0,
             CURLOPT_SSL_VERIFYPEER => false,
             CURLOPT_TIMEOUT => 10,
-            CURLOPT_CONNECTTIMEOUT => 5,    // Количество секунд ожидания при попытке соединения
+            CURLOPT_CONNECTTIMEOUT => 5, // Количество секунд ожидания при попытке соединения
             CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
             CURLOPT_MAXREDIRS => 10,
             CURLOPT_HEADER => TRUE,
             CURLOPT_FOLLOWLOCATION => TRUE,
-            CURLOPT_AUTOREFERER => 1,       // при редиректе подставлять в «Referer:» значение из «Location:»
-            CURLOPT_BINARYTRANSFER => 1,    // передавать в binary-safe
+            CURLOPT_AUTOREFERER => 1, // при редиректе подставлять в «Referer:» значение из «Location:»
+            CURLOPT_BINARYTRANSFER => 1, // передавать в binary-safe
             CURLOPT_RETURNTRANSFER => TRUE,
             CURLOPT_USERAGENT => 'smi2/PHPClickHouse/client',
         );
@@ -238,7 +238,7 @@ 
      */
     public function setReadFunction($callback)
     {
-        $this->options[CURLOPT_READFUNCTION]=$callback;
+        $this->options[CURLOPT_READFUNCTION] = $callback;
     }
 
     /**
@@ -363,9 +363,9 @@ 
      */
     public function getHeaders()
     {
-        $head=[];
+        $head = [];
         foreach ($this->headers as $key=>$value)
-            $head[]= sprintf("%s: %s", $key, $value);
+            $head[] = sprintf("%s: %s", $key, $value);
         return $head;
     }
 
@@ -640,8 +640,8 @@ 
             throw new \Exception('setFunctionProgress not is_callable');
         }
 
-        $this->option(CURLOPT_NOPROGRESS,false);
-        $this->option(CURLOPT_PROGRESSFUNCTION,$callback); // version 5.5.0
+        $this->option(CURLOPT_NOPROGRESS, false);
+        $this->option(CURLOPT_PROGRESSFUNCTION, $callback); // version 5.5.0
     }
 
 
@@ -704,7 +704,7 @@ 
         }
 
         if ($this->options[CURLOPT_VERBOSE]) {
-            echo "\n-----------BODY REQUEST----------\n".$curl_opt[CURLOPT_POSTFIELDS]."\n------END--------\n";
+            echo "\n-----------BODY REQUEST----------\n" . $curl_opt[CURLOPT_POSTFIELDS] . "\n------END--------\n";
         }
         curl_setopt_array($this->handle, $curl_opt);
         return true;

src/Transport/CurlerRolling.php

Braces +2 added lines, -4 removed lines

@@ -176,8 +176,7 @@ 
         foreach (explode("\r\n", $header_text) as $i => $line) {
             if ($i === 0) {
                 $headers['http_code'] = $line;
-            }
-            else {
+            } else {
                 $r = explode(': ', $line);
                 if (sizeof($r) == 2) {
                     $headers[$r[0]] = $r[1];
@@ -354,8 +353,7 @@ 
             if (sizeof($add)) {
                 if ($canAdd >= sizeof($add)) {
                     $ll = $add;
-                }
-                else {
+                } else {
                     $ll = array_rand($add, $canAdd);
                     if (!is_array($ll)) {
                         $ll = array($ll => $ll);

src/Transport/CurlerResponse.php

Spacing +5 added lines, -5 removed lines

@@ -70,7 +70,7 @@ 
      */
     public function total_time()
     {
-        return round($this->_info['total_time'],3);
+        return round($this->_info['total_time'], 3);
     }
 
     /**
@@ -78,7 +78,7 @@ 
      */
     public function starttransfer_time()
     {
-        return round($this->_info['starttransfer_time'],3);
+        return round($this->_info['starttransfer_time'], 3);
     }
 
     /**
@@ -86,7 +86,7 @@ 
      */
     public function connect_time()
     {
-        return round($this->_info['connect_time'],3);
+        return round($this->_info['connect_time'], 3);
     }
 
     /**
@@ -94,7 +94,7 @@ 
      */
     public function pretransfer_time()
     {
-        return round($this->_info['pretransfer_time'],3);
+        return round($this->_info['pretransfer_time'], 3);
     }
 
     /**
@@ -289,7 +289,7 @@ 
      */
     public function rawDataOrJson($format)
     {
-        if (stripos($format,'json')!==false)
+        if (stripos($format, 'json') !== false)
         {
             return $this->json();
         }

src/Transport/Http.php

Braces +12 added lines, -4 removed lines

@@ -114,7 +114,9 @@ 
     public function getUri()
     {
         $proto='http';
-        if ($this->settings()->isHttps()) $proto='https';
+        if ($this->settings()->isHttps()) {
+            $proto='https';
+        }
 
         return $proto.'://' . $this->_host . ':' . $this->_port;
     }
@@ -328,13 +330,19 @@ 
         if ($code==200) {
             $response = curl_multi_getcontent($handle);
             $header_size = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
-            if (!$header_size) return false;
+            if (!$header_size) {
+                return false;
+            }
 
             $header = substr($response, 0, $header_size);
-            if (!$header_size) return false;
+            if (!$header_size) {
+                return false;
+            }
             $pos=strrpos($header,'X-ClickHouse-Progress');
 
-            if (!$pos) return false;
+            if (!$pos) {
+                return false;
+            }
 
             $last=substr($header,$pos);
             $data=@json_decode(str_ireplace('X-ClickHouse-Progress:','',$last),true);

Spacing +17 added lines, -17 removed lines

@@ -61,7 +61,7 @@ 
     /**
      * @var callable
      */
-    private $xClickHouseProgress=null;
+    private $xClickHouseProgress = null;
 
     /**
      * Http constructor.
@@ -113,10 +113,10 @@ 
      */
     public function getUri()
     {
-        $proto='http';
-        if ($this->settings()->isHttps()) $proto='https';
+        $proto = 'http';
+        if ($this->settings()->isHttps()) $proto = 'https';
 
-        return $proto.'://' . $this->_host . ':' . $this->_port;
+        return $proto . '://' . $this->_host . ':' . $this->_port;
     }
 
     /**
@@ -185,7 +185,7 @@ 
         }
 
         $new->timeOut($this->settings()->getTimeOut());
-        $new->connectTimeOut($this->_connectTimeOut)->keepAlive();// one sec
+        $new->connectTimeOut($this->_connectTimeOut)->keepAlive(); // one sec
         $new->verbose(boolval($this->_verbose));
 
         return $new;
@@ -279,7 +279,7 @@ 
         $request = $this->newRequest($extendinfo);
         $request->url($url);
 
-        $request->setCallbackFunction(function (CurlerRequest $request) {
+        $request->setCallbackFunction(function(CurlerRequest $request) {
             fclose($request->getInfileHandle());
         });
 
@@ -322,29 +322,29 @@ 
 
     public function __findXClickHouseProgress($handle)
     {
-        $code=curl_getinfo($handle,CURLINFO_HTTP_CODE);
+        $code = curl_getinfo($handle, CURLINFO_HTTP_CODE);
 
         // Search X-ClickHouse-Progress
-        if ($code==200) {
+        if ($code == 200) {
             $response = curl_multi_getcontent($handle);
             $header_size = curl_getinfo($handle, CURLINFO_HEADER_SIZE);
             if (!$header_size) return false;
 
             $header = substr($response, 0, $header_size);
             if (!$header_size) return false;
-            $pos=strrpos($header,'X-ClickHouse-Progress');
+            $pos = strrpos($header, 'X-ClickHouse-Progress');
 
             if (!$pos) return false;
 
-            $last=substr($header,$pos);
-            $data=@json_decode(str_ireplace('X-ClickHouse-Progress:','',$last),true);
+            $last = substr($header, $pos);
+            $data = @json_decode(str_ireplace('X-ClickHouse-Progress:', '', $last), true);
 
             if ($data && is_callable($this->xClickHouseProgress)) {
 
-                if (is_array($this->xClickHouseProgress)){
-                    call_user_func_array($this->xClickHouseProgress,[$data]);
+                if (is_array($this->xClickHouseProgress)) {
+                    call_user_func_array($this->xClickHouseProgress, [$data]);
                 } else {
-                    call_user_func($this->xClickHouseProgress,$data);
+                    call_user_func($this->xClickHouseProgress, $data);
                 }
 
 
@@ -407,13 +407,13 @@ 
             }
 
 
-            $request->setResultFileHandle($fout, $isGz)->setCallbackFunction(function (CurlerRequest $request) {
+            $request->setResultFileHandle($fout, $isGz)->setCallbackFunction(function(CurlerRequest $request) {
                 fclose($request->getResultFileHandle());
             });
         }
         if ($this->xClickHouseProgress)
         {
-            $request->setFunctionProgress([$this,'__findXClickHouseProgress']);
+            $request->setFunctionProgress([$this, '__findXClickHouseProgress']);
         }
         // ---------------------------------------------------------------------------------
         return $request;
@@ -543,7 +543,7 @@ 
      */
     public function setProgressFunction(callable $callback)
     {
-        $this->xClickHouseProgress=$callback;
+        $this->xClickHouseProgress = $callback;
     }
 
     /**

src/Cluster.php

Braces +29 added lines, -13 removed lines

@@ -193,7 +193,9 @@ 
 //            if ($replica['total_replicas']<2) {$ok=false;$this->error[]='total_replicas : '.json_encode($replica);}
             if ($this->softCheck )
             {
-                if (!$ok) break;
+                if (!$ok) {
+                    break;
+                }
                 continue;
             }
 
@@ -209,7 +211,9 @@ 
                 $ok = false;
                 $this->error[] = 'log_max_index : ' . json_encode($replica);
             }
-            if (!$ok) break;
+            if (!$ok) {
+                break;
+            }
         }
         return $ok;
     }
@@ -308,7 +312,9 @@ 
             // Let's check that replication goes well
             $rIsOk = $this->isReplicasWork($result['replicas'][$node]);
             $result['replicasIsOk'][$node] = $rIsOk;
-            if (!$rIsOk) $replicasIsOk = false;
+            if (!$rIsOk) {
+                $replicasIsOk = false;
+            }
             // ---------------------------------------------------------------------------------------------------
         }
 
@@ -328,7 +334,9 @@ 
             $this->error[] = 'Have bad node : ' . json_encode($this->badNodes);
             $this->replicasIsOk = false;
         }
-        if (!sizeof($this->error)) $this->error = false;
+        if (!sizeof($this->error)) {
+            $this->error = false;
+        }
         $this->resultScan = $result;
         // @todo  : We connect to everyone in the DNS list, we need to decry that the requests were returned by all the hosts to which we connected
         return $this;
@@ -376,16 +384,19 @@ 
                     if (in_array($node,$nodes_check))
                     {
                         $find=$node;
-                    }
-                    else
+                    } else
                     {
                         // node exists on cluster, but not check
                     }
 
                 }
-                if ($find) break;
+                if ($find) {
+                    break;
+                }
+            }
+            if ($find) {
+                break;
             }
-            if ($find) break;
         }
         if (!$find){
             $find=$nodes[0];
@@ -435,7 +446,9 @@ 
     public function getClusterInfoTable($cluster)
     {
         $this->connect();
-        if (empty($this->resultScan['cluster.list'][$cluster])) throw new QueryException('Cluster not find:' . $cluster);
+        if (empty($this->resultScan['cluster.list'][$cluster])) {
+            throw new QueryException('Cluster not find:' . $cluster);
+        }
         return $this->resultScan['cluster.list'][$cluster];
     }
 
@@ -474,8 +487,7 @@ 
                 if ($resultDetail)
                 {
                     $list[$db_name.'.'.$table_name]=$nodes;
-                }
-                else
+                } else
                 {
                     $list[$db_name.'.'.$table_name]=array_keys($nodes);
                 }
@@ -557,13 +569,17 @@ 
     {
         $list=$this->getTables(true);
 
-        if (empty($list[$database_table])) return [];
+        if (empty($list[$database_table])) {
+            return [];
+        }
 
 
         $result=[];
         foreach ($list[$database_table] as $node=>$row)
         {
-            if ($row['is_leader']) $result[]=$node;
+            if ($row['is_leader']) {
+                $result[]=$node;
+            }
         }
         return $result;
     }

Indentation +1 added lines, -1 removed lines

@@ -503,7 +503,7 @@
      */
     public function getSizeTable($database_table)
     {
-       $nodes=$this->getNodesByTable($database_table);
+        $nodes=$this->getNodesByTable($database_table);
         // scan need node`s
         foreach ($nodes as $node)
         {

Spacing +38 added lines, -38 removed lines

@@ -42,7 +42,7 @@ 
     /**
      * @var int|float
      */
-    private $scanTimeOut=10;
+    private $scanTimeOut = 10;
 
     /**
      * @var array
@@ -77,7 +77,7 @@ 
      *
      * @var array
      */
-    private $_table_size_cache=[];
+    private $_table_size_cache = [];
 
     /**
      * Cluster constructor.
@@ -191,7 +191,7 @@ 
 
             // @todo : rewrite total_replicas=1 если кластер без реплики , нужно проверять какой класте и сколько в нем реплик
 //            if ($replica['total_replicas']<2) {$ok=false;$this->error[]='total_replicas : '.json_encode($replica);}
-            if ($this->softCheck )
+            if ($this->softCheck)
             {
                 if (!$ok) break;
                 continue;
@@ -262,7 +262,7 @@ 
             $statementsClusters[$node]->getRequest()->setDnsCache(0)->timeOut($this->scanTimeOut)->connectTimeOut($this->scanTimeOut);
         }
         $this->defaultClient()->executeAsync();
-        $tables=[];
+        $tables = [];
 
         foreach ($this->nodes as $node) {
 
@@ -270,16 +270,16 @@ 
             try {
                 $r = $statementsReplicas[$node]->rows();
                 foreach ($r as $row) {
-                    $tables[$row['database']][$row['table']][$node] =$row;
+                    $tables[$row['database']][$row['table']][$node] = $row;
                 }
                 $result['replicas'][$node] = $r;
-            } catch (\Exception $E) {
+            }catch (\Exception $E) {
                 $result['replicas'][$node] = false;
                 $badNodes[$node] = $E->getMessage();
                 $this->error[] = 'statementsReplicas:' . $E->getMessage();
             }
             // ---------------------------------------------------------------------------------------------------
-            $hosts=[];
+            $hosts = [];
 
             try {
                 $c = $statementsClusters[$node]->rows();
@@ -295,7 +295,7 @@ 
                         ];
                 }
 
-            } catch (\Exception $E) {
+            }catch (\Exception $E) {
                 $result['clusters'][$node] = false;
 
                 $this->error[] = 'clusters:' . $E->getMessage();
@@ -363,22 +363,22 @@ 
      * @return Client
      * @throws Exception\TransportException
      */
-    public function clientLike($cluster,$ip_addr_like)
+    public function clientLike($cluster, $ip_addr_like)
     {
-        $nodes_check=$this->nodes;
-        $nodes=$this->getClusterNodes($cluster);
-        $list_ips_need=explode(';',$ip_addr_like);
-        $find=false;
-        foreach($list_ips_need as $like)
+        $nodes_check = $this->nodes;
+        $nodes = $this->getClusterNodes($cluster);
+        $list_ips_need = explode(';', $ip_addr_like);
+        $find = false;
+        foreach ($list_ips_need as $like)
         {
             foreach ($nodes as $node)
             {
 
-                if (stripos($node,$like)!==false)
+                if (stripos($node, $like) !== false)
                 {
-                    if (in_array($node,$nodes_check))
+                    if (in_array($node, $nodes_check))
                     {
-                        $find=$node;
+                        $find = $node;
                     }
                     else
                     {
@@ -390,8 +390,8 @@ 
             }
             if ($find) break;
         }
-        if (!$find){
-            $find=$nodes[0];
+        if (!$find) {
+            $find = $nodes[0];
         }
         return $this->client($find);
     }
@@ -471,10 +471,10 @@ 
      * @return array
      * @throws Exception\TransportException
      */
-    public function getTables($resultDetail=false)
+    public function getTables($resultDetail = false)
     {
         $this->connect();
-        $list=[];
+        $list = [];
         foreach ($this->tables as $db_name=>$tables)
         {
             foreach ($tables as $table_name=>$nodes)
@@ -482,11 +482,11 @@ 
 
                 if ($resultDetail)
                 {
-                    $list[$db_name.'.'.$table_name]=$nodes;
+                    $list[$db_name . '.' . $table_name] = $nodes;
                 }
                 else
                 {
-                    $list[$db_name.'.'.$table_name]=array_keys($nodes);
+                    $list[$db_name . '.' . $table_name] = array_keys($nodes);
                 }
             }
         }
@@ -503,23 +503,23 @@ 
      */
     public function getSizeTable($database_table)
     {
-       $nodes=$this->getNodesByTable($database_table);
+       $nodes = $this->getNodesByTable($database_table);
         // scan need node`s
         foreach ($nodes as $node)
         {
             if (empty($this->_table_size_cache[$node]))
             {
-                $this->_table_size_cache[$node]=$this->client($node)->tablesSize(true);
+                $this->_table_size_cache[$node] = $this->client($node)->tablesSize(true);
             }
         }
 
-        $sizes=[];
+        $sizes = [];
         foreach ($this->_table_size_cache as $node=>$rows)
         {
             foreach ($rows as $row)
             {
-                $sizes[$row['database'].'.'.$row['table']][$node]=$row;
-                @$sizes[$row['database'].'.'.$row['table']]['total']['sizebytes']+=$row['sizebytes'];
+                $sizes[$row['database'] . '.' . $row['table']][$node] = $row;
+                @$sizes[$row['database'] . '.' . $row['table']]['total']['sizebytes'] += $row['sizebytes'];
 
 
 
@@ -541,17 +541,17 @@ 
      * @return array
      * @throws Exception\TransportException
      */
-    public function truncateTable($database_table,$timeOut=2000)
+    public function truncateTable($database_table, $timeOut = 2000)
     {
-        $out=[];
-        list($db,$table)=explode('.',$database_table);
-        $nodes=$this->getMasterNodeForTable($database_table);
+        $out = [];
+        list($db, $table) = explode('.', $database_table);
+        $nodes = $this->getMasterNodeForTable($database_table);
         // scan need node`s
         foreach ($nodes as $node)
         {
-            $def=$this->client($node)->getTimeout();
+            $def = $this->client($node)->getTimeout();
             $this->client($node)->database($db)->setTimeout($timeOut);
-            $out[$node]=$this->client($node)->truncateTable($table);
+            $out[$node] = $this->client($node)->truncateTable($table);
             $this->client($node)->setTimeout($def);
         }
         return $out;
@@ -566,15 +566,15 @@ 
      */
     public function getMasterNodeForTable($database_table)
     {
-        $list=$this->getTables(true);
+        $list = $this->getTables(true);
 
         if (empty($list[$database_table])) return [];
 
 
-        $result=[];
+        $result = [];
         foreach ($list[$database_table] as $node=>$row)
         {
-            if ($row['is_leader']) $result[]=$node;
+            if ($row['is_leader']) $result[] = $node;
         }
         return $result;
     }
@@ -587,7 +587,7 @@ 
      */
     public function getNodesByTable($database_table)
     {
-        $list=$this->getTables();
+        $list = $this->getTables();
         if (empty($list[$database_table])) {
             throw new QueryException('Not find :' . $database_table);
         }