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

Release 2.25 (#5109)

Browse Source
This commit is contained in:
Kevin Papst
2024-11-21 22:44:49 +01:00
committed by GitHub
parent 49eb7068c9
commit 0c26a2678e
261 changed files with 6431 additions and 7426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/Voter/AbstractVoterTest.php
View File

@@ -19,22 +19,17 @@ use Symfony\Component\Security\Core\Authorization\Voter\Voter;
abstract class AbstractVoterTest extends TestCase
{
protected function getVoter(string $voterClass): Voter
protected function getVoter(string $voterClass): Voter // @phpstan-ignore missingType.generics
{
$class = new \ReflectionClass($voterClass);
/** @var Voter $voter */
$voter = $class->newInstance($this->getRolePermissionManager());
$voter = $class->newInstance($this->getRolePermissionManager()); // @phpstan-ignore missingType.generics
self::assertInstanceOf(Voter::class, $voter);
return $voter;
}
/**
* @param int $id
* @param string|null $role
* @return User
*/
protected function getUser(int $id, ?string $role)
protected function getUser(int $id, ?string $role): User
{
$roles = [];
if (!empty($role)) {
@@ -55,8 +50,6 @@ abstract class AbstractVoterTest extends TestCase
/**
* @param array<string, array<string>> $permissions
* @param bool $overwrite
* @return RolePermissionManager
*/
protected function getRolePermissionManager(array $permissions = [], bool $overwrite = false): RolePermissionManager
{

10
tests/Voter/TimesheetVoterTest.php
View File

@@ -19,7 +19,6 @@ use App\Tests\Mocks\SystemConfigurationFactory;
use App\Timesheet\LockdownService;
use App\Voter\TimesheetVoter;
use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
/**
@@ -27,7 +26,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
*/
class TimesheetVoterTest extends AbstractVoterTest
{
protected function getVoter(string $voterClass): Voter
protected function getVoter(string $voterClass): TimesheetVoter
{
return $this->getLockdownVoter();
}
@@ -204,7 +203,7 @@ class TimesheetVoterTest extends AbstractVoterTest
return $user;
}
protected function getLockdownVoter(?string $lockdownBegin = null, ?string $lockdownEnd = null, ?string $lockdownGrace = null): Voter
protected function getLockdownVoter(?string $lockdownBegin = null, ?string $lockdownEnd = null, ?string $lockdownGrace = null): TimesheetVoter
{
$loader = $this->createMock(ConfigLoaderInterface::class);
$config = SystemConfigurationFactory::create($loader, [
@@ -217,9 +216,6 @@ class TimesheetVoterTest extends AbstractVoterTest
]
]);
$voter = new TimesheetVoter($this->getRolePermissionManager(), new LockdownService($config));
self::assertInstanceOf(Voter::class, $voter);
return $voter;
return new TimesheetVoter($this->getRolePermissionManager(), new LockdownService($config));
}
}