tests: use app call :sparkles

Author: TIGERB

cli

@@ -69,7 +69,7 @@ foreach ($argv as $v) {
 }
 
 // 设置cli模式
-putenv('IS_CLI=true');
+putenv('IS_CLI=yes');
 $method              = $input['method'];
 $method              = explode('.', $method);
 $input['module']     = $method[0];

framework/App.php

@@ -68,6 +68,17 @@ class App
      */
     public static $app;
 
+    /**
+     * 是否输出响应结果
+     *
+     * 默认输出
+     *
+     * cli模式　访问路径为空　不输出
+     *
+     * @var boolean
+     */
+    private $notOutput = false;
+
     /**
      * 服务容器
      *
@@ -199,7 +210,7 @@ public function callSelf($method = '', $uri = '')
         }
         $request = self::$container->getSingle('request');
         $request->method        = $method;
-        $router = self::$container->getSingle('router');
+        $router  = self::$container->getSingle('router');
         $router->moduleName     = $requestUri[0];
         $router->controllerName = $requestUri[1];
         $router->actionName     = $requestUri[2];
@@ -233,6 +244,9 @@ public function run(Closure $request)
      */
     public function response(Closure $closure)
     {
+        if ($this->notOutput === true) {
+            return;
+        }
         // $closure()->reponse($this->responseData);
         $closure()->restSuccess($this->responseData);
     }

framework/Request.php

@@ -109,11 +109,11 @@ class Request
     public function __construct(App $app)
     {
         $this->serverParams = $_SERVER;
-        $this->method       = strtolower($_SERVER['REQUEST_METHOD']);
-        $this->serverIp     = $_SERVER['REMOTE_ADDR'];
-        $this->clientIp     = $_SERVER['SERVER_ADDR'];
-        $this->beginTime    = $_SERVER['REQUEST_TIME_FLOAT'];
-        if ($app->isCli === 'true') {
+        $this->method       = isset($_SERVER['REQUEST_METHOD'])? strtolower($_SERVER['REQUEST_METHOD']) : 'get';
+        $this->serverIp     = isset($_SERVER['REMOTE_ADDR'])? $_SERVER['REMOTE_ADDR'] : '';
+        $this->clientIp     = isset($_SERVER['SERVER_ADDR'])? $_SERVER['SERVER_ADDR'] : '';
+        $this->beginTime    = isset($_SERVER['REQUEST_TIME_FLOAT'])? $_SERVER['REQUEST_TIME_FLOAT'] : time(true);
+        if ($app->isCli === 'yes') {
             // cli 模式
             $this->requestParams = $_REQUEST['argv'];
             $this->getParams     = $_REQUEST['argv'];

framework/handles/RouterHandle.php

@@ -222,7 +222,7 @@ public function register(App $app)
 
         /* 路由策略　*/
         $this->routeStrategy  = 'pathinfo';
-        if (strpos($this->requestUri, 'index.php') || $app->isCli === 'true') {
+        if (strpos($this->requestUri, 'index.php') || $app->isCli === 'yes') {
             $this->routeStrategy = 'general';
         }
 
@@ -308,10 +308,12 @@ public function pathinfo()
             preg_match_all('/^\/(.*)/', $this->requestUri, $uri);
         }
 
+        // 使用默认模块/控制器/操作逻辑
         if (!isset($uri[1][0]) || empty($uri[1][0])) {
-            /*
-            * 使用默认模块/控制器/操作逻辑
-            */
+            // CLI 模式不输出
+            if ($this->app->isCli === 'yes') {
+                $this->app->notOutput = true;
+            }
             return;
         }
         $uri = $uri[1][0];
@@ -382,6 +384,9 @@ private function userDefined()
         }
         $map = $this->$method;
         $this->app->responseData = $map[$uri]($app);
+        if ($this->app->isCli === 'yes') {
+            $this->app->notOutput = false;
+        }
         return true;
     }
 

phpunit.xml

@@ -21,5 +21,6 @@
     </filter>
     <php>
         <env name="APP_ENV" value="testing"/>
+        <env name="IS_CLI" value="yes"/>
     </php>
 </phpunit>

tests/demo/DemoTest.php

@@ -12,7 +12,7 @@
 namespace Tests\Demo;
 
 use Tests\TestCase;
-use App\Demo\Controllers\Index;
+use Framework\App;
 
 /**
  * 单元测试 示例
@@ -26,11 +26,9 @@ class DemoTest extends TestCase
      */
     public function testDemo()
     {
-        $index = new Index();
-
         $this->assertEquals(
             'Hello Easy PHP',
-            $index->hello()
+            App::$app->get('demo/index/hello')
         );
     }
 }