smi2 / phpClickHouse

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

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/Settings.php

Spacing +4 added lines, -4 removed lines

@@ -16,12 +16,12 @@ 
      */
     private $settings = [];
 
-    private $_ReadOnlyUser=false;
+    private $_ReadOnlyUser = false;
 
     /**
      * @var bool
      */
-    private $_isHttps=false;
+    private $_isHttps = false;
 
     /**
      * Settings constructor.
@@ -116,7 +116,7 @@ 
     }
 
 
-    public function https($flag=true)
+    public function https($flag = true)
     {
         $this->set('https', $flag);
         return $this;
@@ -201,7 +201,7 @@ 
      */
     public function setReadOnlyUser($flag)
     {
-        $this->_ReadOnlyUser=$flag;
+        $this->_ReadOnlyUser = $flag;
     }
 
     /**

src/Query/Query.php

Spacing +8 added lines, -8 removed lines

@@ -20,21 +20,21 @@ 
     /**
      * @var array
      */
-    private $degenerations=[];
+    private $degenerations = [];
 
     /**
      * Query constructor.
      * @param string $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;
     }
 
     /**
@@ -50,17 +50,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]))
             {
 
-                $this->format=trim(str_ireplace('format','',$matches[0][0]));
+                $this->format = trim(str_ireplace('format', '', $matches[0][0]));
 
             }
         }
@@ -95,7 +95,7 @@ 
             foreach ($this->degenerations as $degeneration)
             {
                 if ($degeneration instanceof Degeneration) {
-                    $this->sql=$degeneration->process($this->sql);
+                    $this->sql = $degeneration->process($this->sql);
                 }
             }
         }

src/Query/WriteToFile.php

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/Transport/Http.php

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