From aaa58e6d20a604baae081b34eea32a48b0c2084c Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sat, 3 Jan 2026 00:09:59 +0100 Subject: [PATCH] fix deprecations --- phpstan.neon | 5 ----- src/Widget/Type/ActiveUsers.php | 6 +++++- src/Widget/Type/Duration.php | 6 +++++- src/Widget/Type/Revenue.php | 6 +++++- src/Widget/Type/RevenueUser.php | 6 +++++- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/phpstan.neon b/phpstan.neon index f1f8a0a1b..e3451c7f3 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -3569,11 +3569,6 @@ parameters: count: 1 path: src/Twig/Runtime/ThemeExtension.php - - - message: "#^Method App\\\\User\\\\LoginManager\\:\\:logInUser\\(\\) has no return type specified\\.$#" - count: 1 - path: src/User/LoginManager.php - - message: "#^Method App\\\\User\\\\UserService\\:\\:updateUser\\(\\) has parameter \\$groups with no value type specified in iterable type array\\.$#" count: 1 diff --git a/src/Widget/Type/ActiveUsers.php b/src/Widget/Type/ActiveUsers.php index 0688d6fab..b4bfb9022 100644 --- a/src/Widget/Type/ActiveUsers.php +++ b/src/Widget/Type/ActiveUsers.php @@ -87,10 +87,14 @@ final class ActiveUsers extends AbstractWidget $days->setDate($d); } + $today = $factory->create(); + $beginOfDay = $today->modify('00:00:00'); + $endOfDay = $today->modify('23:59:59'); + return [ 'days' => $days->getDays(), 'now' => $this->countActiveEntries(), - 'today' => $this->getDataForTimeRange($factory->createStartOfDay(), $factory->createEndOfDay()), + 'today' => $this->getDataForTimeRange($beginOfDay, $endOfDay), 'week' => $this->getDataForTimeRange($factory->getStartOfWeek(), $factory->getEndOfWeek()), 'month' => $this->getDataForTimeRange($factory->getStartOfMonth(), $factory->getEndOfMonth()), 'year' => $this->getDataForTimeRange($factory->createStartOfYear(), $factory->createEndOfYear()), diff --git a/src/Widget/Type/Duration.php b/src/Widget/Type/Duration.php index 13e406715..828900133 100644 --- a/src/Widget/Type/Duration.php +++ b/src/Widget/Type/Duration.php @@ -79,9 +79,13 @@ final class Duration extends AbstractWidget $days->setDate($d); } + $today = $factory->create(); + $beginOfDay = $today->modify('00:00:00'); + $endOfDay = $today->modify('23:59:59'); + return [ 'days' => $days->getDays(), - 'today' => $this->getDataForTimeRange($factory->createStartOfDay(), $factory->createEndOfDay()), + 'today' => $this->getDataForTimeRange($beginOfDay, $endOfDay), 'week' => $this->getDataForTimeRange($factory->getStartOfWeek(), $factory->getEndOfWeek()), 'month' => $this->getDataForTimeRange($factory->getStartOfMonth(), $factory->getEndOfMonth()), 'year' => $this->getDataForTimeRange($factory->createStartOfYear(), $factory->createEndOfYear()), diff --git a/src/Widget/Type/Revenue.php b/src/Widget/Type/Revenue.php index 8d6085768..138614f68 100644 --- a/src/Widget/Type/Revenue.php +++ b/src/Widget/Type/Revenue.php @@ -51,8 +51,12 @@ final class Revenue extends AbstractWidget } if ($data === null) { + $today = $factory->create(); + $beginOfDay = $today->modify('00:00:00'); + $endOfDay = $today->modify('23:59:59'); + $data = match ($type) { - DateRangeEnum::TODAY => $this->getRevenue($factory->createStartOfDay(), $factory->createEndOfDay()), + DateRangeEnum::TODAY => $this->getRevenue($beginOfDay, $endOfDay), DateRangeEnum::WEEK => $this->getRevenue($factory->getStartOfWeek(), $factory->getEndOfWeek()), DateRangeEnum::YEAR => $this->getRevenue($factory->createStartOfYear(), $factory->createEndOfYear()), DateRangeEnum::TOTAL => $this->getRevenue(null, null), diff --git a/src/Widget/Type/RevenueUser.php b/src/Widget/Type/RevenueUser.php index 66f5e5374..0314b7fbf 100644 --- a/src/Widget/Type/RevenueUser.php +++ b/src/Widget/Type/RevenueUser.php @@ -51,8 +51,12 @@ final class RevenueUser extends AbstractWidget } if ($data === null) { + $today = $factory->create(); + $beginOfDay = $today->modify('00:00:00'); + $endOfDay = $today->modify('23:59:59'); + $data = match ($type) { - DateRangeEnum::TODAY => $this->getRevenue($factory->createStartOfDay(), $factory->createEndOfDay()), + DateRangeEnum::TODAY => $this->getRevenue($beginOfDay, $endOfDay), DateRangeEnum::WEEK => $this->getRevenue($factory->getStartOfWeek(), $factory->getEndOfWeek()), DateRangeEnum::YEAR => $this->getRevenue($factory->createStartOfYear(), $factory->createEndOfYear()), DateRangeEnum::TOTAL => $this->getRevenue(null, null),