caoym / phpboot

src/Controller/Route.php

Spacing +10 added lines, -10 removed lines

@@ -8,12 +8,12 @@ 
 class Route
 {
     public function __construct(
-        $method='',
-        $uri='',
-        RequestHandler $requestHandler=null,
-        ResponseHandler $responseHandler=null,
-        ExceptionHandler $exceptionHandler=null,
-        $hooks=[],
+        $method = '',
+        $uri = '',
+        RequestHandler $requestHandler = null,
+        ResponseHandler $responseHandler = null,
+        ExceptionHandler $exceptionHandler = null,
+        $hooks = [],
         $summary = '',
         $description = '')
     {
@@ -50,7 +50,7 @@ 
                     $res = call_user_func_array($function, $params);
                     return $this->responseHandler->handle($app, $res, $reference);
                 };
-                foreach (array_reverse($this->hooks) as $hookName){
+                foreach (array_reverse($this->hooks) as $hookName) {
                     $next = function($request)use($app, $hookName, $next){
                         $hook = $app->get($hookName);
                         /**@var $hook HookInterface*/
@@ -262,17 +262,17 @@ 
     /**
      * @var string
      */
-    private $description='';
+    private $description = '';
 
     /**
      * hook class names
      * @var string[]
      */
-    private $hooks=[];
+    private $hooks = [];
 
     /**
      * @var string[]
      */
-    private $pathParams =[];
+    private $pathParams = [];
 
 }
\ No newline at end of file

src/Cache/CheckableCache.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
  */
 class CheckableCache
 {
-    function __construct(Cache $impl){
+    function __construct(Cache $impl) {
         $this->impl = $impl;
     }
    
@@ -43,7 +43,7 @@ 
      * @param bool $deleteExpiredData
      * @return mixed
      */
-    public function get($name, $default = null, &$expiredData=null, $deleteExpiredData=true)
+    public function get($name, $default = null, &$expiredData = null, $deleteExpiredData = true)
     {
         $expiredData = null;
         $res = $this->impl->fetch($name);
@@ -52,18 +52,18 @@ 
             // 如果指定了checker, ttl代表每次检查的间隔时间, 0表示每次get都需要经过checker检查
             // 如果没有指定checker, ttl表示缓存过期时间, 为0表示永不过期
             if ($checker !== null) {
-                if ($ttl == 0 || ($createdTime + $ttl < time())) {
+                if ($ttl == 0 || ($createdTime + $ttl<time())) {
                     $valid = $checker($data, $createdTime);
-                    if(!$valid){
+                    if (!$valid) {
                         $expiredData = $data;
-                        if($deleteExpiredData){
+                        if ($deleteExpiredData) {
                             $this->impl->delete($name);
                         }
                         return $default;
                     }
                     
                 }
-            }else if ($ttl != 0 && ($createdTime + $ttl < time())) {
+            }else if ($ttl != 0 && ($createdTime + $ttl<time())) {
                 $this->impl->delete($name);
                 return $default;
             }
@@ -75,7 +75,7 @@ 
      * 删除
      * @param string $name
      */
-    public function del($name){
+    public function del($name) {
         return  $this->impl->delete($name);
     }
     public function getImpl()

src/Cache/ClassModifiedChecker.php

Spacing +6 added lines, -6 removed lines

@@ -4,11 +4,11 @@ 
 
 class ClassModifiedChecker extends FileModifiedChecker
 {
-    function __construct($className){
+    function __construct($className) {
         $class = new \ReflectionClass($className);
         $files = [];
 
-        if($class->getFileName()){
+        if ($class->getFileName()) {
             $files[] = $class->getFileName();
             self::getParentFileName($class, $files);
         }
@@ -18,15 +18,15 @@ 
     static public function getParentFileName(\ReflectionClass $class, array &$files)
     {
         $parent = $class->getParentClass();
-        if(!$parent){
+        if (!$parent) {
             return;
         }
-        if($parent->getFileName()){
+        if ($parent->getFileName()) {
             $files[] = $parent->getParentClass();
             self::getParentFileName($parent, $files);
         }
-        foreach ($class->getInterfaces() as $interface){
-            if($interface->getFileName()){
+        foreach ($class->getInterfaces() as $interface) {
+            if ($interface->getFileName()) {
                 $files[] = $interface->getFileName();
                 self::getParentFileName($interface, $files);
             }

src/Cache/FileModifiedChecker.php

Spacing +13 added lines, -13 removed lines

@@ -10,25 +10,25 @@ 
     /**
      * @param string|array $fileName 文件的绝对路径
      */
-    function __construct($fileName){
+    function __construct($fileName) {
         $fileNames = array();
-        if(is_string($fileName)){
-            $fileNames[]=$fileName;
-        }else{
+        if (is_string($fileName)) {
+            $fileNames[] = $fileName;
+        }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)){
+        foreach ($fileNames as $fileName) {
+            if (is_file($fileName)) {
                 $this->fileName[$fileName] = @filemtime($fileName);
             }else {
                 $this->fileName[$fileName] = @filemtime($fileName);
-                if(!is_dir($fileName)){
+                if (!is_dir($fileName)) {
                     continue;
                 }
                 $files = @dir($fileName) or \PhpBoot\abort("open dir $fileName failed");
-                while (!!($file = $files->read())){
-                    if($file == '.' || $file == '..') {
+                while (!!($file = $files->read())) {
+                    if ($file == '.' || $file == '..') {
                         continue;
                     }
                     $this->fileName[$fileName.'/'.$file] = @filemtime($fileName.'/'.$file);
@@ -43,13 +43,13 @@ 
      * @param int $createdTime
      * @return boolean
      */
-    public function __invoke($data, $createdTime){
-        foreach ($this->fileName as $name => $time){
-            if(@filemtime($name) != $time){
+    public function __invoke($data, $createdTime) {
+        foreach ($this->fileName as $name => $time) {
+            if (@filemtime($name) != $time) {
                 return false;
             }
         }
         return true;
     }
-    private $fileName=[]; //文件全路径
+    private $fileName = []; //文件全路径
 }

src/Application.php

Spacing +19 added lines, -19 removed lines

@@ -83,11 +83,11 @@ 
 
             Request::class => \DI\factory([Application::class, 'createRequestFromGlobals']),
         ];
-        if(function_exists('apc_fetch')){
+        if (function_exists('apc_fetch')) {
             $default += [
                 Cache::class => \DI\object(ApcCache::class)
             ];
-        }else{
+        }else {
             $default += [
                 Cache::class => \DI\object(FilesystemCache::class)
                     ->constructorParameter('directory', sys_get_temp_dir())
@@ -129,11 +129,11 @@ 
      * @param string[] $hooks hook class names
      * @return void
      */
-    public function loadRoutesFromClass($className, $hooks=[])
+    public function loadRoutesFromClass($className, $hooks = [])
     {
         $cache = new CheckableCache($this->cache);
 
-        $key = 'loadRoutesFromClass:' . md5(__CLASS__ . ':' . $className);
+        $key = 'loadRoutesFromClass:'.md5(__CLASS__.':'.$className);
         $routes = $cache->get($key, $this);
 
         $controller = null;
@@ -150,9 +150,9 @@ 
             $this->routes[] = [
                 $method,
                 $uri,
-                function (Application $app, Request $request) use ($cache, $className, $actionName, $controller) {
+                function(Application $app, Request $request) use ($cache, $className, $actionName, $controller) {
 
-                    $key = 'loadRoutesFromClass:route:' . md5(__CLASS__ . ':' . $className . ':' . $actionName);
+                    $key = 'loadRoutesFromClass:route:'.md5(__CLASS__.':'.$className.':'.$actionName);
 
                     $routeInstance = $cache->get($key, $this);
                     if ($routeInstance == $this) {
@@ -180,11 +180,11 @@ 
      * @param string[] $hooks
      * @return void
      */
-    public function loadRoutesFromPath($fromPath, $namespace = '', $hooks=[])
+    public function loadRoutesFromPath($fromPath, $namespace = '', $hooks = [])
     {
         $dir = @dir($fromPath);
 
-        $getEach = function () use ($dir) {
+        $getEach = function() use ($dir) {
             $name = $dir->read();
             if (!$name) {
                 return $name;
@@ -196,11 +196,11 @@ 
             if ($entry == '.' || $entry == '..') {
                 continue;
             }
-            $path = $fromPath . '/' . str_replace('\\', '/', $entry);
+            $path = $fromPath.'/'.str_replace('\\', '/', $entry);
             if (is_file($path) && substr_compare($entry, '.php', strlen($entry) - 4, 4, true) == 0) {
-                $class_name = $namespace . '\\' . substr($entry, 0, strlen($entry) - 4);
+                $class_name = $namespace.'\\'.substr($entry, 0, strlen($entry) - 4);
                 $this->loadRoutesFromClass($class_name, $hooks);
-            } else {
+            }else {
                 //\Log::debug($path.' ignored');
             }
         }
@@ -213,7 +213,7 @@ 
      * @param callable $handler function(Application $app, Request $request):Response
      * @param string[] $hooks
      */
-    public function addRoute($method, $uri, callable $handler, $hooks=[])
+    public function addRoute($method, $uri, callable $handler, $hooks = [])
     {
         $this->routes[] = [$method, $uri, $handler, $hooks];
     }
@@ -239,7 +239,7 @@ 
     {
         //  TODO 把 Route里的异常处理 ExceptionRenderer 移到这里更妥?
         $renderer = $this->get(ExceptionRenderer::class);
-        try{
+        try {
             if ($request == null) {
                 $request = $this->make(Request::class);
             }
@@ -249,7 +249,7 @@ 
             }
             $uri = rawurldecode($uri);
 
-            $next = function (Request $request)use($uri){
+            $next = function(Request $request)use($uri){
                 $dispatcher = $this->getDispatcher();
                 $res = $dispatcher->dispatch($request->getMethod(), $uri);
                 if ($res[0] == Dispatcher::FOUND) {
@@ -258,10 +258,10 @@ 
                         $request->attributes->add($res[2]);
                     }
                     list($handler, $hooks) = $res[1];
-                    $next = function (Request $request)use($handler){
+                    $next = function(Request $request)use($handler){
                         return $handler($this, $request);
                     };
-                    foreach (array_reverse($hooks) as $hookName){
+                    foreach (array_reverse($hooks) as $hookName) {
                         $next = function($request)use($hookName, $next){
                             $hook = $this->get($hookName);
                             /**@var $hook HookInterface*/
@@ -274,12 +274,12 @@ 
                     \PhpBoot\abort(new NotFoundHttpException(), [$request->getMethod(), $uri]);
                 } elseif ($res[0] == Dispatcher::METHOD_NOT_ALLOWED) {
                     \PhpBoot\abort(new MethodNotAllowedHttpException($res[1]), [$request->getMethod(), $uri]);
-                } else {
+                }else {
                     \PhpBoot\abort("unknown dispatch return {$res[0]}");
                 }
             };
 
-            foreach (array_reverse($this->getGlobalHooks()) as $hookName){
+            foreach (array_reverse($this->getGlobalHooks()) as $hookName) {
                 $next = function($request)use($hookName, $next){
                     $hook = $this->get($hookName);
                     /**@var $hook HookInterface*/
@@ -294,7 +294,7 @@ 
             }
             return $response;
 
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             $renderer->render($e);
         }
 

src/DB/Context.php

Spacing +11 added lines, -11 removed lines

@@ -3,7 +3,7 @@ 
 /**
  * @author caoym
  */
-class Context{
+class Context {
 
     public function __construct($connection)
     {
@@ -14,13 +14,13 @@ 
      * 拼接sql语句，并自动插入空格
      * @param string $sql 表达式
      */
-    public function appendSql($sql, $addSpace=true){
-        if($this->sql == ''){
+    public function appendSql($sql, $addSpace = true) {
+        if ($this->sql == '') {
             $this->sql = $sql;
-        }else{
-            if($addSpace){
+        }else {
+            if ($addSpace) {
                 $this->sql = $this->sql.' '.$sql;
-            }else{
+            }else {
                 $this->sql = $this->sql.$sql;
             }
         }
@@ -29,15 +29,15 @@ 
      * 增加绑定变量值
      * @param array $params 变量
      */
-    public function appendParams($params){
+    public function appendParams($params) {
         $this->params = array_merge($this->params, $params);
     }
 
     public function handleResult($result)
     {
-        if($resultHandler = $this->resultHandler){
+        if ($resultHandler = $this->resultHandler) {
             return $resultHandler($result);
-        }else{
+        }else {
             return $result;
         }
     }
@@ -45,8 +45,8 @@ 
      * @var callable
      */
     public $resultHandler;
-    public $sql='';
-    public $params=[];
+    public $sql = '';
+    public $params = [];
     /**
      * @var \PDO
      */

src/DB/NestedStringCut.php

Spacing +22 added lines, -22 removed lines

@@ -7,26 +7,26 @@ 
  * 既从aaa"bb\"b"ccc中, 取出"bb\"b"
  * @author caoym
  */
-class NestedStringCut{
+class NestedStringCut {
     
-    public function __construct($str){
+    public function __construct($str) {
         
         $pos = 0;
         $state = 'stateNormal';
-        while (true){
+        while (true) {
             $pos = $this->$state($str, $pos, $state);
-            if($pos === false){
+            if ($pos === false) {
                 break;
             }
         };
         return false;
     }
     
-    public function  getSnippets(){
+    public function  getSnippets() {
         return $this->snippets;
     }
     
-    public function  getText(){
+    public function  getText() {
         return  implode('', $this->snippets);
     }
     /**
@@ -34,11 +34,11 @@ 
      * @param int $pos 
      * @param int
      */
-    public function mapPos($pos){
+    public function mapPos($pos) {
        
-        foreach ($this->snippets as $k => $v){
+        foreach ($this->snippets as $k => $v) {
             $pos += $k;
-            if($pos < $k + strlen($v)){
+            if ($pos<$k + strlen($v)) {
                 break;
             }
             $pos -= ($k + strlen($v));
@@ -49,21 +49,21 @@ 
     /**
      * 普通状态
      */
-    private function stateNormal($str, $pos, &$next){
+    private function stateNormal($str, $pos, &$next) {
         $ori = $pos;
         $posSQ = strpos($str, '\'', $pos);
         $posDQ = strpos($str, '"', $pos);
         $pos = $posSQ;
         $this->subStateQ = '\'';
         $next = 'stateQ';
-        if($posDQ !== false && (($posDQ < $pos) || ($pos === false)) ){
+        if ($posDQ !== false && (($posDQ<$pos) || ($pos === false))) {
             $pos = $posDQ;
             $this->subStateQ = '"';
         }
-        if($pos !== false){
-            $this->snippets[$ori] = substr($str, $ori, $pos-$ori);
-            $pos ++;
-        }else{
+        if ($pos !== false) {
+            $this->snippets[$ori] = substr($str, $ori, $pos - $ori);
+            $pos++;
+        }else {
             $this->snippets[$ori] = substr($str, $ori);
         }
         return $pos;
@@ -72,27 +72,27 @@ 
     /**
      * 进入引号状态
      */
-    private function stateQ($str, $pos, &$next){
+    private function stateQ($str, $pos, &$next) {
         $posESC = strpos($str, '\\', $pos);
         $posQ = strpos($str, $this->subStateQ, $pos);
         $pos = $posESC;
         $next = 'stateESC';
         
-        if($posQ !== false && (($posQ<$posESC) || ($posESC === false))){
+        if ($posQ !== false && (($posQ<$posESC) || ($posESC === false))) {
             $pos = $posQ;
             $next = 'stateNormal';
         }
-        if($pos !== false){
-            $pos ++;
+        if ($pos !== false) {
+            $pos++;
         }
         return $pos;
     }
     /**
      * 进入转义状态
      */
-    private function stateESC($str, $pos, &$next){
+    private function stateESC($str, $pos, &$next) {
         $pos++;
-        if($pos >= strlen($str)){
+        if ($pos>=strlen($str)) {
             return false;
         }
         $next = 'stateQ';
@@ -102,7 +102,7 @@ 
      * 去掉嵌套字符串后的内容
      * @var array
      */
-    private $snippets=array();
+    private $snippets = array();
     
     private $subStateQ;
 }

src/DB/Rows.php

Spacing +8 added lines, -8 removed lines

@@ -2,30 +2,30 @@
 
 namespace PhpBoot\DB;
 
-if(!function_exists("array_column"))
+if (!function_exists("array_column"))
 {
 
     function array_column($array, $column_name)
     {
 
-        return array_map(function($element) use($column_name){return $element[$column_name];}, $array);
+        return array_map(function($element) use($column_name){return $element[$column_name]; }, $array);
 
     }
 
 }
 class Rows
 {
-    static function column($array,$column_name)
+    static function column($array, $column_name)
     {
 
-        return array_map(function($element) use($column_name){return $element[$column_name];}, $array);
+        return array_map(function($element) use($column_name){return $element[$column_name]; }, $array);
 
     }
-    static public function leftJoin(&$lh, $rh, $lKey, $rkey, $destKey){
-        $map = array_combine(self::column($rh,$rkey),$rh);
+    static public function leftJoin(&$lh, $rh, $lKey, $rkey, $destKey) {
+        $map = array_combine(self::column($rh, $rkey), $rh);
 
-        foreach ($lh as &$v){
-            $v[$destKey]=$map[$v[$lKey]];
+        foreach ($lh as &$v) {
+            $v[$destKey] = $map[$v[$lKey]];
         }
     }
 }
\ No newline at end of file

src/DB/Raw.php

Spacing +2 added lines, -2 removed lines

@@ -13,10 +13,10 @@
     function __construct($str) {
         $this->str = $str;
     }
-    public function __toString(){
+    public function __toString() {
         return $this->str;
     }
-    public function get(){
+    public function get() {
         return $this->str;
     }
     private $str;