php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 04:37:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove YII_ENV.

Browse Source
This commit is contained in:
Wilmer Arambula
2023-10-21 08:53:15 -03:00
parent b7488185ba
commit f58eb362ca
2 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
framework/console/controllers/ServeController.php
View File

@ -86,11 +86,7 @@ class ServeController extends Controller
$command .= " -r \"{$router}\""; $command .= " -r \"{$router}\"";
} }
if (YII_ENV === 'test') { $this->runCommand($command);
return true;
}
passthru($command);
} }
/** /**
@ -132,4 +128,9 @@ class ServeController extends Controller
fclose($fp); fclose($fp);
return true; return true;
} }
protected function runCommand($command)
{
passthru($command);
}
} }

41
tests/framework/console/controllers/ServeControllerTest.php
View File

@ -31,10 +31,11 @@ class ServeControllerTest extends TestCase
/** @var ServeController $serveController */ /** @var ServeController $serveController */
$serveController = $this->getMockBuilder(ServeControllerMocK::className()) $serveController = $this->getMockBuilder(ServeControllerMocK::className())
->setConstructorArgs(['serve', Yii::$app]) ->setConstructorArgs(['serve', Yii::$app])
->setMethods(['isAddressTaken']) ->setMethods(['isAddressTaken', 'runCommand'])
->getMock(); ->getMock();
$serveController->expects($this->once())->method('isAddressTaken')->willReturn(true); $serveController->expects($this->once())->method('isAddressTaken')->willReturn(true);
$serveController->expects($this->never())->method('runCommand');
$serveController->docroot = $docroot; $serveController->docroot = $docroot;
$serveController->port = 8080; $serveController->port = 8080;
@ -48,14 +49,21 @@ class ServeControllerTest extends TestCase
$this->assertContains('http://localhost:8080 is taken by another process.', $result); $this->assertContains('http://localhost:8080 is taken by another process.', $result);
} }
public function testDefautlValues() public function testDefaultValues()
{ {
$docroot = __DIR__ . '/stub'; $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->docroot = $docroot;
$serveController->port = 8080; $serveController->port = 8080;
$serveController->expects($this->once())->method('runCommand')->willReturn(true);
ob_start(); ob_start();
$serveController->actionIndex(); $serveController->actionIndex();
ob_end_clean(); ob_end_clean();
@ -71,9 +79,16 @@ class ServeControllerTest extends TestCase
{ {
$docroot = '/not/exist/path'; $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->docroot = $docroot;
$serveController->expects($this->any())->method('runCommand')->willReturn(true);
ob_start(); ob_start();
$serveController->actionIndex(); $serveController->actionIndex();
ob_end_clean(); ob_end_clean();
@ -88,11 +103,18 @@ class ServeControllerTest extends TestCase
$docroot = __DIR__ . '/stub'; $docroot = __DIR__ . '/stub';
$router = '/not/exist/path'; $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->docroot = $docroot;
$serveController->port = 8081; $serveController->port = 8081;
$serveController->router = $router; $serveController->router = $router;
$serveController->expects($this->any())->method('runCommand')->willReturn(true);
ob_start(); ob_start();
$serveController->actionIndex(); $serveController->actionIndex();
ob_end_clean(); ob_end_clean();
@ -107,11 +129,18 @@ class ServeControllerTest extends TestCase
$docroot = __DIR__ . '/stub'; $docroot = __DIR__ . '/stub';
$router = __DIR__ . '/stub/index.php'; $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->docroot = $docroot;
$serveController->port = 8081; $serveController->port = 8081;
$serveController->router = $router; $serveController->router = $router;
$serveController->expects($this->once())->method('runCommand')->willReturn(true);
ob_start(); ob_start();
$serveController->actionIndex(); $serveController->actionIndex();
ob_end_clean(); ob_end_clean();