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

Release 2.10 (#4549)

Browse Source
This commit is contained in:
Kevin Papst
2024-01-19 12:05:07 +01:00
committed by GitHub
parent afd60a67f6
commit 46739795ff
52 changed files with 348 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/Controller/LayoutControllerTest.php
View File

@@ -17,7 +17,7 @@ use Symfony\Component\HttpKernel\HttpKernelBrowser;
*/
class LayoutControllerTest extends ControllerBaseTest
{
public function testNavigationMenus()
public function testNavigationMenus(): void
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
@@ -30,18 +30,18 @@ class LayoutControllerTest extends ControllerBaseTest
$this->assertHasNavigation($client);
}
protected function assertHasMainHeader(HttpKernelBrowser $client, User $user)
protected function assertHasMainHeader(HttpKernelBrowser $client, User $user): void
{
$content = $client->getResponse()->getContent();
$this->assertStringContainsString('data-bs-toggle="dropdown" aria-label="Open user menu"', $content);
$this->assertStringContainsString('data-bs-toggle="dropdown" aria-label="Open personal menu"', $content);
$this->assertStringContainsString('href="/en/profile/' . $user->getUserIdentifier() . '"', $content);
$this->assertStringContainsString('href="/en/profile/' . $user->getUserIdentifier() . '/edit"', $content);
$this->assertStringContainsString('href="/en/profile/' . $user->getUserIdentifier() . '/prefs"', $content);
$this->assertStringContainsString('href="/en/logout?_csrf_token=', $content);
}
protected function assertHasNavigation(HttpKernelBrowser $client)
protected function assertHasNavigation(HttpKernelBrowser $client): void
{
$content = $client->getResponse()->getContent();
@@ -52,7 +52,7 @@ class LayoutControllerTest extends ControllerBaseTest
$this->assertStringContainsString('Calendar', $content);
}
public function testActiveEntries()
public function testActiveEntries(): void
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
@@ -61,6 +61,6 @@ class LayoutControllerTest extends ControllerBaseTest
$content = $client->getResponse()->getContent();
$this->assertStringContainsString('<a href="/en/timesheet/create" class="modal-ajax-form ticktac-start btn', $content);
$this->assertStringContainsString('<a title="Start time-tracking" href="/en/timesheet/create" class="modal-ajax-form ticktac-start btn', $content);
}
}

2
tests/Repository/Query/ProjectQueryTest.php
View File

@@ -34,7 +34,7 @@ class ProjectQueryTest extends BaseQueryTest
self::assertNull($sut->getGlobalActivities());
}
public function testSetter()
public function testSetter(): void
{
$sut = new ProjectQuery();

19
tests/Repository/Query/UserFormTypeQueryTest.php
View File

@@ -9,7 +9,6 @@
namespace App\Tests\Repository\Query;
use App\Entity\User;
use App\Repository\Query\UserFormTypeQuery;
/**
@@ -24,22 +23,4 @@ class UserFormTypeQueryTest extends BaseFormTypeQueryTest
$this->assertBaseQuery($sut);
}
public function testUsersAreAlwaysIncluded()
{
$sut = new UserFormTypeQuery();
$user = new User();
$user->setUserIdentifier('foo');
$users = [$user, new User(), new User()];
self::assertEquals([], $sut->getUsersAlwaysIncluded());
$sut->setUsersAlwaysIncluded($users);
self::assertSame($users, $sut->getUsersAlwaysIncluded());
self::assertEquals([], $sut->getUsersToIgnore());
self::assertInstanceOf(UserFormTypeQuery::class, $sut->addUserToIgnore($users[0]));
self::assertSame([$users[0]], $sut->getUsersToIgnore());
}
}

10
tests/Repository/Query/UserQueryTest.php
View File

@@ -21,22 +21,22 @@ class UserQueryTest extends BaseQueryTest
public function testQuery(): void
{
$sut = new UserQuery();
$this->assertBaseQuery($sut, 'user');
$this->assertBaseQuery($sut, 'username');
$this->assertInstanceOf(VisibilityInterface::class, $sut);
$this->assertRole($sut);
$this->assertSearchTeam($sut);
$this->assertResetByFormError(new UserQuery(), 'user');
$this->assertResetByFormError(new UserQuery(), 'username');
}
protected function assertRole(UserQuery $sut)
protected function assertRole(UserQuery $sut): void
{
$this->assertNull($sut->getRole());
$sut->setRole('ROLE_USER');
$this->assertEquals('ROLE_USER', $sut->getRole());
}
protected function assertSearchTeam(UserQuery $sut)
protected function assertSearchTeam(UserQuery $sut): void
{
$team = new Team('foo');
$this->assertIsArray($sut->getSearchTeams());
@@ -46,7 +46,7 @@ class UserQueryTest extends BaseQueryTest
$this->assertSame($team, $sut->getSearchTeams()[0]);
}
public function testSystemAccount()
public function testSystemAccount(): void
{
$sut = new UserQuery();
self::assertNull($sut->getSystemAccount());

45
tests/phpstan.neon
View File

@@ -2262,26 +2262,6 @@ parameters:
count: 1
path: Controller/InvoiceControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\LayoutControllerTest\\:\\:assertHasMainHeader\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/LayoutControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\LayoutControllerTest\\:\\:assertHasNavigation\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/LayoutControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\LayoutControllerTest\\:\\:testActiveEntries\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/LayoutControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\LayoutControllerTest\\:\\:testNavigationMenus\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/LayoutControllerTest.php
-
message: "#^Parameter \\#2 \\$haystack of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, string\\|false given\\.$#"
count: 11
@@ -6912,36 +6892,11 @@ parameters:
count: 1
path: Repository/Query/ExportQueryTest.php
-
message: "#^Method App\\\\Tests\\\\Repository\\\\Query\\\\ProjectQueryTest\\:\\:testSetter\\(\\) has no return type specified\\.$#"
count: 1
path: Repository/Query/ProjectQueryTest.php
-
message: "#^Method App\\\\Tests\\\\Repository\\\\Query\\\\TeamQueryTest\\:\\:assertUsers\\(\\) has no return type specified\\.$#"
count: 1
path: Repository/Query/TeamQueryTest.php
-
message: "#^Method App\\\\Tests\\\\Repository\\\\Query\\\\UserFormTypeQueryTest\\:\\:testUsersAreAlwaysIncluded\\(\\) has no return type specified\\.$#"
count: 1
path: Repository/Query/UserFormTypeQueryTest.php
-
message: "#^Method App\\\\Tests\\\\Repository\\\\Query\\\\UserQueryTest\\:\\:assertRole\\(\\) has no return type specified\\.$#"
count: 1
path: Repository/Query/UserQueryTest.php
-
message: "#^Method App\\\\Tests\\\\Repository\\\\Query\\\\UserQueryTest\\:\\:assertSearchTeam\\(\\) has no return type specified\\.$#"
count: 1
path: Repository/Query/UserQueryTest.php
-
message: "#^Method App\\\\Tests\\\\Repository\\\\Query\\\\UserQueryTest\\:\\:testSystemAccount\\(\\) has no return type specified\\.$#"
count: 1
path: Repository/Query/UserQueryTest.php
-
message: "#^Method App\\\\Tests\\\\Repository\\\\Result\\\\TimesheetResultStatisticTest\\:\\:testConstruct\\(\\) has no return type specified\\.$#"
count: 1