diff options
| author | Jordi Boggiano <j.boggiano@seld.be> | 2016-07-29 04:05:03 +0200 |
|---|---|---|
| committer | Jordi Boggiano <j.boggiano@seld.be> | 2016-07-29 04:05:03 +0200 |
| commit | 679f4064a8e0c9c62e6da1a0a6d08ac6f8e2269d (patch) | |
| tree | 098121f7ce44e3087e2d44b5a0889cda9f9f464d /src | |
| parent | f16e67d523c746073630ec6b9a4d55069b5b502a (diff) | |
| parent | a6ecf50e74e527e0e28598b138d54bef42bd570f (diff) | |
| download | monolog-679f4064a8e0c9c62e6da1a0a6d08ac6f8e2269d.zip monolog-679f4064a8e0c9c62e6da1a0a6d08ac6f8e2269d.tar.gz monolog-679f4064a8e0c9c62e6da1a0a6d08ac6f8e2269d.tar.bz2 | |
Merge branch '1.x'
Diffstat (limited to 'src')
| -rw-r--r-- | src/Monolog/Handler/RotatingFileHandler.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Monolog/Handler/RotatingFileHandler.php b/src/Monolog/Handler/RotatingFileHandler.php index 8c99f2d..62feb22 100644 --- a/src/Monolog/Handler/RotatingFileHandler.php +++ b/src/Monolog/Handler/RotatingFileHandler.php @@ -69,11 +69,12 @@ class RotatingFileHandler extends StreamHandler public function setFilenameFormat($filenameFormat, $dateFormat) { - if (!in_array($dateFormat, [self::FILE_PER_DAY, self::FILE_PER_MONTH, self::FILE_PER_YEAR])) { + if (!preg_match('{^Y(([/_.-]m)([/_.-]d)?)?$}', $dateFormat)) { throw new InvalidArgumentException( 'Invalid date format - format must be one of '. - 'RotatingFileHandler::FILE_PER_DAY, RotatingFileHandler::FILE_PER_MONTH '. - 'or RotatingFileHandler::FILE_PER_YEAR.' + '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.' ); } if (substr_count($filenameFormat, '{date}') === 0) { |