diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug #34203 [FrameworkBundle] [HttpKernel] fixed correct EOL and EOM month (erics86)

Browse Source 
This PR was submitted for the master branch but it was merged into the 3.4 branch instead (closes #34203).

Discussion
----------

[FrameworkBundle] [HttpKernel] fixed correct EOL and EOM month

Q | A
-- | --
Branch? | 3.4
Bug fix? | yes
New feature? | no
Deprecations? | no
Tickets | -
License | MIT
Doc PR | -

Commits
-------

613717d71f [FrameworkBundle] [HttpKernel] fixed correct EOL and EOM month
This commit is contained in:
Fabien Potencier 2019-11-03 13:06:46 +01:00
commit a1b507974e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
View File

@ -123,7 +123,7 @@ EOT
private static function isExpired($date)
{
$date = \DateTime::createFromFormat('m/Y', $date);
$date = \DateTime::createFromFormat('d/m/Y', '01/'.$date);
return false !== $date && new \DateTime() > $date->modify('last day of this month 23:59:59');
}

8
src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
View File

@ -81,8 +81,8 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
$this->data['symfony_state'] = $this->determineSymfonyState();
$this->data['symfony_minor_version'] = sprintf('%s.%s', Kernel::MAJOR_VERSION, Kernel::MINOR_VERSION);
$eom = \DateTime::createFromFormat('m/Y', Kernel::END_OF_MAINTENANCE);
$eol = \DateTime::createFromFormat('m/Y', Kernel::END_OF_LIFE);
$eom = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_MAINTENANCE);
$eol = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_LIFE);
$this->data['symfony_eom'] = $eom->format('F Y');
$this->data['symfony_eol'] = $eol->format('F Y');
}
@ -314,8 +314,8 @@ class ConfigDataCollector extends DataCollector implements LateDataCollectorInte
private function determineSymfonyState()
{
$now = new \DateTime();
$eom = \DateTime::createFromFormat('m/Y', Kernel::END_OF_MAINTENANCE)->modify('last day of this month');
$eol = \DateTime::createFromFormat('m/Y', Kernel::END_OF_LIFE)->modify('last day of this month');
$eom = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_MAINTENANCE)->modify('last day of this month');
$eol = \DateTime::createFromFormat('d/m/Y', '01/'.Kernel::END_OF_LIFE)->modify('last day of this month');
if ($now > $eol) {
$versionState = 'eol';