caoym / phpboot

src/Cache/CheckableCache.php

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
                     }
                     
                 }
-            }else if ($ttl != 0 && ($createdTime + $ttl < time())) {
+            } else if ($ttl != 0 && ($createdTime + $ttl < time())) {
                 $this->impl->delete($name);
                 return $default;
             }

src/Cache/FileModifiedChecker.php

Braces +2 added lines, -2 removed lines

@@ -14,14 +14,14 @@
         $fileNames = array();
         if(is_string($fileName)){
             $fileNames[]=$fileName;
-        }else{
+        } else{
             is_array($fileName) or \PhpBoot\abort(new \InvalidArgumentException("string or array is required by param 0"));
             $fileNames = $fileName;
         }
         foreach ($fileNames as $fileName){
             if(is_file($fileName)){
                 $this->fileName[$fileName] = @filemtime($fileName);
-            }else {
+            } else {
                 $this->fileName[$fileName] = @filemtime($fileName);
                 if(!is_dir($fileName)){
                     continue;

src/Application.php

Braces +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
             $default += [
                 Cache::class => \DI\object(ApcCache::class)
             ];
-        }else{
+        } else{
             $default += [
                 Cache::class => \DI\object(FilesystemCache::class)
                     ->constructorParameter('directory', sys_get_temp_dir())
@@ -270,7 +270,7 @@ 
                     }
                     return $next($request);
 
-                }elseif ($res[0] == Dispatcher::NOT_FOUND) {
+                } elseif ($res[0] == Dispatcher::NOT_FOUND) {
                     \PhpBoot\abort(new NotFoundHttpException(), [$request->getMethod(), $uri]);
                 } elseif ($res[0] == Dispatcher::METHOD_NOT_ALLOWED) {
                     \PhpBoot\abort(new MethodNotAllowedHttpException($res[1]), [$request->getMethod(), $uri]);
@@ -294,7 +294,7 @@ 
             }
             return $response;
 
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             $renderer->render($e);
         }
 

src/functions.php

Braces +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
         if($error instanceof \Exception){
             $e = $error;
             $message = "exception '".get_class($error)."' with message {$error->getMessage()}";
-        }else{
+        } else{
             $e = new \RuntimeException($error);
             $message = $error;
         }
@@ -30,7 +30,7 @@ 
         if($e->getFile() == __FILE__){
             $file = $trace[0]['file'];
             $line = $trace[0]['line'];
-        }else{
+        } else{
             $file = $e->getFile();
             $line = $e->getLine();
         }
@@ -53,7 +53,7 @@ 
     {
         if(is_object($entity)){
             return $db->getApp()->make(ModelWithObject::class, ['db'=>$db, 'entity'=>$entity]);
-        }else{
+        } else{
             return $db->getApp()->make(ModelWithClass::class, ['db'=>$db, 'entityName'=>$entity]);
         }
     }

src/DB/Context.php

Braces +3 added lines, -3 removed lines

@@ -17,10 +17,10 @@ 
     public function appendSql($sql, $addSpace=true){
         if($this->sql == ''){
             $this->sql = $sql;
-        }else{
+        } else{
             if($addSpace){
                 $this->sql = $this->sql.' '.$sql;
-            }else{
+            } else{
                 $this->sql = $this->sql.$sql;
             }
         }
@@ -37,7 +37,7 @@ 
     {
         if($resultHandler = $this->resultHandler){
             return $resultHandler($result);
-        }else{
+        } else{
             return $result;
         }
     }

src/DB/NestedStringCut.php

Braces +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
         if($pos !== false){
             $this->snippets[$ori] = substr($str, $ori, $pos-$ori);
             $pos ++;
-        }else{
+        } else{
             $this->snippets[$ori] = substr($str, $ori);
         }
         return $pos;

src/DB/impls.php

Braces +31 added lines, -31 removed lines

@@ -51,7 +51,7 @@ 
         if($tables instanceof BasicRule){
             $context->appendSql("FROM (".$tables->context->sql.')');
             $context->params = array_merge($context->params,$tables->context->params);
-        }else {
+        } else {
             $context->appendSql("FROM `$tables`");
         }
         if($as){
@@ -73,7 +73,7 @@ 
     static public function join($context, $type, $table) {
         if($type){
             $context->appendSql("$type JOIN $table");
-        }else{
+        } else{
             $context->appendSql("JOIN $table");
         }
     }
@@ -120,7 +120,7 @@ 
         foreach ($values as $v){
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $stubs[]=$v->get();
-            }else{
+            } else{
                 $stubs[]='?';
                 $params[] = $v;
             }
@@ -131,7 +131,7 @@ 
             //VALUES(val0, val1, val2)
             $context->appendSql("VALUES($stubs)");
 
-        }else{
+        } else{
             //(col0, col1, col2) VALUES(val0, val1, val2)
             $columns = implode(',', array_keys($values));
             $context->appendSql("($columns) VALUES($stubs)",false);
@@ -155,12 +155,12 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'SET ';
-        }else{
+        } else{
             $prefix = ',';
         }
         if(is_a($value, Raw::class)){
             $context->appendSql("$prefix$column=$value",$prefix == 'SET ');
-        }else{
+        } else{
             $context->appendSql("$prefix$column=?",$prefix == 'SET ');
             $context->appendParams([$value]);
         }
@@ -171,7 +171,7 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'SET ';
-        }else{
+        } else{
             $prefix = ',';
         }
 
@@ -185,7 +185,7 @@ 
         foreach ($values as $k=>$v){
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $set[]= "$k=".$v->get();
-            }else{
+            } else{
                 $set[]= "$k=?";
                 $params[]=$v;
             }
@@ -194,7 +194,7 @@ 
             $this->first = false;
             $context->appendSql('SET '.implode(',', $set));
             $context->appendParams($params);
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $set),false);
             $context->appendParams($params);
         }
