Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Replace usage of WP's current_time without gmt parameter in libs

Browse Source 
This commit replaces usages by Carbon::now or in case we need a timestamp it
keeps current_time but adds the gtm parameter as true.
[MAILPOET-6142]
This commit is contained in:
Rostislav Wolny
2024-08-05 13:19:55 +02:00
committed by Aschepikov
parent 9209a25199
commit 33f4b2d729
58 changed files with 130 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mailpoet/lib/Subscribers/SubscribersCountsController.php
View File

@@ -8,10 +8,8 @@ use MailPoet\Entities\SubscriberEntity;
use MailPoet\InvalidStateException;
use MailPoet\Segments\SegmentsRepository;
use MailPoet\Segments\SegmentSubscribersRepository;
use MailPoet\Subscribers\SubscribersRepository;
use MailPoet\Tags\TagRepository;
use MailPoet\Util\License\Features\Subscribers as SubscribersFeature;
use MailPoet\WP\Functions as WPFunctions;
use MailPoetVendor\Carbon\Carbon;
class SubscribersCountsController {
@@ -33,17 +31,13 @@ class SubscribersCountsController {
/** @var SubscribersFeature */
private $subscribersFeature;
/** @var WPFunctions */
private $wp;
public function __construct(
SegmentsRepository $segmentsRepository,
SegmentSubscribersRepository $segmentSubscribersRepository,
SubscribersRepository $subscribersRepository,
TagRepository $subscriberTagRepository,
TransientCache $transientCache,
SubscribersFeature $subscribersFeature,
WPFunctions $wp
SubscribersFeature $subscribersFeature
) {
$this->segmentSubscribersRepository = $segmentSubscribersRepository;
@@ -52,7 +46,6 @@ class SubscribersCountsController {
$this->subscribersRepository = $subscribersRepository;
$this->tagRepository = $subscriberTagRepository;
$this->subscribersFeature = $subscribersFeature;
$this->wp = $wp;
}
public function getSubscribersWithoutSegmentStatisticsCount(): array {
@@ -108,7 +101,7 @@ class SubscribersCountsController {
}
public function recalculateHomepageStatisticsCache(): array {
$thirtyDaysAgo = Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subDays(30);
$thirtyDaysAgo = Carbon::now()->millisecond(0)->subDays(30);
$result = [];
$result['listsDataSubscribed'] = $this->subscribersRepository->getListLevelCountsOfSubscribedAfter($thirtyDaysAgo);
$result['listsDataUnsubscribed'] = $this->subscribersRepository->getListLevelCountsOfUnsubscribedAfter($thirtyDaysAgo);