mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-05 04:37:38 +02:00
Code Issues Releases Wiki Activity

Fix tests

Browse Source
This commit is contained in:
Jordi Boggiano
2016-07-29 04:51:33 +02:00
parent 5052fe7b1f
commit ced9284123
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Monolog/Handler/RotatingFileHandler.php
View File

@@ -71,7 +71,7 @@ class RotatingFileHandler extends StreamHandler
if (!preg_match('{^Y(([/_.-]?m)([/_.-]?d)?)?$}', $dateFormat)) { if (!preg_match('{^Y(([/_.-]?m)([/_.-]?d)?)?$}', $dateFormat)) {
trigger_error( trigger_error(
'Invalid date format - format must be one of '. 'Invalid date format - format must be one of '.
'RotatingFileHandler::FILE_PER_DAY ("Y-m-d"), RotatingFileHandler::FILE_PER_MONTH ("Y-m")'. 'RotatingFileHandler::FILE_PER_DAY ("Y-m-d"), RotatingFileHandler::FILE_PER_MONTH ("Y-m") '.
'or RotatingFileHandler::FILE_PER_YEAR ("Y"), or you can set one of the '. 'or RotatingFileHandler::FILE_PER_YEAR ("Y"), or you can set one of the '.
'date formats using slashes, underscores and/or dots instead of dashes.', 'date formats using slashes, underscores and/or dots instead of dashes.',
E_USER_DEPRECATED E_USER_DEPRECATED

4
tests/Monolog/Formatter/NormalizerFormatterTest.php
View File

@@ -87,6 +87,10 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase
public function testFormatSoapFaultException() public function testFormatSoapFaultException()
{ {
if (!class_exists('SoapFault')) {
$this->markTestSkipped('Requires the soap extension');
}
$formatter = new NormalizerFormatter('Y-m-d'); $formatter = new NormalizerFormatter('Y-m-d');
$e = new \SoapFault('foo', 'bar', 'hello', 'world'); $e = new \SoapFault('foo', 'bar', 'hello', 'world');
$formatted = $formatter->format(array( $formatted = $formatter->format(array(

6
tests/Monolog/Handler/RotatingFileHandlerTest.php
View File

@@ -145,9 +145,9 @@ class RotatingFileHandlerTest extends TestCase
if (!$valid) { if (!$valid) {
$this->assertErrorWasTriggered( $this->assertErrorWasTriggered(
E_USER_DEPRECATED, E_USER_DEPRECATED,
'Invalid date format - format should be one of '. 'Invalid date format - format must be one of RotatingFileHandler::FILE_PER_DAY ("Y-m-d"), '.
'RotatingFileHandler::FILE_PER_DAY, RotatingFileHandler::FILE_PER_MONTH '. 'RotatingFileHandler::FILE_PER_MONTH ("Y-m") or RotatingFileHandler::FILE_PER_YEAR ("Y"), '.
'or RotatingFileHandler::FILE_PER_YEAR.' 'or you can set one of the date formats using slashes, underscores and/or dots instead of dashes.'
); );
} }
} }