smi2 / phpClickHouse

src/Statement.php

Spacing +4 added lines, -4 removed lines

@@ -148,7 +148,7 @@ 
 
         $body = $this->response()->body();
         $error_no = $this->response()->error_no();
-        $error=$this->response()->error();
+        $error = $this->response()->error();
 
         if (!$error_no && !$error) {
             $parse = $this->parseErrorClickHouse($body);
@@ -158,7 +158,7 @@ 
             }
             else {
                 $code = $this->response()->http_code();
-                $message = "HttpCode:" . $this->response()->http_code() . " ; ".$this->response()->error()." ;" . $body;
+                $message = "HttpCode:" . $this->response()->http_code() . " ; " . $this->response()->error() . " ;" . $body;
             }
         }
         else {
@@ -212,7 +212,7 @@ 
             return false;
         }
 
-        foreach (['meta', 'data', 'totals', 'extremes', 'rows', 'rows_before_limit_at_least','statistics'] as $key) {
+        foreach (['meta', 'data', 'totals', 'extremes', 'rows', 'rows_before_limit_at_least', 'statistics'] as $key) {
             if (isset($this->_rawData[$key])) {
                 $this->{$key} = $this->_rawData[$key];
             }
@@ -325,7 +325,7 @@ 
      * @param bool $key
      * @return array|mixed|null
      */
-    public function statistics($key=false)
+    public function statistics($key = false)
     {
         $this->init();
         if ($key)

Braces +12 added lines, -14 removed lines

@@ -155,13 +155,11 @@ 
 
             if ($parse) {
                 throw new DatabaseException($parse['message'] . "\nIN:" . $this->sql(), $parse['code']);
-            }
-            else {
+            } else {
                 $code = $this->response()->http_code();
                 $message = "HttpCode:" . $this->response()->http_code() . " ; ".$this->response()->error()." ;" . $body;
             }
-        }
-        else {
+        } else {
             $code = $error_no;
             $message = $this->response()->error();
         }
@@ -330,8 +328,12 @@ 
         $this->init();
         if ($key)
         {
-            if (!is_array($this->statistics)) return null;
-            if (!isset($this->statistics[$key])) return null;
+            if (!is_array($this->statistics)) {
+                return null;
+            }
+            if (!isset($this->statistics[$key])) {
+                return null;
+            }
             return $this->statistics[$key];
         }
         return $this->statistics;
@@ -373,8 +375,7 @@ 
             if ($key) {
                 if (isset($this->array_data[0][$key])) {
                     return $this->array_data[0][$key];
-                }
-                else {
+                } else {
                     return null;
                 }
             }
@@ -464,16 +465,14 @@ 
     {
         if (is_array($path)) {
             $keys = $path;
-        }
-        else {
+        } else {
             $args = func_get_args();
             array_shift($args);
 
             if (sizeof($args) < 2) {
                 $separator = '.';
                 $keys = explode($separator, $path);
-            }
-            else {
+            } else {
                 $keys = $args;
             }
         }
@@ -485,8 +484,7 @@ 
 
             if (isset($arr[$key])) {
                 $val = $arr[$key];
-            }
-            else {
+            } else {
                 $val = $key;
             }
 

src/Quote/StrictQuoteLine.php

Spacing +10 added lines, -10 removed lines

@@ -6,7 +6,7 @@ 
 class StrictQuoteLine
 {
 
-    private $preset=[
+    private $preset = [
         'CSV'=>[
             'EnclosureArray'=>'"',
             'EncodeEnclosure'=>'"',
@@ -32,19 +32,19 @@ 
             'TabEncode'=>true,
         ],
     ];
-    private $settings=[];
+    private $settings = [];
 
     public function __construct($format)
     {
         if (empty($this->preset[$format]))
         {
-            throw new QueryException("Unsupport format encode line:".$format);
+            throw new QueryException("Unsupport format encode line:" . $format);
         }
-        $this->settings=$this->preset[$format];
+        $this->settings = $this->preset[$format];
     }
     public function quoteRow($row)
     {
-        return implode($this->settings['Delimiter'],$this->quoteValue($row));
+        return implode($this->settings['Delimiter'], $this->quoteValue($row));
     }
     public function quoteValue($row)
     {
@@ -53,10 +53,10 @@ 
         $encode = $this->settings['EncodeEnclosure'];
         $encodeArray = $this->settings['EnclosureArray'];
         $null = $this->settings['Null'];
-        $tabEncode=$this->settings['TabEncode'];
+        $tabEncode = $this->settings['TabEncode'];
 
 
-        $quote = function ($value) use ($enclosure,$delimiter,$encode,$encodeArray,$null,$tabEncode) {
+        $quote = function($value) use ($enclosure, $delimiter, $encode, $encodeArray, $null, $tabEncode) {
 
 
 
@@ -75,11 +75,11 @@ 
             if (is_string($value)) {
                 if ($tabEncode)
                 {
-                    return str_replace(["\t","\n"],['\\t','\\n'],$value);
+                    return str_replace(["\t", "\n"], ['\\t', '\\n'], $value);
                 }
 
                 $value = strval($value);
-                $value = preg_replace('/('.$enclosure_esc.'|'.$encode_esc.')/',$encode_esc.'\1', $value);
+                $value = preg_replace('/(' . $enclosure_esc . '|' . $encode_esc . ')/', $encode_esc . '\1', $value);
                 return $enclosure . $value . $enclosure;
             }
 
@@ -90,7 +90,7 @@ 
                 // as in the TabSeparated format, and then the resulting string is output in InsertRow in double quotes.
                 $result_array = FormatLine::Insert($value);
 
-                return $encodeArray . '[' . $result_array . ']' .$encodeArray;
+                return $encodeArray . '[' . $result_array . ']' . $encodeArray;
             }
 
             if (null === $value) {

src/Quote/FormatLine.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
      *
      * @var array
      */
-    private static $strict=[];
+    private static $strict = [];
 
     /**
      * Format
@@ -20,7 +20,7 @@ 
     {
         if (empty(self::$strict[$format]))
         {
-            self::$strict[$format]=new StrictQuoteLine($format);
+            self::$strict[$format] = new StrictQuoteLine($format);
         }
         return self::$strict[$format];
     }

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 $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/Query.php

Spacing +9 added lines, -9 removed lines

@@ -19,21 +19,21 @@ 
     /**
      * @var array
      */
-    private $degenerations=[];
+    private $degenerations = [];
 
     /**
      * Query constructor.
      * @param $sql
      * @param array $degenerations
      */
-    public function __construct($sql,$degenerations=[])
+    public function __construct($sql, $degenerations = [])
     {
         if (!trim($sql))
         {
             throw new QueryException('Empty Query');
         }
         $this->sql = $sql;
-        $this->degenerations=$degenerations;
+        $this->degenerations = $degenerations;
     }
 
     /**
@@ -49,17 +49,17 @@ 
     {
         // FORMAT\s(\w)*$
         if (null === $this->format) return false;
-        $supportFormats=
+        $supportFormats =
             "FORMAT\\s+TSV|FORMAT\\s+TSVRaw|FORMAT\\s+TSVWithNames|FORMAT\\s+TSVWithNamesAndTypes|FORMAT\\s+Vertical|FORMAT\\s+JSONCompact|FORMAT\\s+JSONEachRow|FORMAT\\s+TSKV|FORMAT\\s+TabSeparatedWithNames|FORMAT\\s+TabSeparatedWithNamesAndTypes|FORMAT\\s+TabSeparatedRaw|FORMAT\\s+BlockTabSeparated|FORMAT\\s+CSVWithNames|FORMAT\\s+CSV|FORMAT\\s+JSON|FORMAT\\s+TabSeparated";
 
-        $matches=[];
-        if (preg_match_all('%('.$supportFormats.')%ius',$this->sql,$matches)){
+        $matches = [];
+        if (preg_match_all('%(' . $supportFormats . ')%ius', $this->sql, $matches)) {
 
             // skip add "format json"
             if (isset($matches[0]))
             {
-                $format=trim(str_ireplace('format','',$matches[0][0]));
-                $this->format=$format;
+                $format = trim(str_ireplace('format', '', $matches[0][0]));
+                $this->format = $format;
 
             }
         }
@@ -93,7 +93,7 @@ 
             foreach ($this->degenerations as $degeneration)
             {
                 if ($degeneration instanceof \ClickHouseDB\Query\Degeneration)
-                $this->sql=$degeneration->process($this->sql);
+                $this->sql = $degeneration->process($this->sql);
             }
         }
 

Braces +7 added lines, -5 removed lines

@@ -48,7 +48,9 @@ 
     private function applyFormatQuery()
     {
         // FORMAT\s(\w)*$
-        if (null === $this->format) return false;
+        if (null === $this->format) {
+            return false;
+        }
         $supportFormats=
             "FORMAT\\s+TSV|FORMAT\\s+TSVRaw|FORMAT\\s+TSVWithNames|FORMAT\\s+TSVWithNamesAndTypes|FORMAT\\s+Vertical|FORMAT\\s+JSONCompact|FORMAT\\s+JSONEachRow|FORMAT\\s+TSKV|FORMAT\\s+TabSeparatedWithNames|FORMAT\\s+TabSeparatedWithNamesAndTypes|FORMAT\\s+TabSeparatedRaw|FORMAT\\s+BlockTabSeparated|FORMAT\\s+CSVWithNames|FORMAT\\s+CSV|FORMAT\\s+JSON|FORMAT\\s+TabSeparated";
 
@@ -62,8 +64,7 @@ 
                 $this->format=$format;
 
             }
-        }
-        else {
+        } else {
             $this->sql = $this->sql . ' FORMAT ' . $this->format;
         }
 
@@ -92,8 +93,9 @@ 
         {
             foreach ($this->degenerations as $degeneration)
             {
-                if ($degeneration instanceof \ClickHouseDB\Query\Degeneration)
-                $this->sql=$degeneration->process($this->sql);
+                if ($degeneration instanceof \ClickHouseDB\Query\Degeneration) {
+                                $this->sql=$degeneration->process($this->sql);
+                }
             }
         }
 

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);
     }
 
     /**

Spacing +44 added lines, -44 removed lines

@@ -38,11 +38,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.
@@ -119,7 +119,7 @@ 
      */
     public function setReadOnlyUser($flag)
     {
-        $this->_connect_user_readonly=$flag;
+        $this->_connect_user_readonly = $flag;
         $this->settings()->setReadOnlyUser($this->_connect_user_readonly);
     }
     /**
@@ -162,10 +162,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);
     }
 
@@ -288,7 +288,7 @@ 
     /**
      * @return $this
      */
-    public function useSession($useSessionId=false)
+    public function useSession($useSessionId = false)
     {
         if (!$this->settings()->getSessionId())
         {
@@ -344,7 +344,7 @@ 
      */
     public function enableLogQueries($flag = true)
     {
-        $this->settings()->set('log_queries',intval($flag));
+        $this->settings()->set('log_queries', intval($flag));
         return $this;
     }
 
@@ -366,7 +366,7 @@ 
      * @param bool $flag
      * @return $this
      */
-    public function https($flag=true)
+    public function https($flag = true)
     {
         $this->settings()->https($flag);
         return $this;
@@ -380,7 +380,7 @@ 
      */
     public function enableExtremes($flag = true)
     {
-        $this->settings()->set('extremes',intval($flag));
+        $this->settings()->set('extremes', intval($flag));
         return $this;
     }
 
@@ -393,9 +393,9 @@ 
      * @param null $writeToFile
      * @return Statement
      */
-    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);
     }
 
     /**
@@ -440,9 +440,9 @@ 
      * @param null $writeToFile
      * @return Statement
      */
-    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);
     }
 
     /**
@@ -473,7 +473,7 @@ 
      */
     public function showCreateTable($table)
     {
-        return ($this->select('SHOW CREATE TABLE '.$table)->fetchOne('statement'));
+        return ($this->select('SHOW CREATE TABLE ' . $table)->fetchOne('statement'));
     }
 
     /**
@@ -530,17 +530,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)];
         }
@@ -572,7 +572,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');
     }
     /**
      * insert Batch Files
@@ -583,17 +583,17 @@ 
      * @param $format string ['TabSeparated','TabSeparatedWithNames','CSV','CSVWithNames']
      * @return array
      */
-    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');
         }
@@ -602,17 +602,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);
@@ -639,25 +639,25 @@ 
      * @param string $format
      * @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;
 
         }
 
@@ -715,16 +715,16 @@ 
      *
      * @return array
      */
-    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
         ');
 
@@ -745,12 +745,12 @@ 
      * @param $table
      * @return array
      */
-    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');
     }
 
@@ -767,7 +767,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');
     }
@@ -782,8 +782,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
@@ -799,12 +799,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;
     }
@@ -837,9 +837,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;

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;
 

src/Transport/CurlerRequest.php

Spacing +9 added lines, -9 removed lines

@@ -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',
         );
@@ -234,7 +234,7 @@ 
     }
     public function setReadFunction($callback)
     {
-        $this->options[CURLOPT_READFUNCTION]=$callback;
+        $this->options[CURLOPT_READFUNCTION] = $callback;
     }
 
     /**
@@ -352,9 +352,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;
     }
 
@@ -628,8 +628,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
     }
 
 
@@ -692,7 +692,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;

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]);