From a6ecf50e74e527e0e28598b138d54bef42bd570f Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Fri, 29 Jul 2016 04:03:22 +0200 Subject: [PATCH] Allow other separators for the date format in RotatingFileHandler --- src/Monolog/Handler/RotatingFileHandler.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Monolog/Handler/RotatingFileHandler.php b/src/Monolog/Handler/RotatingFileHandler.php index cd938057..c4b2227a 100644 --- a/src/Monolog/Handler/RotatingFileHandler.php +++ b/src/Monolog/Handler/RotatingFileHandler.php @@ -68,11 +68,12 @@ class RotatingFileHandler extends StreamHandler public function setFilenameFormat($filenameFormat, $dateFormat) { - if (!in_array($dateFormat, array(self::FILE_PER_DAY, self::FILE_PER_MONTH, self::FILE_PER_YEAR))) { + if (!preg_match('{^Y(([/_.-]m)([/_.-]d)?)?$}', $dateFormat)) { trigger_error( - '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.', E_USER_DEPRECATED ); }