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

Release 2.55 (#5907)

Browse Source
This commit is contained in:
Kevin Papst
2026-04-16 22:06:53 +02:00
committed by GitHub
parent 148d3db6ca
commit 372c676afa
11 changed files with 148 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/API/BaseApiController.php
View File

@@ -36,7 +36,7 @@ abstract class BaseApiController extends AbstractController
}
/**
* @template TFormType of FormTypeInterface<TData>
* @template TFormType of FormTypeInterface<BaseQuery>
* @template TData of BaseQuery
* @param class-string<TFormType> $type
* @param TData $data

4
src/Constants.php
View File

@@ -17,11 +17,11 @@ final class Constants
/**
* The current release version
*/
public const VERSION = '2.54.0';
public const VERSION = '2.55.0';
/**
* The current release: major * 10000 + minor * 100 + patch
*/
public const VERSION_ID = 25400;
public const VERSION_ID = 25500;
/**
* The software name
*/

4
src/DataFixtures/UserFixtures.php
View File

@@ -263,7 +263,7 @@ final class UserFixtures extends Fixture implements FixtureGroupInterface
$user->setUserIdentifier(self::USERNAME_SUPER_ADMIN);
$user->setEmail('susan_super@example.com');
$user->setRoles([User::ROLE_SUPER_ADMIN]);
$user->setAvatar('/touch-icon-192x192.png');
$user->setAvatar('https://demo.kimai.org/touch-icon-192x192.png');
$user->setEnabled(true);
$prefs = $this->getUserPreferences($user, 'Europe/Berlin');
$user->setPreferences($prefs);
@@ -278,7 +278,7 @@ final class UserFixtures extends Fixture implements FixtureGroupInterface
$user->setUserIdentifier('super_admin');
$user->setEmail('super_admin@example.com');
$user->setRoles([User::ROLE_SUPER_ADMIN]);
$user->setAvatar('/touch-icon-192x192.png');
$user->setAvatar('https://demo.kimai.org/touch-icon-192x192.png');
$user->setEnabled(true);
$prefs = $this->getUserPreferences($user, 'Europe/Berlin');
$user->setPreferences($prefs);

2
src/Export/Package/SpoutSpreadsheet.php
View File

@@ -112,7 +112,7 @@ class SpoutSpreadsheet implements SpreadsheetPackage
$i = 0;
foreach ($columns as $column) {
if (!$isTotalsRow && \is_string($column)) {
$tmp[] = new StringCell($column, $style);
$tmp[] = new StringCell($column, $this->styles[$i++]);
} else {
$tmp[] = Cell::fromValue($column, $this->styles[$i++]); // @phpstan-ignore argument.type
}

10
src/Form/UserEditType.php
View File

@@ -95,13 +95,13 @@ class UserEditType extends AbstractType
'label' => 'active',
'help' => 'active.help'
]);
$builder->add('systemAccount', YesNoType::class, [
'label' => 'system_account',
'help' => 'system_account.help',
]);
}
$builder->add('systemAccount', YesNoType::class, [
'label' => 'system_account',
'help' => 'system_account.help',
]);
if ($options['include_supervisor']) {
$builder->add('supervisor', UserType::class, [
'required' => false,

2
src/Model/Statistic/Month.php
View File

@@ -28,7 +28,7 @@ final class Month extends Timesheet
\sprintf('Invalid month given. Expected 1-12, received "%s".', $monthNumber)
);
}
$this->month = str_pad($month, 2, '0', STR_PAD_LEFT);
$this->month = str_pad((string) $month, 2, '0', STR_PAD_LEFT);
}
public function getMonth(): string