mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-22 09:06:10 +02:00
Code Issues Releases Wiki Activity

Merge branch '1.x', fixes #771

Browse Source
This commit is contained in:
Jordi Boggiano
2016-07-29 04:09:04 +02:00
parent 5298d1aa33 fac277b15a
commit f952c6b5c9
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,7 +69,7 @@ class RotatingFileHandler extends StreamHandler
public function setFilenameFormat($filenameFormat, $dateFormat) public function setFilenameFormat($filenameFormat, $dateFormat)
{ {
if (!preg_match('{^Y(([/_.-]m)([/_.-]d)?)?$}', $dateFormat)) { if (!preg_match('{^Y(([/_.-]?m)([/_.-]?d)?)?$}', $dateFormat)) {
throw new InvalidArgumentException( throw new InvalidArgumentException(
'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")'.

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

@@ -156,9 +156,13 @@ class RotatingFileHandlerTest extends TestCase
['Y/m/d', true], ['Y/m/d', true],
['Y.m.d', true], ['Y.m.d', true],
['Y_m_d', true], ['Y_m_d', true],
['Ymd', true],
['Ym/d', true],
['Y/m', true], ['Y/m', true],
['Ym', true],
['Y.m', true], ['Y.m', true],
['Y_m', true], ['Y_m', true],
['Y/md', true],
['', false], ['', false],
['m-d-Y', false], ['m-d-Y', false],
['Y-m-d-h-i', false], ['Y-m-d-h-i', false],