From 6d7054c18c2f2deccccd7890730c8f3f0619768e Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Wed, 19 Oct 2022 08:55:42 +0200 Subject: [PATCH] Release 1.27.0 (#3571) * bump version * ignore .disabled for plugins * simplify gitignore * prevent duration field from showing up in the API * change release template wording * prepare method for later usage * add 8.2 to issue template --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + .github/release-drafter.yml | 8 +++----- .gitignore | 29 +++++++++------------------ SECURITY.md | 2 +- src/Constants.php | 4 ++-- src/Entity/User.php | 5 +++++ src/Form/API/TimesheetApiEditForm.php | 4 ++++ tests/Entity/UserTest.php | 1 + 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 4d4f55c9..010f2d9c 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -43,6 +43,7 @@ body: - "7.4" - "8.0" - "8.1" + - "8.2" - Other (please mention below) validations: required: true diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 44b80674..e1c64e77 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -36,11 +36,9 @@ template: | [Upgrade Kimai](https://www.kimai.org/documentation/updates.html) - [Install Kimai](https://www.kimai.org/documentation/installation.html) - [Docker](https://tobybatch.github.io/kimai2/) **PHP Version compatibility:** - - PHP 7.3 is [end-of-life](https://www.php.net/supported-versions.php): you need to update now - - PHP 7.4, PHP 8 and PHP 8.1 are supported + - PHP 7.3 is [end-of-life](https://www.php.net/supported-versions.php): please update now + - PHP 7.4 is almost EOL, PHP 8 and PHP 8.1 are supported $CHANGES - Thanks to all contributors ❤️ - - Involved in this release: $CONTRIBUTORS \ No newline at end of file + Involved in this release: $CONTRIBUTORS - thank you! \ No newline at end of file diff --git a/.gitignore b/.gitignore index cc7ace6d..71830447 100644 --- a/.gitignore +++ b/.gitignore @@ -7,39 +7,31 @@ # for symfony local webserver php.ini +!.gitkeep /bin/* -!bin/console -/config/packages/local.yaml -/config/packages/*-local.yaml -/config/packages/*/local.yaml -/config/packages/*/*-local.yaml +!/bin/console +*local.yaml /config/bundles-local.php -public/avatars/*.png +/public/avatars/*.png -templates/invoice/renderer/.~lock* -translations/branding.*.xlf +/templates/invoice/renderer/.~lock* +/translations/branding.*.xlf /var/data/* !/var/data/.gitkeep /var/coverage/ /var/cache/* -!var/cache/.gitkeep /var/invoices/* /var/export/* - -/var/packages/* -!var/packages/.gitkeep -/var/plugins/* -!var/plugins/.gitkeep - /var/log/* -!var/log/.gitkeep - /var/sessions/* -!var/sessions/.gitkeep +/var/packages/* +/var/plugins/* +*.disabled + # ========== KIMAI ========== ###> symfony/framework-bundle ### @@ -61,7 +53,6 @@ translations/branding.*.xlf ###> symfony/phpunit-bridge ### .phpunit -/phpunit.xml ###< symfony/phpunit-bridge ### ###> symfony/webpack-encore-bundle ### diff --git a/SECURITY.md b/SECURITY.md index f5cdc211..168cf4de 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,7 +6,7 @@ As announced in the [README](README.md) I only support the latest available rele | Version | Supported | |----------------------|--------------------| -| master | :white_check_mark: | +| main/master branch | :white_check_mark: | | latest minor release | :white_check_mark: | | older releases | :x: | diff --git a/src/Constants.php b/src/Constants.php index 9ebfd7bd..d6fa7f4c 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -17,11 +17,11 @@ class Constants /** * The current release version */ - public const VERSION = '1.26.0'; + public const VERSION = '1.27.0'; /** * The current release: major * 10000 + minor * 100 + patch */ - public const VERSION_ID = 12600; + public const VERSION_ID = 12700; /** * The current release status, either "stable" or "dev" */ diff --git a/src/Entity/User.php b/src/Entity/User.php index 67b91c0c..a33d6337 100644 --- a/src/Entity/User.php +++ b/src/Entity/User.php @@ -1167,4 +1167,9 @@ class User implements UserInterface, EquatableInterface, \Serializable { $this->accountNumber = $accountNumber; } + + public function isSystemAccount(): bool + { + return false; + } } diff --git a/src/Form/API/TimesheetApiEditForm.php b/src/Form/API/TimesheetApiEditForm.php index 2573760d..deb9038e 100644 --- a/src/Form/API/TimesheetApiEditForm.php +++ b/src/Form/API/TimesheetApiEditForm.php @@ -55,6 +55,10 @@ class TimesheetApiEditForm extends TimesheetEditForm $builder->remove('metaFields'); + if ($builder->has('duration')) { + $builder->remove('duration'); + } + if ($builder->has('user')) { $builder->get('user')->setRequired(false); } diff --git a/tests/Entity/UserTest.php b/tests/Entity/UserTest.php index 3562f455..f16d50b8 100644 --- a/tests/Entity/UserTest.php +++ b/tests/Entity/UserTest.php @@ -49,6 +49,7 @@ class UserTest extends TestCase self::assertFalse($user->canSeeAllData()); self::assertFalse($user->isSmallLayout()); self::assertFalse($user->isExportDecimal()); + self::assertFalse($user->isSystemAccount()); self::assertTrue($user->is24Hour()); $user->setAvatar('https://www.gravatar.com/avatar/00000000000000000000000000000000?d=retro&f=y');