@@ -214,7 +214,7 @@ 
                     new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
 
                 $params[] = $v;
-            }else{
+            } else{
                 $v = strtoupper($v);
                 preg_match('/^[a-zA-Z0-9_.]+$/', $k) &&
                 ($v =='DESC' || $v =='ASC') or \PhpBoot\abort( new \InvalidArgumentException("invalid params for orderBy(".json_encode($orders).")"));
@@ -225,7 +225,7 @@ 
         if($this->first){
             $this->first = false;
             $context->appendSql('ORDER BY '.implode(',', $params));
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $params),false);
         }
         return $this;
@@ -234,7 +234,7 @@ 
         if($this->first){
             $this->first = false;
             $context->appendSql("ORDER BY $column");
-        }else{
+        } else{
             $context->appendSql(",$column", false);
         }
         if($order){
@@ -327,41 +327,41 @@ 
                     foreach ($var as $i){
                         if(is_a($i, Raw::class)){
                             $stubs[]=strval($i);
-                        }else{
+                        } else{
                             $stubs[]='?';
                             $params[] = $i;
                         }
                     }
                     $stubs = implode(',', $stubs);
                     $exprs[] = "$k $op ($stubs)";
-                }else if($op == 'BETWEEN'){
+                } else if($op == 'BETWEEN'){
                     $cond = "$k BETWEEN";
                     if(is_a($var[0], Raw::class)){
                         $cond = "$cond ".strval($var[0]);
-                    }else{
+                    } else{
                         $cond = "$cond ?";
                         $params[] = $var[0];
                     }
                     if(is_a($var[1], Raw::class)){
                         $cond = "$cond AND ".strval($var[1]);
-                    }else{
+                    } else{
                         $cond = "$cond AND ?";
                         $params[] = $var[1];
                     }
                     $exprs[] = $cond;
-                }else{
+                } else{
                     if(is_a($var, Raw::class)){
                         $exprs[] = "$k $op ".strval($var);
-                    }else{
+                    } else{
                         $exprs[] = "$k $op ?";
                         $params[] = $var;
                     }
                 }
