tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 14:18:46 +02:00
Code Issues Projects Releases Wiki Activity

Changes to error message detection to handle the differences in HHVM

Browse Source
This commit is contained in:
Simon Welsh 2013-12-21 13:17:47 +13:00
parent 627e3cdf11
commit 8de403abd4
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/core/startup/ErrorControlChainTest.php
View File

@ -13,7 +13,7 @@ class ErrorControlChainTest_Chain extends ErrorControlChain {
return parent::translateMemstring($memstring);
}
function executeInSubprocess() {
function executeInSubprocess($includeStderr = false) {
// Get the path to the ErrorControlChain class
$classpath = SS_ClassLoader::instance()->getItemPath('ErrorControlChain');
$suppression = $this->suppression ? 'true' : 'false';
@ -47,10 +47,14 @@ require_once '$classpath';
// Now stick it in a temporary file & run it
$codepath = TEMP_FOLDER.'/ErrorControlChainTest_'.sha1($src).'.php';
$null = is_writeable('/dev/null') ? '/dev/null' : 'NUL';
if($includeStderr) {
$null = '&1';
} else {
$null = is_writeable('/dev/null') ? '/dev/null' : 'NUL';
}
file_put_contents($codepath, $src);
exec("php $codepath 2> $null", $stdout, $errcode);
exec("php $codepath 2>$null", $stdout, $errcode);
unlink($codepath);
return array(implode("\n", $stdout), $errcode);
@ -185,9 +189,10 @@ class ErrorControlChainTest extends SapphireTest {
->then(function($chain){
Foo::bar(); // Non-existant class causes fatal error
})
->executeInSubprocess();
->executeInSubprocess(true);
$this->assertContains("Fatal error: Class 'Foo' not found", $out);
$this->assertContains('Fatal error', $out);
$this->assertContains('Foo', $out);
// Turning off suppression during execution
@ -198,9 +203,10 @@ class ErrorControlChainTest extends SapphireTest {
$chain->setSuppression(false);
Foo::bar(); // Non-existent class causes fatal error
})
->executeInSubprocess();
->executeInSubprocess(true);
$this->assertContains("Fatal error: Class 'Foo' not found", $out);
$this->assertContains('Fatal error', $out);
$this->assertContains('Foo', $out);
}
function testDoesntAffectNonFatalErrors() {
@ -279,4 +285,4 @@ class ErrorControlChainTest extends SapphireTest {
$this->assertEquals(200, $chain->translateMemstring('200foo'));
$this->assertEquals(300, $chain->translateMemstring('300foo'));
}
}
}