From 49e69d1ae3b5c2a232bd2ac98187c8e14e3ed5c4 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Fri, 2 Feb 2024 13:52:24 +0100 Subject: [PATCH] Release 2.11 (#4580) --- .github/workflows/testing.yaml | 21 +++- assets/app-rtl.js | 1 + assets/js/forms/KimaiFormSelect.js | 1 + assets/js/plugins/KimaiAlert.js | 6 +- assets/sass/_app-rtl.scss | 45 ++++++++ assets/sass/_app.scss | 46 ++++---- assets/sass/_kimai.scss | 18 +++ composer.json | 2 +- composer.lock | 43 +++---- config/packages/doctrine.yaml | 5 +- package.json | 2 +- phpunit.xml.dist | 2 +- public/build/app-rtl.2e426047.css | 5 + public/build/app-rtl.3d445498.js | 1 + public/build/app.0ecb28c1.css | 1 - public/build/app.4ccab775.css | 5 + public/build/app.8d1b738d.js | 2 + ...ICENSE.txt => app.8d1b738d.js.LICENSE.txt} | 0 public/build/app.adf0b03a.js | 2 - public/build/entrypoints.json | 19 +++- .../build/fonts/fa-brands-400.498f4d22.woff2 | Bin 0 -> 116672 bytes public/build/fonts/fa-brands-400.4c05cd9b.ttf | Bin 0 -> 206480 bytes .../build/fonts/fa-regular-400.83824cd5.woff2 | Bin 0 -> 25480 bytes .../build/fonts/fa-regular-400.96e19e1a.ttf | Bin 0 -> 68060 bytes .../build/fonts/fa-solid-900.4cbe3db2.woff2 | Bin 0 -> 156532 bytes public/build/fonts/fa-solid-900.bb5be820.ttf | Bin 0 -> 419780 bytes public/build/manifest.json | 14 ++- src/Command/TranslationCommand.php | 2 +- src/Constants.php | 4 +- src/Controller/ProfileController.php | 21 ++++ src/Entity/Activity.php | 2 +- src/Entity/Customer.php | 2 +- src/Entity/Project.php | 2 +- .../RedirectToLocaleSubscriber.php | 8 +- .../TagArrayToStringTransformer.php | 23 ++-- src/Form/Type/SearchTermType.php | 2 +- src/Form/Type/TagsInputType.php | 9 +- src/Twig/Runtime/EncoreExtension.php | 10 +- templates/base.html.twig | 12 +- .../TablerBundle/includes/logo.html.twig | 6 +- .../default/_form_delete_modal.html.twig | 1 + templates/default/_form_modal.html.twig | 2 +- templates/export/layout.html.twig | 1 - .../invoice/renderer/timesheet.html.twig | 1 - templates/macros/datatables.html.twig | 2 +- templates/partials/head.html.twig | 3 + templates/security/login.html.twig | 8 +- templates/timesheet/export.html.twig | 1 - tests/API/TimesheetControllerTest.php | 65 ++++------- tests/Controller/TimesheetControllerTest.php | 27 ++++- tests/DataFixtures/TagFixtures.php | 25 ++-- tests/DataFixtures/TimesheetFixtures.php | 107 ++++++------------ tests/phpstan.neon | 10 -- webpack.config.js | 1 + yarn.lock | 13 ++- 55 files changed, 347 insertions(+), 264 deletions(-) create mode 100644 assets/app-rtl.js create mode 100644 assets/sass/_app-rtl.scss create mode 100644 assets/sass/_kimai.scss create mode 100644 public/build/app-rtl.2e426047.css create mode 100644 public/build/app-rtl.3d445498.js delete mode 100644 public/build/app.0ecb28c1.css create mode 100644 public/build/app.4ccab775.css create mode 100644 public/build/app.8d1b738d.js rename public/build/{app.adf0b03a.js.LICENSE.txt => app.8d1b738d.js.LICENSE.txt} (100%) delete mode 100644 public/build/app.adf0b03a.js create mode 100644 public/build/fonts/fa-brands-400.498f4d22.woff2 create mode 100644 public/build/fonts/fa-brands-400.4c05cd9b.ttf create mode 100644 public/build/fonts/fa-regular-400.83824cd5.woff2 create mode 100644 public/build/fonts/fa-regular-400.96e19e1a.ttf create mode 100644 public/build/fonts/fa-solid-900.4cbe3db2.woff2 create mode 100644 public/build/fonts/fa-solid-900.bb5be820.ttf diff --git a/.github/workflows/testing.yaml b/.github/workflows/testing.yaml index de25124d..f2115214 100644 --- a/.github/workflows/testing.yaml +++ b/.github/workflows/testing.yaml @@ -39,6 +39,9 @@ jobs: env: fail-fast: true + - name: Determine software versions + run: mysql --version && php --version + - name: Determine composer cache directory id: composer-cache run: echo "composer_cache_directory=$(composer config cache-dir)" >> $GITHUB_ENV @@ -79,14 +82,24 @@ jobs: - name: Run quick unit-tests run: composer tests-unit env: - DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?serverVersion=5.7 - APP_ENV: dev + DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?charset=utf8mb4&serverVersion=8.0.35 + APP_ENV: test MAILER_URL: null://localhost + - name: Full test-suite + if: matrix.php != '8.2' + run: vendor/bin/phpunit tests/ + env: + DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?charset=utf8mb4&serverVersion=8.0.35 + APP_ENV: test + MAILER_URL: null://localhost + TEST_WITH_BUNDLES: 1 + - name: Full test-suite with coverage + if: matrix.php == '8.2' run: vendor/bin/phpunit tests/ --coverage-clover=coverage.xml env: - DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?serverVersion=5.7 + DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?charset=utf8mb4&serverVersion=8.0.35 APP_ENV: dev MAILER_URL: null://localhost TEST_WITH_BUNDLES: 1 @@ -106,7 +119,7 @@ jobs: bin/console doctrine:migrations:migrate -n bin/console doctrine:migrations:migrate first -n env: - DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?serverVersion=5.7 + DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?charset=utf8mb4&serverVersion=8.0.35 APP_ENV: dev MAILER_URL: null://localhost diff --git a/assets/app-rtl.js b/assets/app-rtl.js new file mode 100644 index 00000000..79c0ca2a --- /dev/null +++ b/assets/app-rtl.js @@ -0,0 +1 @@ +require('./sass/_app-rtl.scss'); diff --git a/assets/js/forms/KimaiFormSelect.js b/assets/js/forms/KimaiFormSelect.js index 3eea37b2..52a5304b 100644 --- a/assets/js/forms/KimaiFormSelect.js +++ b/assets/js/forms/KimaiFormSelect.js @@ -83,6 +83,7 @@ export default class KimaiFormSelect extends KimaiFormPlugin { // if there are more than X entries, the other ones are hidden and can only be found // by typing some characters to trigger the internal option search maxOptions: 500, + sortField:[{field: '$order'}, {field: '$score'}], }; let render = { diff --git a/assets/js/plugins/KimaiAlert.js b/assets/js/plugins/KimaiAlert.js index 0962a8c1..60ac342a 100644 --- a/assets/js/plugins/KimaiAlert.js +++ b/assets/js/plugins/KimaiAlert.js @@ -52,7 +52,7 @@ export default class KimaiAlert extends KimaiPlugin { } const html = ` -