Skip to content

[Core] adds ClockInterface #5168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Hanmac wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

[Core] adds ClockInterface #5168

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4014592
composer
sreichel Dec 18, 2025
becb4cb
[Core] add ClockInterface
Hanmac Dec 18, 2025
b28457a
~ fix style
Hanmac Dec 18, 2025
204d4fe
Merge branch 'main' into feature/clockHelper
Hanmac Dec 20, 2025
9c334df
Merge branch 'main' into feature/clockHelper
sreichel Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions app/code/core/Mage/Core/Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@

use Carbon\Carbon;
use Carbon\Exceptions\InvalidFormatException;
use Carbon\FactoryImmutable;
use Psr\Clock\ClockInterface;

/**
* Core data helper
*
* @package Mage_Core
*/
class Mage_Core_Helper_Data extends Mage_Core_Helper_Abstract
class Mage_Core_Helper_Data extends Mage_Core_Helper_Abstract implements ClockInterface
{
public const XML_PATH_DEFAULT_COUNTRY = 'general/country/default';

Expand Down Expand Up @@ -230,7 +232,7 @@ public function formatTime($time = null, $format = Mage_Core_Model_Locale::FORMA

$locale = Mage::app()->getLocale();
if (is_null($time)) {
$date = $locale->date(Carbon::now()->getTimestamp());
$date = $locale->date($this->now()->getTimestamp());
} elseif ($time instanceof Zend_Date) {
$date = $time;
} else {
Expand Down Expand Up @@ -1097,4 +1099,10 @@ public function recordRateLimitHit(): void
Mage::app()->saveCache(1, $cacheTag, ['brute_force'], Mage::getStoreConfig('system/rate_limit/timeframe'));
}
}

public function now(): \DateTimeImmutable
{
static $clock = new FactoryImmutable();
return $clock->now();
}
}
Loading