fixed

pinguo · Oct 21, 2017 · 36325af · 36325af
1 parent 84cad0d
commit 36325af
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 45 deletions.
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
@@ -0,0 +1,4 @@
+<?php
+namespace PHPSTORM_META {
+    override( \PG\AOP\MI::getObject(0), type(0));
+}
diff --git a/src/Base/AOPFactory.php b/src/Base/AOPFactory.php
@@ -67,38 +67,26 @@ protected static function getDBProxy(IProxy $proxy, $coreBase)
     }
 
     /**
-     * 获取数据库Mysql/Redis池的协程.
+     * 获取协程redis
      *
-     * @param IPoolCoroutine $coroutine
-     * @param Core           $coreBase
+     * @param CoroutineRedisProxy $redisPoolCoroutine Redis协程辅助类实例
+     * @param Core $coreBase Core实例（通常为Controller实例）
      *
-     * @return Wrapper
+     * @return Wrapper|CoroutineRedisProxy AOP包装的CoroutineRedisProxy切片实例
      */
-    protected static function getDBPoolCoroutine(IPoolCoroutine $coroutine, $coreBase)
+    public static function getRedisPoolCoroutine(CoroutineRedisProxy $redisPoolCoroutine, $coreBase)
     {
-        $coroutineWrapper = new Wrapper($coroutine);
-        $coroutineWrapper->registerOnBefore(function($method, $arguments) use ($coreBase) {
+        $aopRedisPoolCoroutine = new Wrapper($redisPoolCoroutine);
+        $aopRedisPoolCoroutine->registerOnBefore(function ($method, $arguments) use ($coreBase) {
             $context = $coreBase->getContext();
             array_unshift($arguments, $context);
-            return [
+            $data = [
                 'method' => $method,
                 'arguments' => $arguments,
             ];
+            return $data;
         });
-        return $coroutineWrapper;
-    }
-
-    /**
-     * 获取协程redis
-     *
-     * @param CoroutineRedisProxy $redisPoolCoroutine Redis协程辅助类实例
-     * @param Core $coreBase Core实例（通常为Controller实例）
-     *
-     * @return Wrapper|CoroutineRedisProxy AOP包装的CoroutineRedisProxy切片实例
-     */
-    public static function getRedisPoolCoroutine(CoroutineRedisProxy $redisPoolCoroutine, $coreBase)
-    {
-        return static::getDBPoolCoroutine($redisPoolCoroutine, $coreBase);
+        return $aopRedisPoolCoroutine;
     }
 
     /**
@@ -111,7 +99,17 @@ public static function getRedisPoolCoroutine(CoroutineRedisProxy $redisPoolCorou
      */
     public static function getMysqlPoolCoroutine(MysqlAsynPool $mysqlPoolCoroutine, $coreBase)
     {
-        return static::getDBPoolCoroutine($mysqlPoolCoroutine, $coreBase);
+        $aopMysqlPoolCoroutine = new Wrapper($mysqlPoolCoroutine);
+        $aopMysqlPoolCoroutine->registerOnBefore(function ($method, $arguments) use ($coreBase) {
+            $context = $coreBase->getContext();
+            $arguments[] = $context;
+            $data = [
+                'method' => $method,
+                'arguments' => $arguments,
+            ];
+            return $data;
+        });
+        return $aopMysqlPoolCoroutine;
     }
 
     /**

diff --git a/src/Coroutine/IPoolCoroutine.php b/src/Coroutine/IPoolCoroutine.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * Created by shellvon.
+ * 标记协程池.
  *
- * @author    : shellvon<iamshellvon@gmail.com>
+ * @author camera360_server@camera360.com
  * @date      : 2017/9/30
  * @time      : 下午2:43
  * @version   1.0
@@ -12,7 +12,7 @@
 namespace PG\MSF\Coroutine;
 
 /**
- * Interface ICoroutinePool
+ * Interface IPoolCoroutine
  *
  * @package PG\MSF\Coroutine
  */

diff --git a/src/Coroutine/MySql.php b/src/Coroutine/MySql.php
@@ -22,7 +22,7 @@ class MySql extends Base
     public $mysqlAsynPool;
 
     /**
-     * @var mixed 绑定ID
+     * @var string|null 绑定ID
      */
     public $bindId;
 

diff --git a/src/Coroutine/Task.php b/src/Coroutine/Task.php
@@ -115,8 +115,6 @@ public function getController()
 
     /**
      * 请求的协程调度
-     *
-     * TODO: method too long to understand.
      */
     public function run()
     {

diff --git a/src/HttpServer.php b/src/HttpServer.php
@@ -224,7 +224,7 @@ public function onRequest($request, $response)
 
                 $instance->context = $instance->getObjectPool()->get(Context::class, [$this->requestId]);
                 // 初始化控制器
-                $instance->requestStartTime = (float)microtime(true);
+                $instance->requestStartTime = microtime(true);
 
                 // 构造请求上下文成员
                 $instance->context->setLogId($PGLog->logId);

diff --git a/src/Route/IRoute.php b/src/Route/IRoute.php
@@ -124,19 +124,4 @@ public function setRouteCache($path, $callable);
      * @return mixed|null
      */
     public function getRouteCache($path);
-
-
-    /**
-     * 获取请求报头的Host.
-     *
-     * @return string
-     */
-    public function getHost();
-
-    /**
-     * 获取文件.
-     *
-     * @return mixed
-     */
-    public function getFile();
 }