smi2 / phpClickHouse

src/Query/Degeneration/Conditions.php

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

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

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

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

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

src/Query/Query.php

Braces +4 added lines, -3 removed lines

@@ -49,7 +49,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";
 
@@ -63,8 +65,7 @@ 
                 $this->format=trim(str_ireplace('format','',$matches[0][0]));
 
             }
-        }
-        else {
+        } else {
             $this->sql = $this->sql . ' FORMAT ' . $this->format;
         }
 

src/Settings.php

Braces +6 added lines, -2 removed lines

@@ -47,7 +47,9 @@ 
      */
     public function get($key)
     {
-        if (!$this->is($key)) return null;
+        if (!$this->is($key)) {
+            return null;
+        }
         return $this->settings[$key];
     }
 
@@ -153,7 +155,9 @@ 
      */
     public function getSessionId()
     {
-        if (empty($this->settings['session_id'])) return false;
+        if (empty($this->settings['session_id'])) {
+            return false;
+        }
         return $this->get('session_id');
     }
 

src/Statement.php

Braces +15 added lines, -15 removed lines

@@ -167,13 +167,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();
         }
@@ -349,8 +347,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;
@@ -394,8 +396,7 @@ 
             if ($key) {
                 if (isset($this->array_data[0][$key])) {
                     return $this->array_data[0][$key];
-                }
-                else {
+                } else {
                     return null;
                 }
             }
@@ -489,16 +490,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;
             }
         }
@@ -510,14 +509,15 @@ 
 
             if (isset($arr[$key])) {
                 $val = $arr[$key];
-            }
-            else {
+            } else {
                 $val = $key;
             }
 
             $tree = array($val => $tree);
         }
-        if (!is_array($tree)) return [];
+        if (!is_array($tree)) {
+            return [];
+        }
         return $tree;
     }
 }