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

26
tests/Twig/LocaleFormatExtensionsTest.php
View File

@@ -14,7 +14,6 @@ use App\Entity\Timesheet;
use App\Entity\User;
use App\Twig\LocaleFormatExtensions;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Intl\Util\IntlTestHelper;
use Twig\TwigFilter;
use Twig\TwigFunction;
@@ -55,10 +54,7 @@ class LocaleFormatExtensionsTest extends TestCase
$user = new User();
$user->setTimezone('Europe/Vienna');
$security = $this->createMock(Security::class);
$security->expects($this->any())->method('getUser')->willReturn($user);
$sut = new LocaleFormatExtensions(new LocaleService($languageSettings), $security);
$sut = new LocaleFormatExtensions(new LocaleService($languageSettings));
$sut->setLocale($locale);
return $sut;
@@ -502,9 +498,7 @@ class LocaleFormatExtensionsTest extends TestCase
],
];
$security = $this->createMock(Security::class);
$sut = new LocaleFormatExtensions(new LocaleService($this->localeEn), $security);
$sut = new LocaleFormatExtensions(new LocaleService($this->localeEn));
$sut->setLocale('en');
self::assertEquals($expected, $sut->getJavascriptConfiguration());
@@ -586,22 +580,6 @@ class LocaleFormatExtensionsTest extends TestCase
self::assertFalse($sut->isWeekend(new \DateTime('first friday this month')));
self::assertTrue($sut->isWeekend(new \DateTime('first saturday this month')));
self::assertTrue($sut->isWeekend(new \DateTime('first sunday this month')));
// seconds case: a user with work-hour configuration
$user = new User();
$user->setWorkHoursTuesday(1);
$user->setWorkHoursThursday(1);
$user->setWorkHoursSaturday(1);
$user->setWorkHoursSunday(1);
$sut = $this->getSut('en', $this->localeEn);
self::assertTrue($sut->isWeekend(new \DateTime('first monday this month'), $user));
self::assertFalse($sut->isWeekend(new \DateTime('first tuesday this month'), $user));
self::assertTrue($sut->isWeekend(new \DateTime('first wednesday this month'), $user));
self::assertFalse($sut->isWeekend(new \DateTime('first thursday this month'), $user));
self::assertTrue($sut->isWeekend(new \DateTime('first friday this month'), $user));
self::assertFalse($sut->isWeekend(new \DateTime('first saturday this month'), $user));
self::assertFalse($sut->isWeekend(new \DateTime('first sunday this month'), $user));
}
protected function getTimesheet($seconds): Timesheet