From ced92841236ac0cd3677579002916dd343647166 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 29 Jul 2016 04:51:33 +0200 Subject: [PATCH] Fix tests --- src/Monolog/Handler/RotatingFileHandler.php | 2 +- tests/Monolog/Formatter/NormalizerFormatterTest.php | 4 ++++ tests/Monolog/Handler/RotatingFileHandlerTest.php | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Monolog/Handler/RotatingFileHandler.php b/src/Monolog/Handler/RotatingFileHandler.php index 101c1dc8..3b60b3d1 100644 --- a/src/Monolog/Handler/RotatingFileHandler.php +++ b/src/Monolog/Handler/RotatingFileHandler.php @@ -71,7 +71,7 @@ class RotatingFileHandler extends StreamHandler if (!preg_match('{^Y(([/_.-]?m)([/_.-]?d)?)?$}', $dateFormat)) { trigger_error( '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 '. 'date formats using slashes, underscores and/or dots instead of dashes.', E_USER_DEPRECATED diff --git a/tests/Monolog/Formatter/NormalizerFormatterTest.php b/tests/Monolog/Formatter/NormalizerFormatterTest.php index a0d2f595..ea752b4a 100644 --- a/tests/Monolog/Formatter/NormalizerFormatterTest.php +++ b/tests/Monolog/Formatter/NormalizerFormatterTest.php @@ -87,6 +87,10 @@ class NormalizerFormatterTest extends \PHPUnit_Framework_TestCase public function testFormatSoapFaultException() { + if (!class_exists('SoapFault')) { + $this->markTestSkipped('Requires the soap extension'); + } + $formatter = new NormalizerFormatter('Y-m-d'); $e = new \SoapFault('foo', 'bar', 'hello', 'world'); $formatted = $formatter->format(array( diff --git a/tests/Monolog/Handler/RotatingFileHandlerTest.php b/tests/Monolog/Handler/RotatingFileHandlerTest.php index 96e6dff4..c5106175 100644 --- a/tests/Monolog/Handler/RotatingFileHandlerTest.php +++ b/tests/Monolog/Handler/RotatingFileHandlerTest.php @@ -145,9 +145,9 @@ class RotatingFileHandlerTest extends TestCase if (!$valid) { $this->assertErrorWasTriggered( E_USER_DEPRECATED, - 'Invalid date format - format should be one of '. - 'RotatingFileHandler::FILE_PER_DAY, RotatingFileHandler::FILE_PER_MONTH '. - 'or RotatingFileHandler::FILE_PER_YEAR.' + 'Invalid date format - format must be one of 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 date formats using slashes, underscores and/or dots instead of dashes.' ); } }