tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX Ensure phpdbg calls are registered by SilverStripe core as a CLI call

Browse Source
This commit is contained in:
Robbie Averill 2017-07-17 16:56:01 +12:00
parent 7fd316d405
commit ea4181166f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Control/Director.php
View File

@ -944,7 +944,7 @@ class Director implements TemplateGlobalProvider
*/ */
public static function is_cli() public static function is_cli()
{ {
return php_sapi_name() === "cli"; return in_array(php_sapi_name(), ['cli', 'phpdbg']);
} }
/** /**

8
tests/php/Control/DirectorTest.php
View File

@ -761,4 +761,12 @@ class DirectorTest extends SapphireTest
$this->assertEquals(2, $middleware->preCalls); $this->assertEquals(2, $middleware->preCalls);
$this->assertEquals(1, $specificMiddleware->postCalls); $this->assertEquals(1, $specificMiddleware->postCalls);
} }
/**
* If using phpdbg it returns itself instead of "cli" from php_sapi_name()
*/
public function testIsCli()
{
$this->assertTrue(Director::is_cli(), 'is_cli should be true for PHP CLI and phpdbg');
}
} }