PHP 8.1: Replaced deprecated strftime() with date() (#2934)

luigifab · web-flow · commit a7fdf56f4350 · 2023-01-16T09:27:58.000Z
diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php
@@ -717,7 +717,7 @@ public function buildEntityFilter($attributes, $values, &$filteredAttributes, $p
                                 if (isset($values[$code]['from']) && isset($values[$code]['to'])) {
                                     if ($values[$code]['from']) {
                                         if (!is_numeric($values[$code]['from'])) {
-                                            $_date = date("Y-m-d H:i:s", strtotime($values[$code]['from']));
+                                            $_date = date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, strtotime($values[$code]['from']));
                                             $values[$code]['from'] = $_date;
                                         }
 
@@ -726,7 +726,7 @@ public function buildEntityFilter($attributes, $values, &$filteredAttributes, $p
 
                                     if ($values[$code]['to']) {
                                         if (!is_numeric($values[$code]['to'])) {
-                                            $values[$code]['to'] = date("Y-m-d H:i:s", strtotime($values[$code]['to']));
+                                            $values[$code]['to'] = date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, strtotime($values[$code]['to']));
                                         }
                                         $filter[$code]->where("value <= ?", $values[$code]['to']);
                                     }
diff --git a/app/code/core/Mage/Cron/Model/Observer.php b/app/code/core/Mage/Cron/Model/Observer.php
@@ -183,7 +183,7 @@ protected function _generateJobs($jobs, $exists)
                 ->setStatus(Mage_Cron_Model_Schedule::STATUS_PENDING);
 
             for ($time = $now; $time < $timeAhead; $time += 60) {
-                $ts = strftime('%Y-%m-%d %H:%M:00', $time);
+                $ts = date('Y-m-d H:i:00', $time);
                 if (!empty($exists[$jobCode . '/' . $ts])) {
                     // already scheduled
                     continue;
@@ -319,14 +319,14 @@ protected function _processJob($schedule, $jobConfig, $isAlways = false)
             }
 
             $schedule
-                ->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', time()))
+                ->setExecutedAt(date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT))
                 ->save();
 
             call_user_func_array($callback, $arguments);
 
             $schedule
                 ->setStatus(Mage_Cron_Model_Schedule::STATUS_SUCCESS)
-                ->setFinishedAt(strftime('%Y-%m-%d %H:%M:%S', time()));
+                ->setFinishedAt(date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT));
         } catch (Exception $e) {
             $schedule->setStatus($errorStatus)
                 ->setMessages($e->__toString());
@@ -347,7 +347,7 @@ protected function _getAlwaysJobSchedule($jobCode)
         /** @var Mage_Cron_Model_Schedule $schedule */
         $schedule = Mage::getModel('cron/schedule')->load($jobCode, 'job_code');
         if ($schedule->getId() === null) {
-            $ts = strftime('%Y-%m-%d %H:%M:00', time());
+            $ts = date('Y-m-d H:i:00');
             $schedule->setJobCode($jobCode)
                 ->setCreatedAt($ts)
                 ->setScheduledAt($ts);
diff --git a/app/code/core/Mage/Cron/Model/Schedule.php b/app/code/core/Mage/Cron/Model/Schedule.php
@@ -107,8 +107,8 @@ public function trySchedule($time)
             && $this->matchCronExpression($e[4], $d['wday']);
 
         if ($match) {
-            $this->setCreatedAt(strftime('%Y-%m-%d %H:%M:%S', time()));
-            $this->setScheduledAt(strftime('%Y-%m-%d %H:%M', (int)$time));
+            $this->setCreatedAt(date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT));
+            $this->setScheduledAt(date('Y-m-d H:i:00', (int)$time));
         }
         return $match;
     }
diff --git a/app/code/core/Mage/Log/Model/Aggregation.php b/app/code/core/Mage/Log/Model/Aggregation.php
@@ -167,7 +167,7 @@ private function _date($in, $offset = null)
     {
         $out = $in;
         if (is_numeric($in)) {
-            $out = date("Y-m-d H:i:s", $in);
+            $out = date(Varien_Date::DATETIME_PHP_FORMAT, $in);
         }
         return $out;
     }
diff --git a/lib/Varien/Db/Adapter/Mysqli.php b/lib/Varien/Db/Adapter/Mysqli.php
@@ -115,15 +115,15 @@ public function convertDate($date)
         if ($date instanceof Zend_Date) {
             return $date->toString(self::ISO_DATE_FORMAT);
         }
-        return strftime('%Y-%m-%d', strtotime($date));
+        return date(Varien_Db_Adapter_Pdo_Mysql::DATE_FORMAT, strtotime($date));
     }
 
     public function convertDateTime($datetime)
     {
         if ($datetime instanceof Zend_Date) {
             return $datetime->toString(self::ISO_DATETIME_FORMAT);
         }
-        return strftime('%Y-%m-%d %H:%M:%S', strtotime($datetime));
+        return date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, strtotime($datetime));
     }
 
     // phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps

Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ public function buildEntityFilter($attributes, $values, &$filteredAttributes, $p`
`717`	`717`	`if (isset($values[$code]['from']) && isset($values[$code]['to'])) {`
`718`	`718`	`if ($values[$code]['from']) {`
`719`	`719`	`if (!is_numeric($values[$code]['from'])) {`
`720`		`- $_date = date("Y-m-d H:i:s", strtotime($values[$code]['from']));`
	`720`	`+ $_date = date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, strtotime($values[$code]['from']));`
`721`	`721`	`$values[$code]['from'] = $_date;`
`722`	`722`	`}`
`723`	`723`
`@@ -726,7 +726,7 @@ public function buildEntityFilter($attributes, $values, &$filteredAttributes, $p`
`726`	`726`
`727`	`727`	`if ($values[$code]['to']) {`
`728`	`728`	`if (!is_numeric($values[$code]['to'])) {`
`729`		`- $values[$code]['to'] = date("Y-m-d H:i:s", strtotime($values[$code]['to']));`
	`729`	`+ $values[$code]['to'] = date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, strtotime($values[$code]['to']));`
`730`	`730`	`}`
`731`	`731`	`$filter[$code]->where("value <= ?", $values[$code]['to']);`
`732`	`732`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,8 @@ public function trySchedule($time)`
`107`	`107`	`&& $this->matchCronExpression($e[4], $d['wday']);`
`108`	`108`
`109`	`109`	`if ($match) {`
`110`		`- $this->setCreatedAt(strftime('%Y-%m-%d %H:%M:%S', time()));`
`111`		`- $this->setScheduledAt(strftime('%Y-%m-%d %H:%M', (int)$time));`
	`110`	`+ $this->setCreatedAt(date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT));`
	`111`	`+ $this->setScheduledAt(date('Y-m-d H:i:00', (int)$time));`
`112`	`112`	`}`
`113`	`113`	`return $match;`
`114`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,7 @@ private function _date($in, $offset = null)`
`167`	`167`	`{`
`168`	`168`	`$out = $in;`
`169`	`169`	`if (is_numeric($in)) {`
`170`		`- $out = date("Y-m-d H:i:s", $in);`
	`170`	`+ $out = date(Varien_Date::DATETIME_PHP_FORMAT, $in);`
`171`	`171`	`}`
`172`	`172`	`return $out;`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,15 +115,15 @@ public function convertDate($date)`
`115`	`115`	`if ($date instanceof Zend_Date) {`
`116`	`116`	`return $date->toString(self::ISO_DATE_FORMAT);`
`117`	`117`	`}`
`118`		`- return strftime('%Y-%m-%d', strtotime($date));`
	`118`	`+ return date(Varien_Db_Adapter_Pdo_Mysql::DATE_FORMAT, strtotime($date));`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public function convertDateTime($datetime)`
`122`	`122`	`{`
`123`	`123`	`if ($datetime instanceof Zend_Date) {`
`124`	`124`	`return $datetime->toString(self::ISO_DATETIME_FORMAT);`
`125`	`125`	`}`
`126`		`- return strftime('%Y-%m-%d %H:%M:%S', strtotime($datetime));`
	`126`	`+ return date(Varien_Db_Adapter_Pdo_Mysql::TIMESTAMP_FORMAT, strtotime($datetime));`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`// phpcs:ignore PSR1.Methods.CamelCapsMethodName.NotCamelCaps`