jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Release 2.22.0 (#5043)

Browse Source
This commit is contained in:
Kevin Papst
2024-09-20 14:30:11 +02:00
committed by GitHub
parent 3e0dadc0c8
commit 537c120ad9
57 changed files with 435 additions and 572 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Twig/LocaleFormatExtensions.php
View File

@@ -18,7 +18,6 @@ use App\Utils\JavascriptFormatConverter;
use App\Utils\LocaleFormatter;
use DateTime;
use DateTimeInterface;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Contracts\Translation\LocaleAwareInterface;
use Twig\Extension\AbstractExtension;
use Twig\TwigFilter;
@@ -30,7 +29,7 @@ final class LocaleFormatExtensions extends AbstractExtension implements LocaleAw
private ?LocaleFormatter $formatter = null;
private ?string $locale = null;
public function __construct(private LocaleService $localeService, private Security $security)
public function __construct(private readonly LocaleService $localeService)
{
}
@@ -111,7 +110,7 @@ final class LocaleFormatExtensions extends AbstractExtension implements LocaleAw
return $this->locale;
}
public function isWeekend(\DateTimeInterface|string|null $dateTime, ?User $user = null): bool
public function isWeekend(\DateTimeInterface|string|null $dateTime): bool
{
if (!$dateTime instanceof \DateTimeInterface) {
return false;
@@ -119,12 +118,6 @@ final class LocaleFormatExtensions extends AbstractExtension implements LocaleAw
$day = (int) $dateTime->format('N');
/** @var User|null $tmp */
$tmp = $user ?? $this->security->getUser();
if ($tmp !== null && $tmp->hasWorkHourConfiguration()) {
return !$tmp->isWorkDay($dateTime);
}
return ($day === 6 || $day === 7);
}