Remove YII_ENV.

yiisoft · Oct 21, 2023 · f58eb36 · f58eb36
1 parent b748818
commit f58eb36
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 11 deletions.
diff --git a/framework/console/controllers/ServeController.php b/framework/console/controllers/ServeController.php
@@ -86,11 +86,7 @@ public function actionIndex($address = 'localhost')
             $command .= " -r \"{$router}\"";
         }
 
-        if (YII_ENV === 'test') {
-            return true;
-        }
-
-        passthru($command);
+        $this->runCommand($command);
     }
 
     /**
@@ -132,4 +128,9 @@ protected function isAddressTaken($address)
         fclose($fp);
         return true;
     }
+
+    protected function runCommand($command)
+    {
+        passthru($command);
+    }
 }
diff --git a/tests/framework/console/controllers/ServeControllerTest.php b/tests/framework/console/controllers/ServeControllerTest.php
@@ -31,10 +31,11 @@ public function testAddressTaken()
         /** @var ServeController $serveController */
         $serveController = $this->getMockBuilder(ServeControllerMocK::className())
             ->setConstructorArgs(['serve', Yii::$app])
-            ->setMethods(['isAddressTaken'])
+            ->setMethods(['isAddressTaken', 'runCommand'])
             ->getMock();
 
         $serveController->expects($this->once())->method('isAddressTaken')->willReturn(true);
+        $serveController->expects($this->never())->method('runCommand');
 
         $serveController->docroot = $docroot;
         $serveController->port = 8080;
@@ -48,14 +49,21 @@ public function testAddressTaken()
         $this->assertContains('http://localhost:8080 is taken by another process.', $result);
     }
 
-    public function testDefautlValues()
+    public function testDefaultValues()
     {
         $docroot = __DIR__ . '/stub';
 
-        $serveController = new ServeControllerMock('serve', Yii::$app);
+        /** @var ServeController $serveController */
+        $serveController = $this->getMockBuilder(ServeControllerMock::className())
+            ->setConstructorArgs(['serve', Yii::$app])
+            ->setMethods(['runCommand'])
+            ->getMock();
+
         $serveController->docroot = $docroot;
         $serveController->port = 8080;
 
+        $serveController->expects($this->once())->method('runCommand')->willReturn(true);
+
         ob_start();
         $serveController->actionIndex();
         ob_end_clean();
@@ -71,9 +79,16 @@ public function testDoocRootWithNoExistValue()
     {
         $docroot = '/not/exist/path';
 
-        $serveController = new ServeControllerMock('serve', Yii::$app);
+        /** @var ServeController $serveController */
+        $serveController = $this->getMockBuilder(ServeControllerMock::className())
+            ->setConstructorArgs(['serve', Yii::$app])
+            ->setMethods(['runCommand'])
+            ->getMock();
+
         $serveController->docroot = $docroot;
 
+        $serveController->expects($this->any())->method('runCommand')->willReturn(true);
+
         ob_start();
         $serveController->actionIndex();
         ob_end_clean();
@@ -88,11 +103,18 @@ public function testWithRouterNoExistValue()
         $docroot = __DIR__ . '/stub';
         $router = '/not/exist/path';
 
-        $serveController = new ServeControllerMock('serve', Yii::$app);
+        /** @var ServeController $serveController */
+        $serveController = $this->getMockBuilder(ServeControllerMock::className())
+            ->setConstructorArgs(['serve', Yii::$app])
+            ->setMethods(['runCommand'])
+            ->getMock();
+
         $serveController->docroot = $docroot;
         $serveController->port = 8081;
         $serveController->router = $router;
 
+        $serveController->expects($this->any())->method('runCommand')->willReturn(true);
+
         ob_start();
         $serveController->actionIndex();
         ob_end_clean();
@@ -107,11 +129,18 @@ public function testWithRouterValue()
         $docroot = __DIR__ . '/stub';
         $router = __DIR__ . '/stub/index.php';
 
-        $serveController = new ServeControllerMock('serve', Yii::$app);
+        /** @var ServeController $serveController */
+        $serveController = $this->getMockBuilder(ServeControllerMock::className())
+            ->setConstructorArgs(['serve', Yii::$app])
+            ->setMethods(['runCommand'])
+            ->getMock();
+
         $serveController->docroot = $docroot;
         $serveController->port = 8081;
         $serveController->router = $router;
 
+        $serveController->expects($this->once())->method('runCommand')->willReturn(true);
+
         ob_start();
         $serveController->actionIndex();
         ob_end_clean();