From a7f365a173c725e3d324c848aef09e465f5ff560 Mon Sep 17 00:00:00 2001 From: luigifab <31816829+luigifab@users.noreply.github.com> Date: Mon, 16 Jan 2023 10:27:58 +0100 Subject: [PATCH] PHP 8.1: Replaced deprecated strftime() with date() (#2934) --- app/code/core/Mage/CatalogIndex/Model/Indexer.php | 4 ++-- app/code/core/Mage/Cron/Model/Observer.php | 8 ++++---- app/code/core/Mage/Cron/Model/Schedule.php | 4 ++-- app/code/core/Mage/Log/Model/Aggregation.php | 2 +- lib/Varien/Db/Adapter/Mysqli.php | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/code/core/Mage/CatalogIndex/Model/Indexer.php b/app/code/core/Mage/CatalogIndex/Model/Indexer.php index 55e3f748e41..32ff0cff5f2 100644 --- 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 index adad9c9aeed..1f8ef698a74 100644 --- 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 index af62c8ebfc7..d90cef1b47d 100644 --- 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 index 08e1d9d3dc1..eeb69f3faf5 100644 --- 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 index a638de02fd5..1be2fd66e10 100644 --- a/lib/Varien/Db/Adapter/Mysqli.php +++ b/lib/Varien/Db/Adapter/Mysqli.php @@ -115,7 +115,7 @@ 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) @@ -123,7 +123,7 @@ 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