caoym / phpboot

src/Controller/Annotations/ReturnAnnotationHandler.php

Spacing +6 added lines, -6 removed lines

@@ -21,20 +21,20 @@ 
      */
     public function __invoke(ControllerContainer $container, $ann, EntityContainerBuilder $entityBuilder)
     {
-        if(!$ann->parent){
+        if (!$ann->parent) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent route");
             return;
         }
         $target = $ann->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             //Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent route");
-            return ;
+            return;
         }
 
         $params = new AnnotationParams($ann->description, 2);
         $type = $doc = null;
-        if(count($params)>0){
+        if (count($params)>0) {
             $type = TypeHint::normalize($params[0], $container->getClassName());
         }
         $doc = $params->getRawParam(1, '');
@@ -42,10 +42,10 @@ 
         list($_, $meta) = $route
             ->getResponseHandler()
             ->getMappingBySource('return');
-        if($meta){
+        if ($meta) {
             $meta->description = $doc;
             $meta->type = $type;
-            $meta->container = $type == 'void'?null:ContainerFactory::create($entityBuilder, $type);
+            $meta->container = $type == 'void' ? null : ContainerFactory::create($entityBuilder, $type);
         }
     }
 }
\ No newline at end of file

src/Controller/Annotations/BindAnnotationHandler.php

Spacing +9 added lines, -9 removed lines

@@ -21,15 +21,15 @@ 
      */
     public function __invoke(ControllerContainer $container, $ann, EntityContainerBuilder $entityBuilder)
     {
-        if(!$ann->parent || !$ann->parent->parent){
+        if (!$ann->parent || !$ann->parent->parent) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()} should be used with parent param/return");
             return;
         }
         $target = $ann->parent->parent->name;
         $route = $container->getRoute($target);
