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

release 1.19 (#3215)

Browse Source
This commit is contained in:
Kevin Papst
2022-03-21 23:42:56 +01:00
committed by GitHub
parent e5f1df8c70
commit 6c1d79fe5b
8 changed files with 406 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github_changelog_generator
View File

@@ -1,5 +1,5 @@
unreleased=true unreleased=true
future-release=1.18 future-release=1.19
exclude-labels=duplicate,support,question,invalid,wontfix,release,waiting for feedback,documentation exclude-labels=duplicate,support,question,invalid,wontfix,release,waiting for feedback,documentation
enhancement_labels=>enhancement,Enhancement,feature request,translation i18n,technical debt,documentation enhancement_labels=>enhancement,Enhancement,feature request,translation i18n,technical debt,documentation
issues-wo-labels=false issues-wo-labels=false

4
SECURITY.md
View File

@@ -7,8 +7,8 @@ As announced in the [README](README.md) I only support the latest available rele
| Version | Supported | | Version | Supported |
|---------|--------------------| |---------|--------------------|
| master | :white_check_mark: | | master | :white_check_mark: |
| 1.18 | :white_check_mark: | | 1.19 | :white_check_mark: |
| < 1.18 | :x: | | < 1.19 | :x: |
## Reporting a Vulnerability ## Reporting a Vulnerability

789
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

4
src/Constants.php
View File

@@ -17,11 +17,11 @@ class Constants
/** /**
* The current release version * The current release version
*/ */
public const VERSION = '1.18.3'; public const VERSION = '1.19';
/** /**
* The current release: major * 10000 + minor * 100 + patch * The current release: major * 10000 + minor * 100 + patch
*/ */
public const VERSION_ID = 11803; public const VERSION_ID = 11900;
/** /**
* The current release status, either "stable" or "dev" * The current release status, either "stable" or "dev"
*/ */

6
src/DataFixtures/TagFixtures.php
View File

@@ -43,11 +43,9 @@ class TagFixtures extends Fixture
$tag = new Tag(); $tag = new Tag();
$tagName = null; $tagName = null;
if ($i % 2 == 9) { if ($i % 18 == 0) {
$tagName = $faker->companyEmail;
} elseif ($i % 2 == 8) {
$tagName = $faker->firstName; $tagName = $faker->firstName;
} elseif ($i % 2 == 7) { } elseif ($i % 7 == 0) {
$tagName = $faker->lastName; $tagName = $faker->lastName;
} elseif ($i % 5 == 0) { } elseif ($i % 5 == 0) {
$tagName = $faker->city; $tagName = $faker->city;

2
src/Model/MonthlyStatistic.php
View File

@@ -17,7 +17,7 @@ use DateTimeInterface;
final class MonthlyStatistic implements DateStatisticInterface final class MonthlyStatistic implements DateStatisticInterface
{ {
/** /**
* @var array<string, array<int, StatisticDate>> * @var array<string|int, array<int<1, 12>, StatisticDate>>
*/ */
private $years = []; private $years = [];
private $begin; private $begin;

2
src/Validator/Constraints/HexColorValidator.php
View File

@@ -26,7 +26,7 @@ class HexColorValidator extends ConstraintValidator
$color = $value; $color = $value;
if ($color === null || (\is_string($color) && empty($color))) { if ($color === null || $color === '') {
return; return;
} }

2
tests/Model/UserStatisticTest.php
View File

@@ -74,7 +74,7 @@ class UserStatisticTest extends AbstractTimesheetCountedStatisticTest
self::assertSame(145, $sut->getDuration()); self::assertSame(145, $sut->getDuration());
self::assertSame(1468, $sut->getDurationBillable()); self::assertSame(1468, $sut->getDurationBillable());
self::assertSame(669.64, $sut->getRate()); self::assertSame(669.64, round($sut->getRate(), 2));
self::assertSame(580.236, $sut->getRateBillable()); self::assertSame(580.236, $sut->getRateBillable());
self::assertSame(1134.98, $sut->getInternalRate()); self::assertSame(1134.98, $sut->getInternalRate());
} }