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

fabpot · fabpot · commit a1b507974e71 · 2019-11-03T13:06:46.000+01:00
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 ------- 613717d [FrameworkBundle] [HttpKernel] fixed correct EOL and EOM month
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AboutCommand.php
@@ -123,7 +123,7 @@ private static function formatFileSize($path)
 
     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');
     }
diff --git a/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php b/src/Symfony/Component/HttpKernel/DataCollector/ConfigDataCollector.php
@@ -81,8 +81,8 @@ public function collect(Request $request, Response $response, \Exception $except
 
             $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 @@ public function getName()
     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';

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ private static function formatFileSize($path)`
`123`	`123`
`124`	`124`	`private static function isExpired($date)`
`125`	`125`	`{`
`126`		`- $date = \DateTime::createFromFormat('m/Y', $date);`
	`126`	`+ $date = \DateTime::createFromFormat('d/m/Y', '01/'.$date);`
`127`	`127`
`128`	`128`	`return false !== $date && new \DateTime() > $date->modify('last day of this month 23:59:59');`
`129`	`129`	`}`