-        if(!$route){
+        if (!$route) {
             Logger::debug("The annotation \"@{$ann->name} {$ann->description}\" of {$container->getClassName()}::$target should be used with parent param/return");
-            return ;
+            return;
         }
 
         $params = new AnnotationParams($ann->description, 2);
@@ -38,20 +38,20 @@ 
 
         $handler = $route->getResponseHandler();
 
-        if ($ann->parent->name == 'return'){
+        if ($ann->parent->name == 'return') {
             list($target, $return) = $handler->getMappingBySource('return');
-            if($return){
+            if ($return) {
                 $handler->eraseMapping($target);
                 $handler->setMapping($params[0], $return);
             }
 
-        }elseif($ann->parent->name == 'param'){
+        }elseif ($ann->parent->name == 'param') {
             list($paramType, $paramName, $paramDoc) = ParamAnnotationHandler::getParamInfo($ann->parent->description);
 
             $paramMeta = $route->getRequestHandler()->getParamMeta($paramName);
-            if($paramMeta->isPassedByReference){
+            if ($paramMeta->isPassedByReference) {
                 list($target, $ori) = $handler->getMappingBySource('params.'.$paramName);
-                if($ori){
+                if ($ori) {
                     $handler->eraseMapping($target);
                 }
                 //输出绑定
@@ -63,7 +63,7 @@ 
                         ContainerFactory::create($entityBuilder, $paramMeta->type)
                     )
                 );
-            }else{
+            }else {
                 $paramMeta->source = $params[0];
             }
         }

src/Controller/Annotations/RouteAnnotationHandler.php

Spacing +16 added lines, -16 removed lines

@@ -43,7 +43,7 @@ 
             'DELETE'
         ]) or \PhpBoot\abort(new AnnotationSyntaxException("unknown method http $httpMethod in {$container->getClassName()}::$target"));
         //获取方法参数信息
-        $rfl =  new \ReflectionClass($container->getClassName());
+        $rfl = new \ReflectionClass($container->getClassName());
         $method = $rfl->getMethod($target);
         $methodParams = $method->getParameters();
 
@@ -68,9 +68,9 @@ 
         $routeParser = new Std();
         $uri = $params->getParam(1);
         $info = $routeParser->parse($uri); //0.4和1.0返回值不同, 不兼容
-        if(isset($info[0])){
-            foreach ($info[0] as $i){
-                if(is_array($i)) {
+        if (isset($info[0])) {
+            foreach ($info[0] as $i) {
+                if (is_array($i)) {
                     $route->addPathParam($i[0]);
                 }
             }
@@ -79,31 +79,31 @@ 
         $hasRefParam = false;
         //设置参数列表
         $paramsMeta = [];
-        foreach ($methodParams as $param){
+        foreach ($methodParams as $param) {
             $paramName = $param->getName();
             $source = "request.$paramName";
-            if($route->hasPathParam($paramName)){ //参数来自路由
+            if ($route->hasPathParam($paramName)) { //参数来自路由
                 $source = "request.$paramName";
-            }elseif($httpMethod == 'GET'){
+            }elseif ($httpMethod == 'GET') {
                 $source = "request.$paramName"; //GET请求显示指定来自query string
             }
             $paramClass = $param->getClass();
-            if($paramClass){
+            if ($paramClass) {
                 $paramClass = $paramClass->getName();
             }
             $entityContainer = ContainerFactory::create($entityBuilder, $paramClass);
             $meta = new ParamMeta($paramName,
                 $source,
-                $paramClass?:'mixed',
+                $paramClass ?: 'mixed',
                 $param->isOptional(),
-                $param->isOptional()?$param->getDefaultValue():null,
+                $param->isOptional() ? $param->getDefaultValue() : null,
                 $param->isPassedByReference(),
                 null,
                 '',
                 $entityContainer
             );
             $paramsMeta[] = $meta;
-            if($meta->isPassedByReference){
+            if ($meta->isPassedByReference) {
                 $hasRefParam = true;
                 $responseHandler->setMapping('response.content.'.$meta->name, new ReturnMeta(
                     'params.'.$meta->name,
@@ -114,16 +114,16 @@ 
         }
 
         $requestHandler->setParamMetas($paramsMeta);
-        if(!$hasRefParam){
-            $responseHandler->setMapping('response.content', new ReturnMeta('return','mixed','', new MixedTypeContainer()));
-        }else{
+        if (!$hasRefParam) {
+            $responseHandler->setMapping('response.content', new ReturnMeta('return', 'mixed', '', new MixedTypeContainer()));
+        }else {
             //当存在引用参数作为输出时, 默认将 return 数据绑定的到 data 下, 以防止和引用参数作为输出重叠
-            $responseHandler->setMapping($this->returnTarget, new ReturnMeta('return','mixed','', new MixedTypeContainer()));
+            $responseHandler->setMapping($this->returnTarget, new ReturnMeta('return', 'mixed', '', new MixedTypeContainer()));
         }
 
 
         $container->addRoute($target, $route);
     }
 
-    public $returnTarget='response.content.data';
+    public $returnTarget = 'response.content.data';
 }
\ No newline at end of file

src/ORM/ModelWithClass.php

Spacing +11 added lines, -11 removed lines

@@ -29,9 +29,9 @@ 
             ->from($this->entity->getTable())
             ->where("`{$this->entity->getPK()}` = ?", $id)
             ->getFirst();
-        if($row){
+        if ($row) {
             return $this->entity->make($row, false);
-        }else{
+        }else {
             return null;
         }
     }
@@ -53,7 +53,7 @@ 
      * @param mixed|null $_
      * @return \PhpBoot\DB\rules\basic\OrderByRule
      */
-    public function deleteWhere($conditions, $_=null)
+    public function deleteWhere($conditions, $_ = null)
     {
         $query = $this->db->deleteFrom($this->entity->getTable());
         return call_user_func_array([$query, 'where'], func_get_args());
@@ -75,12 +75,12 @@ 
      * @param string $_
      * @return \PhpBoot\DB\rules\select\GroupByRule
      */
-    public function findWhere($conditions=null, $_=null)
+    public function findWhere($conditions = null, $_ = null)
     {
-        $query =  $this->db->select($this->getColumns())
+        $query = $this->db->select($this->getColumns())
             ->from($this->entity->getTable());
-        $query->context->resultHandler = function ($result){
-            foreach ($result as &$i){
+        $query->context->resultHandler = function($result) {
+            foreach ($result as &$i) {
                 $i = $this->entity->make($i, false);
             }
             return $result;
@@ -107,16 +107,16 @@ 
      * @param string $_
      * @return \PhpBoot\DB\rules\basic\OrderByRule
      */
-    public function updateWhere($values, $conditions, $_=null)
+    public function updateWhere($values, $conditions, $_ = null)
     {
-        $query =  $this->db->update($this->entity->getTable())->set($values);
-        return call_user_func_array([$query, 'where'], array_slice(func_get_args(),1));
+        $query = $this->db->update($this->entity->getTable())->set($values);
+        return call_user_func_array([$query, 'where'], array_slice(func_get_args(), 1));
     }
 
     protected function getColumns()
     {
         $columns = [];
-        foreach ($this->entity->getProperties() as $p){
+        foreach ($this->entity->getProperties() as $p) {
             $columns[] = $p->name;
         }
         return $columns;

src/DB/DB.php

Spacing +18 added lines, -18 removed lines

@@ -56,7 +56,7 @@ 
  *      
  * @author caoym <caoyangmin@gmail.com>
  */
-class DB{
+class DB {
 
     /**
      * DB constructor.
@@ -97,18 +97,18 @@ 
      * @param string $column0
      * @return \PhpBoot\DB\rules\select\FromRule
      */
-    function select($column0=null, $_=null){
+    function select($column0 = null, $_ = null) {
         $obj = new SelectRule(new Context($this->connection));
-        if($column0 == null){
+        if ($column0 == null) {
             $args = ['*'];
-        }elseif(is_array($column0)){
+        }elseif (is_array($column0)) {
             $args = $column0;
-        }else{
+        }else {
             $args = func_get_args();
         }
-        foreach ($args as &$arg){
+        foreach ($args as &$arg) {
             $arg = DB::wrap($arg);
-            if($arg == '*'){
+            if ($arg == '*') {
                 continue;
             }
 
@@ -140,8 +140,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\basic\WhereRule
      */
-    public function deleteFrom($table){
-        $obj  =  new DeleteRule(new Context($this->connection));
+    public function deleteFrom($table) {
+        $obj = new DeleteRule(new Context($this->connection));
         return $obj->deleteFrom($table);
     }
     /**
@@ -149,8 +149,8 @@ 
      * @param string $table
      * @return \PhpBoot\DB\rules\replace\ValuesRule
      */
-    public function replaceInto($table){
-        $obj  =  new ReplaceIntoRule(new Context($this->connection));
+    public function replaceInto($table) {
+        $obj = new ReplaceIntoRule(new Context($this->connection));
         return $obj->replaceInto($table);
     }
 
@@ -161,16 +161,16 @@ 
      */
     public function transaction(callable $callback)
     {
-        if($this->inTransaction){
+        if ($this->inTransaction) {
             return $callback($this);
         }
         $this->getConnection()->beginTransaction() or \PhpBoot\abort('beginTransaction failed');
         $this->inTransaction = true;
-        try{
+        try {
             $res = $callback($this);
             $this->getConnection()->commit() or \PhpBoot\abort('commit failed');
             return $res;
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
             $this->getConnection()->rollBack();
             Logger::warning('commit failed with '.get_class($e).' '.$e->getMessage());
             throw $e;
@@ -191,7 +191,7 @@ 
      * @param string $str
      * @return Raw
      */
-    static public function raw($str){
+    static public function raw($str) {
         return new Raw($str);
     }
     static public function wrap($value)
@@ -199,7 +199,7 @@ 
         if ($value === '*') {
             return $value;
         }
-        if($value instanceof Raw){
+        if ($value instanceof Raw) {
             return $value->get();
         }
         return '`'.str_replace('`', '``', $value).'`';
@@ -212,8 +212,8 @@ 
     {
         return $this->app;
     }
-    const ORDER_BY_ASC ='ASC';
-    const ORDER_BY_DESC ='DESC';
+    const ORDER_BY_ASC = 'ASC';
+    const ORDER_BY_DESC = 'DESC';
 
     /**
      * @var \PDO