-            }else{
+            } else{
                 if(is_a($v, Raw::class)){
                     $exprs[] = "$k = ".strval($v);
 
-                }else{
+                } else{
                     $exprs[] = "$k = ?";
                     $params[] = $v;
                 }
@@ -398,18 +398,18 @@ 
                             foreach ($arg as $i){
                                 if(is_a($i, Raw::class)){
                                     $stubs[] = strval($i);
-                                }else{
+                                } else{
                                     $stubs[] = '?';
                                     $newArgs[] = $i;
                                 }
                             }
                             $stubs = implode(',', $stubs);
-                        }else{
+                        } else{
                             $stubs = strval($arg);
                         }
                         $toReplace[] = [$pos, $stubs];
 
-                    }else{
+                    } else{
                         $newArgs[]=$arg;
                     }
                 }
@@ -469,7 +469,7 @@ 
                 return $context->handleResult($dict);
             }
             return $context->handleResult($res);
-        }else{
+        } else{
             return false;
         }
     }
@@ -493,7 +493,7 @@ 
         if(!preg_match('/\bfrom\b/i', $context->sql, $found, PREG_OFFSET_CAPTURE) ||
             count($found)==0){
             $columnEnd = strlen($context->sql);
-        }else{
+        } else{
             list($chars, $columnEnd) = $found[0];
         }
         $sql = substr($context->sql, 0, $columnBegin);
@@ -504,7 +504,7 @@ 
         if($st->execute($context->params)){
             $res = $st->fetchAll(\PDO::FETCH_ASSOC);
             return $res[0]['count'];
-        }else{
+        } else{
             return false;
         }
 
@@ -517,12 +517,12 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'ON DUPLICATE KEY UPDATE ';
-        }else{
+        } else{
             $prefix = ',';
         }
         if(is_a($value, Raw::class)){
             $context->appendSql("$prefix$column=$value",$prefix == 'ON DUPLICATE KEY UPDATE ');
-        }else{
+        } else{
             $context->appendSql("$prefix$column=?",$prefix == 'ON DUPLICATE KEY UPDATE ');
             $context->appendParams([$value]);
         }
@@ -533,7 +533,7 @@ 
         if($this->first){
             $this->first = false;
             $prefix = 'ON DUPLICATE KEY UPDATE ';
-        }else{
+        } else{
             $prefix = ',';
         }
 
@@ -547,7 +547,7 @@ 
         foreach ($values as $k=>$v){
             if(is_a($v, Raw::class)){//直接拼接sql，不需要转义
                 $set[]= "$k=".$v->get();
-            }else{
+            } else{
                 $set[]= "$k=?";
                 $params[]=$v;
             }
@@ -556,7 +556,7 @@ 
             $this->first = false;
             $context->appendSql('ON DUPLICATE KEY UPDATE '.implode(',', $set));
             $context->appendParams($params);
-        }else{
+        } else{
             $context->appendSql(','.implode(',', $set),false);
             $context->appendParams($params);
         }

src/DB/rules/select.php

Braces +1 added lines, -1 removed lines

@@ -214,7 +214,7 @@
     public function where($conditions, $_=null) {
         if(is_array($conditions)){
             WhereImpl::whereArgs($this->context, $conditions);
-        }else{
+        } else{
             WhereImpl::where($this->context, $conditions, array_slice(func_get_args(), 1));
         }
 

src/DB/DB.php

Braces +2 added lines, -2 removed lines

@@ -100,9 +100,9 @@
         $obj = new SelectRule(new Context($this->connection));
         if($column0 == null){
             $args = ['*'];
-        }elseif(is_array($column0)){
+        } elseif(is_array($column0)){
             $args = $column0;
-        }else{
+        } else{
             $args = func_get_args();
         }
         foreach ($args as &$arg){