Jordi Boggiano 9 éve
szülő
commit
ced9284123

+ 1 - 1
src/Monolog/Handler/RotatingFileHandler.php

@@ -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 - 0
tests/Monolog/Formatter/NormalizerFormatterTest.php

@@ -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(

+ 3 - 3
tests/Monolog/Handler/RotatingFileHandlerTest.php

@@ -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 '.
-                '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.'
             );
             );
         }
         }
     }
     }