smi2 / phpClickHouse

src/Transport/Http.php

Spacing +17 added lines, -17 removed lines

@@ -61,7 +61,7 @@ 
     /**
      * @var bool
      */
-    private $xClickHouseProgress=false;
+    private $xClickHouseProgress = false;
 
     /**
      * 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($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;
@@ -541,7 +541,7 @@ 
      */
     public function setProgressFunction(callable $callback)
     {
-        $this->xClickHouseProgress=$callback;
+        $this->xClickHouseProgress = $callback;
     }
 
     /**

src/Query/Query.php

Spacing +9 added lines, -9 removed lines

@@ -20,21 +20,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;
     }
 
     /**
@@ -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]))
             {
-                $format=trim(str_ireplace('format','',$matches[0][0]));
-                $this->format=$format;
+                $format = trim(str_ireplace('format', '', $matches[0][0]));
+                $this->format = $format;
 
             }
         }
@@ -91,7 +91,7 @@ 
             foreach ($this->degenerations as $degeneration)
             {
                 if ($degeneration instanceof Degeneration) {
-                    $this->sql=$degeneration->process($this->sql);
+                    $this->sql = $degeneration->process($this->sql);
                 }
             }
         }