Merge pull request #4373 from mstra001/master

fix failing testLogError
This commit is contained in:
Mark Story 2014-08-24 16:06:32 +02:00
commit d99a250050

View file

@ -946,7 +946,7 @@ EXPECTED;
if (php_sapi_name() === 'cli') { if (php_sapi_name() === 'cli') {
$expected = sprintf($expectedText, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 18); $expected = sprintf($expectedText, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 18);
} else { } else {
$expected = sprintf($expectedHtml, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 19); $expected = sprintf($expectedHtml, str_replace(CAKE_CORE_INCLUDE_PATH, '', __FILE__), __LINE__ - 20);
} }
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);