Release 1.15.3 (#2813)

2021-10-05 15:30:29 +02:00
parent 162ff07bd5
commit ccb184b17f
11 changed files with 859 additions and 1037 deletions
--- a/.github/lock.yml
+++ b/.github/lock.yml
@@ -1,24 +0,0 @@
-# Configuration for lock-threads - https://github.com/dessant/lock-threads
-
-# Number of days of inactivity before a closed issue or pull request is locked
-daysUntilLock: 60
-
-# Issues and pull requests with these labels will not be locked. Set to `[]` to disable
-exemptLabels: []
-
-# Label to add before locking, such as `outdated`. Set to `false` to disable
-lockLabel: false
-
-# Comment to post before locking. Set to `false` to disable
-lockComment: >
-  This thread has been automatically locked since there has not been
-  any recent activity after it was closed. Please open a new issue for
-  related bugs.
-  If you use Kimai on a daily basis, please [consider donating](https://www.kimai.org/donate/) to
-  support further development of Kimai.
-
-# Assign `resolved` as the reason for locking. Set to `false` to disable
-setLockReason: false
-
-# Limit to only `issues` or `pulls`
-# only: pulls
--- a/.github_changelog_generator
+++ b/.github_changelog_generator
@@ -1,5 +1,5 @@
 unreleased=true
-future-release=1.15
+future-release=1.15.3
 exclude-labels=duplicate,support,question,invalid,wontfix,release,waiting for feedback,documentation
 enhancement_labels=>enhancement,Enhancement,feature request,translation i18n,technical debt,documentation
 issues-wo-labels=false
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,166 +1,3 @@
 # Changelog

-## [1.14](https://github.com/kevinpapst/kimai2/tree/1.14)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.13...1.14)
-
-## [1.13](https://github.com/kevinpapst/kimai2/tree/1.13)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.12...1.13)
-
-## [1.12](https://github.com/kevinpapst/kimai2/tree/1.12)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.11.1...1.12)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.12)
-
-## [1.11.1](https://github.com/kevinpapst/kimai2/tree/1.11.1)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.11...1.11.1)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.11.1)
-
-## [1.11](https://github.com/kevinpapst/kimai2/tree/1.11)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.10.2...1.11)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.11)
-
-## [1.10.2](https://github.com/kevinpapst/kimai2/tree/1.10.2)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.9...1.10.2)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.10.2)
-
-## [1.10.1](https://github.com/kevinpapst/kimai2/tree/1.10.1)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.9...1.10.1)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.10.1)
-
-## [1.10](https://github.com/kevinpapst/kimai2/tree/1.10)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.9...1.10)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.10)
-
-## [1.9](https://github.com/kevinpapst/kimai2/tree/1.9)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.8...1.9)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.9)
-
-## [1.8](https://github.com/kevinpapst/kimai2/tree/1.8)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.7...1.8)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.8)
-
-## [1.7](https://github.com/kevinpapst/kimai2/tree/1.7)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.6.2...1.7)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.7)
-
-## [1.6.2](https://github.com/kevinpapst/kimai2/tree/1.6.2)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.6.1...1.6.2)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.6.2)
-
-## [1.6.1](https://github.com/kevinpapst/kimai2/tree/1.6.1)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.6...1.6.1)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.6.1)
-
-## [1.6](https://github.com/kevinpapst/kimai2/tree/1.6)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.5...1.6)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.6)
-
-## [1.5](https://github.com/kevinpapst/kimai2/tree/1.5)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.4.2...1.5)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.5)
-
-## [1.4.2](https://github.com/kevinpapst/kimai2/tree/1.4)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.4.1...1.4.2)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.4.2)
-
-## [1.4.1](https://github.com/kevinpapst/kimai2/tree/1.4)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.4...1.4.1)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.4.1)
-
-## [1.4](https://github.com/kevinpapst/kimai2/tree/1.4)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.3...1.4)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.4)
-
-## [1.3](https://github.com/kevinpapst/kimai2/tree/1.3)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.2...1.3)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.3)
-
-## [1.2](https://github.com/kevinpapst/kimai2/tree/1.2)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.1...1.2)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.2)
-
-## [1.1](https://github.com/kevinpapst/kimai2/tree/1.1)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.0.1...1.1)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.1)
-
-## [1.0.1](https://github.com/kevinpapst/kimai2/tree/1.0.1)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/1.0...1.0.1)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.0.1)
-
-## [1.0](https://github.com/kevinpapst/kimai2/tree/1.0)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.9...1.0)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/1.0)
-
-## [0.9](https://github.com/kevinpapst/kimai2/tree/0.9)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.8.1...0.9)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.9)
-
-## [0.8.1](https://github.com/kevinpapst/kimai2/tree/0.8.1)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.8...0.8.1)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.8.1)
-
-## [0.8](https://github.com/kevinpapst/kimai2/tree/0.8)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.7...0.8)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.8)
-
-## [0.7](https://github.com/kevinpapst/kimai2/tree/0.7)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.6.1...0.7)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.7)
-
-## [0.6.1](https://github.com/kevinpapst/kimai2/tree/0.6.1)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.6...0.6.1)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.6.1)
-
-## [0.6](https://github.com/kevinpapst/kimai2/tree/0.6)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.5...0.6)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.6)
-
-## [0.5](https://github.com/kevinpapst/kimai2/tree/0.5)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.4...0.5)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.5)
-
-## [0.4](https://github.com/kevinpapst/kimai2/tree/0.4)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.3...0.4)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.4)
-
-## [0.3](https://github.com/kevinpapst/kimai2/tree/0.3)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.2...0.3)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.3)
-
-## [0.2](https://github.com/kevinpapst/kimai2/tree/0.2)
-[Full Changelog](https://github.com/kevinpapst/kimai2/compare/0.1...0.2)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.2)
-
-## [0.1](https://github.com/kevinpapst/kimai2/tree/0.1)
-
-Release notes including the changelog can be found [here](https://github.com/kevinpapst/kimai2/releases/tag/0.1)
+See [GitHub release page](https://github.com/kevinpapst/kimai2/releases). 
--- a/composer.json
+++ b/composer.json
@@ -89,8 +89,9 @@
        "symfony/dom-crawler": "4.4.4",
        "symfony/maker-bundle": "^1.12",
        "symfony/phpunit-bridge": "^4.4",
-        "symfony/profiler-pack": "^1.0",
-        "symfony/var-dumper": "^4.4"
+        "symfony/stopwatch": "^4.4",
+        "symfony/var-dumper": "^4.4",
+        "symfony/web-profiler-bundle": "^4.4"
    },
    "repositories": [
        {
--- a/composer.lock
+++ b/composer.lock
--- a/src/Constants.php
+++ b/src/Constants.php
@@ -17,11 +17,11 @@ class Constants
    /**
     * The current release version
     */
-    public const VERSION = '1.15.2';
+    public const VERSION = '1.15.3';
    /**
     * The current release: major * 10000 + minor * 100 + patch
     */
-    public const VERSION_ID = 11502;
+    public const VERSION_ID = 11503;
    /**
     * The current release status, either "stable" or "dev"
     */
@@ -43,7 +43,7 @@ class Constants
     */
    public const HOMEPAGE = 'https://www.kimai.org';
    /**
-     * Application wide default locale.
+     * Application wide default locale
     */
    public const DEFAULT_LOCALE = 'en';
    /**
--- a/symfony.lock
+++ b/symfony.lock
@@ -618,9 +618,6 @@
    "symfony/process": {
        "version": "v4.0.3"
    },
-    "symfony/profiler-pack": {
-        "version": "v1.0.3"
-    },
    "symfony/property-access": {
        "version": "v4.0.3"
    },
--- a/tests/API/CustomerControllerTest.php
+++ b/tests/API/CustomerControllerTest.php
@@ -165,6 +165,7 @@ class CustomerControllerTest extends APIControllerBaseTest
        $team->addProject($project);
        $team->addUser($this->getUserByRole(User::ROLE_TEAMLEAD));
        $em->persist($team);
+        $em->flush();

        $this->assertAccessIsGranted($client, '/api/customers/1');
        $result = json_decode($client->getResponse()->getContent(), true);
--- a/tests/Controller/HomepageControllerTest.php
+++ b/tests/Controller/HomepageControllerTest.php
@@ -12,7 +12,6 @@ namespace App\Tests\Controller;
 use App\Entity\User;
 use App\Entity\UserPreference;
 use App\Form\Type\InitialViewType;
-use App\Form\Type\LanguageType;

 /**
 * @group integration
@@ -43,16 +42,12 @@ class HomepageControllerTest extends ControllerBaseTest
            ->setValue('my_profile')
            ->setType(InitialViewType::class);

-        $user->addPreference($pref);
-
-        $pref = (new UserPreference())
-            ->setName('language')
-            ->setValue('ar')
-            ->setType(LanguageType::class);
-
-        $user->addPreference($pref);
-
        $em->persist($pref);
+        $user->addPreference($pref);
+
+        $user->setLanguage('ar');
+
+        $em->flush();

        $this->request($client, '/homepage');
        $this->assertIsRedirect($client, '/ar/profile/');
--- a/tests/Controller/ProjectControllerTest.php
+++ b/tests/Controller/ProjectControllerTest.php
@@ -214,6 +214,7 @@ class ProjectControllerTest extends ControllerBaseTest
        $rate->setActivity($activity);
        $rate->setRate(123.45);
        $em->persist($rate);
+        $em->flush();

        $this->request($client, '/admin/project/1/duplicate');
        $this->assertIsRedirect($client, '/details');
--- a/tests/DataFixtures/TimesheetFixtures.php
+++ b/tests/DataFixtures/TimesheetFixtures.php
@@ -427,7 +427,7 @@ final class TimesheetFixtures implements TestFixture
        }

        if ($this->fixedRate) {
-            $entry->setFixedRate(rand(10, 100));
+            $entry->setFixedRate((float) rand(10, 100));
        }

        if ($this->hourlyRate) {