code styles

* remove Entity directory from excludes, so autoregistration works
* do not register services for interfaces
* move tax class to invoice namespace
* exclude a few classes from service container
* flag SensitiveParameter to prevent logging
* flag SensitiveProperty to prevent logging
* flag Loggable entities for auditing

.docker/000-default.conf

@@ -8,7 +8,6 @@
     PassEnv DATABASE_URL
     PassEnv MAILER_URL
     PassEnv TRUSTED_PROXIES
-    PassEnv TRUSTED_HOSTS
 
     <Directory "/opt/kimai/public">
         Require all granted

.docker/Dockerfile.kimai-base

@@ -1,208 +0,0 @@
-# Source base [fpm/apache]
-ARG BASE="fpm"
-ARG PHP_VER="8.2"
-ARG COMPOSER_VER="latest"
-ARG TIMEZONE="Europe/London"
-
-###########################
-# Shared tools
-###########################
-
-# composer base image
-FROM composer:${COMPOSER_VER} AS composer
-
-###########################
-# PHP extensions
-###########################
-
-#fpm alpine php extension base
-FROM php:${PHP_VER}-fpm-alpine AS fpm-php-ext-base
-RUN apk add --no-cache \
-    # build-tools
-    autoconf \
-    dpkg \
-    dpkg-dev \
-    file \
-    g++ \
-    gcc \
-    icu-dev \
-    libatomic \
-    libc-dev \
-    libgomp \
-    libmagic \
-    m4 \
-    make \
-    mpc1 \
-    mpfr4 \
-    musl-dev \
-    perl \
-    re2c \
-    # gd
-    freetype-dev \
-    libpng-dev \
-    # icu
-    icu-dev \
-    icu-data-full \
-    # ldap
-    openldap-dev \
-    libldap \
-    # zip
-    libzip-dev \
-    # xsl
-    libxslt-dev
-
-
-# apache debian php extension base
-FROM php:${PHP_VER}-apache-bookworm AS apache-php-ext-base
-RUN apt-get update
-RUN apt-get install -y \
-        libldap2-dev \
-        libicu-dev \
-        libpng-dev \
-        libzip-dev \
-        libxslt1-dev \
-        libfreetype6-dev
-
-
-# php extension gd - 13.86s
-FROM ${BASE}-php-ext-base AS php-ext-gd
-RUN docker-php-ext-configure gd \
-        --with-freetype && \
-    docker-php-ext-install -j$(nproc) gd
-
-# php extension intl : 15.26s
-FROM ${BASE}-php-ext-base AS php-ext-intl
-RUN docker-php-ext-install -j$(nproc) intl
-
-# php extension ldap : 8.45s
-FROM ${BASE}-php-ext-base AS php-ext-ldap
-RUN docker-php-ext-configure ldap && \
-    docker-php-ext-install -j$(nproc) ldap
-
-# php extension pdo_mysql : 6.14s
-FROM ${BASE}-php-ext-base AS php-ext-pdo_mysql
-RUN docker-php-ext-install -j$(nproc) pdo_mysql
-
-# php extension zip : 8.18s
-FROM ${BASE}-php-ext-base AS php-ext-zip
-RUN docker-php-ext-install -j$(nproc) zip
-
-# php extension xsl : ?.?? s
-FROM ${BASE}-php-ext-base AS php-ext-xsl
-RUN docker-php-ext-install -j$(nproc) xsl
-
-# php extension redis
-FROM ${BASE}-php-ext-base AS php-ext-redis
-RUN yes no | pecl install redis && \
-    docker-php-ext-enable redis
-
-# php extension opcache
-FROM ${BASE}-php-ext-base AS php-ext-opcache
-RUN docker-php-ext-install -j$(nproc) opcache
-
-###########################
-# fpm base build
-###########################
-
-# fpm base build
-FROM php:${PHP_VER}-fpm-alpine AS fpm-base
-ARG TIMEZONE
-RUN apk add --no-cache \
-        bash \
-        coreutils \
-        freetype \
-        haveged \
-        icu \
-        icu-data-full \
-        libldap \
-        libpng \
-        libzip \
-        libxslt-dev \
-        fcgi \
-        tzdata && \
-    touch /use_fpm
-
-EXPOSE 9000
-
-HEALTHCHECK --interval=20s --timeout=10s --retries=3 \
-    CMD \
-    SCRIPT_NAME=/ping \
-    SCRIPT_FILENAME=/ping \
-    REQUEST_METHOD=GET \
-    cgi-fcgi -bind -connect 127.0.0.1:9000 || exit 1
-
-
-
-###########################
-# apache base build
-###########################
-
-FROM php:${PHP_VER}-apache-bookworm AS apache-base
-ARG TIMEZONE
-RUN apt-get update && \
-    apt-get install -y \
-        bash \
-        haveged \
-        libicu72 \
-        libldap-common \
-        libpng16-16 \
-        libzip4 \
-        libxslt1.1 \
-        libfreetype6 && \
-    echo "Listen 8001" > /etc/apache2/ports.conf && \
-    a2enmod rewrite && \
-    touch /use_apache
-
-EXPOSE 8001
-
-HEALTHCHECK --interval=20s --timeout=10s --retries=3 \
-    CMD curl -f http://127.0.0.1:8001 || exit 1
-
-
-
-###########################
-# global base build
-###########################
-
-FROM ${BASE}-base AS base
-ARG TIMEZONE
-
-ENV TIMEZONE=${TIMEZONE}
-RUN ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime && echo ${TIMEZONE} > /etc/timezone && \
-    # make composer home dir
-    mkdir /composer  && \
-    chown -R www-data:www-data /composer && \
-    echo "echo -e This imnage is not intended to be used stand alone. It's a base image\necho for the Kimai project. https://www.kimai.org\n" > /entrypoint.sh && \
-    chmod 777 /entrypoint.sh
-# copy composer
-COPY --from=composer /usr/bin/composer /usr/bin/composer
-
-# copy php extensions
-
-# PHP extension xsl
-COPY --from=php-ext-xsl /usr/local/etc/php/conf.d/docker-php-ext-xsl.ini /usr/local/etc/php/conf.d/docker-php-ext-xsl.ini
-COPY --from=php-ext-xsl /usr/local/lib/php/extensions/no-debug-non-zts-20220829/xsl.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/xsl.so
-# PHP extension pdo_mysql
-COPY --from=php-ext-pdo_mysql /usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini /usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini
-COPY --from=php-ext-pdo_mysql /usr/local/lib/php/extensions/no-debug-non-zts-20220829/pdo_mysql.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/pdo_mysql.so
-# PHP extension zip
-COPY --from=php-ext-zip /usr/local/etc/php/conf.d/docker-php-ext-zip.ini /usr/local/etc/php/conf.d/docker-php-ext-zip.ini
-COPY --from=php-ext-zip /usr/local/lib/php/extensions/no-debug-non-zts-20220829/zip.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/zip.so
-# PHP extension ldap
-COPY --from=php-ext-ldap /usr/local/etc/php/conf.d/docker-php-ext-ldap.ini /usr/local/etc/php/conf.d/docker-php-ext-ldap.ini
-COPY --from=php-ext-ldap /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ldap.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/ldap.so
-# PHP extension gd
-COPY --from=php-ext-gd /usr/local/etc/php/conf.d/docker-php-ext-gd.ini /usr/local/etc/php/conf.d/docker-php-ext-gd.ini
-COPY --from=php-ext-gd /usr/local/lib/php/extensions/no-debug-non-zts-20220829/gd.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/gd.so
-# PHP extension intl
-COPY --from=php-ext-intl /usr/local/etc/php/conf.d/docker-php-ext-intl.ini /usr/local/etc/php/conf.d/docker-php-ext-intl.ini
-COPY --from=php-ext-intl /usr/local/lib/php/extensions/no-debug-non-zts-20220829/intl.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/intl.so
-# PHP extension redis
-COPY --from=php-ext-redis /usr/local/etc/php/conf.d/docker-php-ext-redis.ini /usr/local/etc/php/conf.d/docker-php-ext-redis.ini
-COPY --from=php-ext-redis /usr/local/lib/php/extensions/no-debug-non-zts-20220829/redis.so /usr/local/lib/php/extensions/no-debug-non-zts-20220829/redis.so
-COPY --from=php-ext-opcache /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini  /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
-
-CMD [ "/entrypoint.sh" ]
-
-# docker build -t kimai/kimai-base:fpm --build-arg BASE=fpm .
-# docker build -t kimai/kimai-base:apache --build-arg BASE=apache .

.docker/dbtest.php

@@ -1,35 +1,31 @@
 <?php
-$DB_HOST = urldecode($argv[1]);
+$DATABASE_HOST = urldecode($argv[1]);
-$DB_BASE = urldecode($argv[2]);
+$DATABASE_BASE = urldecode($argv[2]);
-$DB_PORT = $argv[3];
+$DATABASE_PORT = $argv[3];
-$DB_USER = urldecode($argv[4]);
+$DATABASE_USER = urldecode($argv[4]);
-$DB_PASS = urldecode($argv[5]);
+$DATABASE_PASS = urldecode($argv[5]);
 
 echo "Testing DB:";
-echo "*";
-echo "* new \PDO(mysql:host=$DB_HOST;dbname=$DB_BASE;port=$DB_PORT, $DB_USER, $DB_PASS, [ \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION ]);";
-echo "*";
 
 try {
-    $pdo = new \PDO("mysql:host=$DB_HOST;dbname=$DB_BASE;port=$DB_PORT", "$DB_USER", "$DB_PASS", [
+    $pdo = new \PDO("mysql:host=$DATABASE_HOST;dbname=$DATABASE_BASE;port=$DATABASE_PORT", "$DATABASE_USER", "$DATABASE_PASS", [
         \PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION
     ]);
 } catch(\Exception $ex) {
     switch ($ex->getCode()) {
-        // we can immediately stop startup here and show the error message
         case 1045:
+            // we can immediately stop here and show the error message
             echo 'Access denied (1045)';
             die(1);
-        // we can immediately stop startup here and show the error message
         case 1049:
-            echo 'Unknown database (1049)';
+            // error "Unknown database (1049)" can be ignored, the database will be created by Kimai
-            die(2);
+            return;
         // a lot of errors share the same meaningless error code zero
         case 0:
             // this error includes the database name, so we can only search for the static part of the error message
             if (stripos($ex->getMessage(), 'SQLSTATE[HY000] [1049] Unknown database') !== false) {
-                echo 'Unknown database (0-1049)';
+                // error "Unknown database (1049)" can be ignored, the database will be created by Kimai
-                die(3);
+                return;
             }
             switch ($ex->getMessage()) {
                 // eg. no response (fw) - the startup script should retry it a couple of times

.docker/entrypoint.sh

@@ -3,39 +3,21 @@
 KIMAI=$(cat /opt/kimai/version.txt)
 echo $KIMAI
 
-
+function waitForDB() {
-function config() {
-  # set mem limits and copy in custom logger config
-  if [ -z "$memory_limit" ]; then
-    memory_limit=256M
-  fi
-
-
   # Parse sql connection data
-  if [ ! -z "$DATABASE_URL" ]; then
+  DATABASE_USER=$(awk -F '[/:@]' '{print $4}' <<< "$DATABASE_URL")
-    DB_TYPE=$(awk -F '[/:@]' '{print $1}' <<< "$DATABASE_URL")
+  DATABASE_PASS=$(awk -F '[/:@]' '{print $5}' <<< "$DATABASE_URL")
-    DB_USER=$(awk -F '[/:@]' '{print $4}' <<< "$DATABASE_URL")
+  DATABASE_HOST=$(awk -F '[/:@]' '{print $6}' <<< "$DATABASE_URL")
-    DB_PASS=$(awk -F '[/:@]' '{print $5}' <<< "$DATABASE_URL")
+  DATABASE_PORT=$(awk -F '[/:@]' '{print $7}' <<< "$DATABASE_URL")
-    DB_HOST=$(awk -F '[/:@]' '{print $6}' <<< "$DATABASE_URL")
+  DATABASE_BASE=$(awk -F '[/?]' '{print $4}' <<< "$DATABASE_URL")
-    DB_PORT=$(awk -F '[/:@]' '{print $7}' <<< "$DATABASE_URL")
-    DB_BASE=$(awk -F '[/?]' '{print $4}' <<< "$DATABASE_URL")
-  else
-    DB_TYPE=${DB_TYPE:mysql}
-    if [ "$DB_TYPE" == "mysql" ]; then
-      export DATABASE_URL="${DB_TYPE}://${DB_USER:=kimai}:${DB_PASS:=kimai}@${DB_HOST:=sqldb}:${DB_PORT:=3306}/${DB_BASE:=kimai}"
-    else
-      echo "Unknown database type, cannot proceed. Only 'mysql' is supported, received: [$DB_TYPE]"
-      exit 1
-    fi
-  fi
 
   re='^[0-9]+$'
-  if ! [[ $DB_PORT =~ $re ]] ; then
+  if ! [[ $DATABASE_PORT =~ $re ]] ; then
-     DB_PORT=3306
+     DATABASE_PORT=3306
   fi
 
-  echo "Wait for MySQL DB connection ..."
+  echo "Wait for database connection ..."
-  until php /dbtest.php $DB_HOST $DB_BASE $DB_PORT $DB_USER $DB_PASS; do
+  until php /dbtest.php "$DATABASE_HOST" "$DATABASE_BASE" "$DATABASE_PORT" "$DATABASE_USER" "$DATABASE_PASS"; do
     echo Checking DB: $?
     sleep 3
   done
@@ -44,11 +26,12 @@ function config() {
 
 function handleStartup() {
   # set mem limits and copy in custom logger config
+  if [ -z "$memory_limit" ]; then
+    memory_limit=512M
+  fi
   sed -i "s/memory_limit.*/memory_limit=$memory_limit/g" /usr/local/etc/php/php.ini
   cp /assets/monolog.yaml /opt/kimai/config/packages/monolog.yaml
 
-  tar -zx -C /opt/kimai -f /var/tmp/public.tgz
-
   if [ -z "$USER_ID" ]; then
     USER_ID=$(id -u www-data)
   fi
@@ -90,7 +73,30 @@ function handleStartup() {
   fi
 }
 
-config
+function prepareKimai() {
-handleStartup
+  # These are idempotent, so we can run them on every start-up
+  /opt/kimai/bin/console -n kimai:install
+  if [ ! -z "$ADMINPASS" ] && [ ! -a "$ADMINMAIL" ]; then
+    /opt/kimai/bin/console kimai:user:create admin "$ADMINMAIL" ROLE_SUPER_ADMIN "$ADMINPASS"
+  fi
+  echo "$KIMAI" > /opt/kimai/var/installed
+  echo "Kimai is ready"
+}
 
-exec /service.sh
+function runServer() {
+  # Just while I'm fixing things
+  /opt/kimai/bin/console kimai:reload --env="$APP_ENV"
+  chown -R $USER_ID:$GROUP_ID /opt/kimai/var
+  if [ -e /use_apache ]; then
+    exec /usr/sbin/apache2 -D FOREGROUND
+  elif [ -e /use_fpm ]; then
+    exec php-fpm
+  else
+    echo "Error, unknown server type"
+  fi
+}
+
+waitForDB
+handleStartup
+prepareKimai
+runServer

.docker/self-test.sh

@@ -1,59 +0,0 @@
-#!/bin/sh
-
-/startup.sh 2>&1
-echo $$ > /tmp/startup.pid
-echo "Waiting for kimai to install"
-while [ ! -f /opt/kimai/var/installed ]; do
-  echo -n ". "
-  sleep 5
-done
-echo
-
-# Test FPM CGI
-if [ -f /use_fpm ]; then
-
-  export SCRIPT_NAME=/opt/kimai/public/index.php
-  export SCRIPT_FILENAME=/opt/kimai/public/index.php
-  export REQUEST_METHOD=GET
-  export SERVER_ADDR=localhost
-
-  COUNT=0
-  until cgi-fcgi -bind -connect 127.0.0.1:9000 &> /dev/null
-  do
-    COUNT=$((COUNT+1))
-    echo "Waiting for FPM Server to start (${COUNT})"
-    sleep 3
-    if [ "$COUNT" -gt 5 ]; then
-      echo "FPM Failed to start."
-      exit 1
-    fi
-  done
-
-fi
-
-# Test Apache/httpd
-if [ -f /use_apache ]; then
-
-  COUNT=0
-  until curl -s -o /dev/null http://localhost:8001
-  do
-    COUNT=$((COUNT+1))
-    echo "Waiting for Apache/HTTP to start (${COUNT})" &> /dev/null
-    sleep 3
-    if [ "$COUNT" -gt 5 ]; then
-      echo "Apache/HTTP failed to start."
-      exit 1
-    fi
-  done
-
-fi
-
-# Test PHP/Kimai
-/opt/kimai/bin/console kimai:version
-if [ $? != 0 ]; then
-  echo "PHP/Kimai not responding"
-  exit 1
-fi
-kill $(cat /tmp/startup.pid)
-
-

.docker/service.sh

@@ -1,61 +0,0 @@
-#!/bin/bash -x
-
-function waitForDB() {
-  # Parse sql connection data
-  if [ ! -z "$DATABASE_URL" ]; then
-    DB_TYPE=$(awk -F '[/:@]' '{print $1}' <<< "$DATABASE_URL")
-    DB_USER=$(awk -F '[/:@]' '{print $4}' <<< "$DATABASE_URL")
-    DB_PASS=$(awk -F '[/:@]' '{print $5}' <<< "$DATABASE_URL")
-    DB_HOST=$(awk -F '[/:@]' '{print $6}' <<< "$DATABASE_URL")
-    DB_PORT=$(awk -F '[/:@]' '{print $7}' <<< "$DATABASE_URL")
-    DB_BASE=$(awk -F '[/?]' '{print $4}' <<< "$DATABASE_URL")
-  else
-    DB_TYPE=${DB_TYPE:mysql}
-    if [ "$DB_TYPE" == "mysql" ]; then
-      export DATABASE_URL="${DB_TYPE}://${DB_USER:=kimai}:${DB_PASS:=kimai}@${DB_HOST:=sqldb}:${DB_PORT:=3306}/${DB_BASE:=kimai}"
-    else
-      echo "Unknown database type, cannot proceed. Only 'mysql' is supported, received: [$DB_TYPE]"
-      exit 1
-    fi
-  fi
-
-  re='^[0-9]+$'
-  if ! [[ $DB_PORT =~ $re ]] ; then
-     DB_PORT=3306
-  fi
-
-  echo "Wait for MySQL DB connection ..."
-  until php /dbtest.php $DB_HOST $DB_BASE $DB_PORT $DB_USER $DB_PASS; do
-    echo Checking DB: $?
-    sleep 3
-  done
-  echo "Connection established"
-}
-
-function handleStartup() {
-  # These are idempotent, run them anyway
-  /opt/kimai/bin/console -n kimai:install
-  /opt/kimai/bin/console -n kimai:update
-  if [ ! -z "$ADMINPASS" ] && [ ! -a "$ADMINMAIL" ]; then
-    /opt/kimai/bin/console kimai:user:create superadmin "$ADMINMAIL" ROLE_SUPER_ADMIN "$ADMINPASS"
-  fi
-  echo "$KIMAI" > /opt/kimai/var/installed
-  echo "Kimai2 ready"
-}
-
-function runServer() {
-  # Just while I'm fixing things
-  /opt/kimai/bin/console kimai:reload --env="$APP_ENV"
-  chown -R $USER_ID:$GROUP_ID /opt/kimai/var
-  if [ -e /use_apache ]; then
-    exec /usr/sbin/apache2 -D FOREGROUND
-  elif [ -e /use_fpm ]; then
-    exec php-fpm
-  else
-    echo "Error, unknown server type"
-  fi
-}
-
-waitForDB
-handleStartup
-runServer

.editorconfig

@@ -1,23 +1,17 @@
-; top-most EditorConfig file
+# editorconfig.org
+
 root = true
 
-; Unix-style newlines
 [*]
-end_of_line = lf
 charset = utf-8
-
+end_of_line = lf
-[*.php]
-indent_style = space
 indent_size = 4
-
-[*.twig]
 indent_style = space
-indent_size = 4
+insert_final_newline = true
+trim_trailing_whitespace = true
 
-[*.yaml]
+[{compose.yaml,compose.*.yaml}]
-indent_style = space
+indent_size = 2
-indent_size = 4
 
-[*.yml]
+[*.md]
-indent_style = space
+trim_trailing_whitespace = false
-indent_size = 4

.env.dist

@@ -1,7 +1,18 @@
+# In all environments, the following files are loaded if they exist,
+# the latter taking precedence over the former:
 #
-# You should NOT use this file in production, but instead move the environment variables to your webserver configuration.
+#  * .env                contains default values for the environment variables needed by the app
-# The .env file is only existing to simplify the initial setup!
+#  * .env.local          uncommitted file with local overrides
+#  * .env.$APP_ENV       committed environment-specific defaults
+#  * .env.$APP_ENV.local uncommitted environment-specific overrides
 #
+# Real environment variables win over .env files.
+#
+# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+# https://symfony.com/doc/current/configuration/secrets.html
+#
+# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
+# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 #================================================================================
 # Configure your database connection and set the correct server version.
@@ -16,32 +27,34 @@
 # For MySQL that would be "serverVersion=5.7" as in:
 #    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=5.7
 #
-# For MariaDB it would be "serverVersion=10.5.8-MariaDB":
+# For MariaDB it would be "serverVersion=10.11.15-MariaDB":
-#    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=10.5.8-MariaDB
+#    DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=10.11.15-MariaDB
 #
-DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=10.5.8-MariaDB
+DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=10.11.15-MariaDB
 
-#================================================================================
+# Running behind reverse proxies? Try these:
-# The full documentation can be found at https://www.kimai.org/documentation/emails.html
+# TRUSTED_PROXIES=127.0.0.1,127.0.0.2
-#
+# TRUSTED_HOSTS=localhost|example.com
-# Email will be sent with this address as sender:
+
+###> symfony/framework-bundle ###
+APP_ENV=prod
+APP_SECRET=
+APP_SHARE_DIR=var/share
+###< symfony/framework-bundle ###
+
+###> symfony/mailer ###
+# Documentation at https://www.kimai.org/documentation/emails.html
 MAILER_FROM=kimai@example.com
 # Email connection (disabled by default) - see documentation for the format
 MAILER_URL=null://null
+###< symfony/mailer ###
 
-#================================================================================
+###> nelmio/cors-bundle ###
-# do not change, unless you are developing for Kimai
+CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
-APP_ENV=prod
+###< nelmio/cors-bundle ###
 
-#================================================================================
+###> symfony/routing ###
-# should be changed to a unique character sequence, used for hashing cookies
+# Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
-APP_SECRET=change_this_to_something_unique
+# See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
-
+DEFAULT_URI=http://localhost
-#================================================================================
+###< symfony/routing ###
-# Running behind reverse proxies? Try these:
-# TRUSTED_PROXIES=127.0.0.1,127.0.0.2
-# TRUSTED_HOSTS=localhost,example.com
-
-#================================================================================
-# unlikely, that you need to change this one
-CORS_ALLOW_ORIGIN=^https?://localhost(:[0-9]+)?$

.eslintrc.js

@@ -1,11 +0,0 @@
-module.exports = {
-    env: {
-        "browser": true,
-        "node": true,
-        "es6": true,
-        "amd": true,
-    },
-    parser: '@babel/eslint-parser',
-    extends: ['eslint:recommended'],
-    ignorePatterns: ["assets/*.js"],
-}

.gitattributes

@@ -0,0 +1,20 @@
+.docker export-ignore
+.github export-ignore
+assets export-ignore
+tests export-ignore
+.codecov.yml export-ignore
+.editorconfig export-ignore
+eslint.config.js export-ignore
+eslint.config.mjs export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.php-cs-fixer.dist.php export-ignore
+php-cs-fixer.dist.php export-ignore
+babel.config.js export-ignore
+package.json export-ignore
+php-cs-fixer.sh export-ignore
+phpstan.neon export-ignore
+phpstan.sh export-ignore
+phpunit.xml.dist export-ignore
+webpack.config.js export-ignore
+yarn.lock export-ignore

.github/FUNDING.yml

@@ -1,2 +1,3 @@
 github: [kevinpapst]
+open_collective: kimai
 custom: ["https://www.kimai.org/", "https://www.kimai.cloud/", "https://www.kevinpapst.de/"]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -53,12 +53,12 @@ body:
         attributes:
             label: Which PHP version are you using?
             options:
+                - "8.5"
+                - "8.4"
+                - "8.2"
+                - "8.3"
                 - "8.1"
                 - Unknown
-                - "8.2"
-                - "8.0"
-                - "7.4"
-                - "7.3"
                 - Other (please mention below)
         validations:
             required: true

.github/release-drafter.yml

@@ -7,6 +7,7 @@ exclude-labels:
     - 'release'
 exclude-contributors:
     - 'dependabot'
+    - 'weblate'
 change-template: '- $TITLE (#$NUMBER)'
 change-title-escapes: '\<*_&`#@'
 version-resolver:
@@ -21,8 +22,8 @@ version-resolver:
             - 'translation'
     default: patch
 template: |
-    **Compatible with PHP 8.1 to 8.3**
+    **Compatible with PHP 8.1 to 8.5**
     
     $CHANGES
     
-    Involved in this release: $CONTRIBUTORS - thank you!
+    Involved in this release: $CONTRIBUTORS

.github/workflows/docker-base.yaml

@@ -1,43 +0,0 @@
-name: 'Docker base image'
-# act -j build -W ./.github/workflows/docker-base.yaml --secret-file  .dockerhub.secrets
-
-on:
-    workflow_dispatch:
-    schedule:
-      - cron: "0 4 5 * *" # build on the 5th of every month
-
-jobs:
-    build:
-        strategy:
-            matrix:
-                server: [ fpm, apache ]
-        runs-on: ubuntu-latest
-
-        steps:
-
-            - name: Checkout code
-              uses: actions/checkout@v4
-
-            - name: Install buildx
-              uses: docker/setup-buildx-action@v3
-
-            - name: Login to DockerHub
-              uses: docker/login-action@v3
-              with:
-                  username: ${{secrets.DOCKERHUB_USERNAME}}
-                  password: ${{secrets.DOCKERHUB_PASSWORD}}
-
-            - name: Build
-              uses: docker/build-push-action@v5
-              with:
-                  context: .docker
-                  file: .docker/Dockerfile.kimai-base
-                  build-args: |
-                      TIMEZONE=Europe/London
-                      BASE=${{ matrix.server }}
-                  platforms: linux/amd64,linux/arm64 #,linux/arm/v8,linux/arm/v7,linux/arm/v6
-                  tags: |
-                    kimai/kimai-base:${{ matrix.server }}
-                  push: true
-
-

.github/workflows/docker.yaml

@@ -1,16 +1,16 @@
 name: 'Docker Build'
-# act -j build -W ./.github/workflows/docker.yaml --secret-file  .dockerhub.secrets
 
 on:
     workflow_dispatch:
+        inputs:
+            kimai_tag:
+                description: 'Kimai tag to build'
+                required: true
     release:
         types: [released]
 
 jobs:
     build:
-        strategy:
-            matrix:
-                server: [ fpm, apache ]
         runs-on: ubuntu-latest
 
         steps:
@@ -21,67 +21,73 @@ jobs:
             - name: Install buildx
               uses: docker/setup-buildx-action@v3
 
-            - name: Install lastversion
-              run: sudo apt-get update -y; sudo apt-get install --no-install-recommends -y python3 python3-pip; pip install lastversion
-
             - name: Login to DockerHub
               uses: docker/login-action@v3
               with:
                   username: ${{secrets.DOCKERHUB_USERNAME}}
                   password: ${{secrets.DOCKERHUB_PASSWORD}}
 
-            - name: get lastest version
+            - name: Determine version
-              id: remote_version
+              run: |
-              run: echo "kimai_version=$(lastversion https://github.com/kimai/kimai)" >> $GITHUB_ENV
+                  input="${{ github.event.inputs.kimai_tag }}"
                   
-            - name: Build
+                  # Determine between manual trigger and release event
+                  if [ -z "$input" ]; then
+                      echo "Using release tag: ${{ github.event.release.tag_name }}"
+                      version="${{ github.event.release.tag_name }}"
+                  else
+                      echo "Using tag provided: $input"
+                      version="$input"
+                  fi
+
+                  if [[ ! $version =~ ^2\.(0|[1-9]*)(0?)\.(0|[0-9]*)(0?)$ ]]; then
+                    echo "Invalid version number: $version"
+                    exit 1
+                  fi
+                  
+                  echo "kimai_version=$version" >> $GITHUB_ENV
+
+            - name: FPM image
               uses: docker/build-push-action@v5
               with:
                   context: .
+                  file: Dockerfile
                   build-args: |
                       KIMAI=${{ env.kimai_version }}
-                      TIMEZONE=Europe/London
+                      BASE=fpm
-                      BASE=${{ matrix.server }}
                   target: prod
                   platforms: linux/amd64,linux/arm64
                   tags: |
-                      kimai/kimai2:${{ matrix.server }}
+                      kimai/kimai2:latest
-                      kimai/kimai2:${{ matrix.server }}-${{ env.kimai_version }}
+                      kimai/kimai2:fpm
+                      kimai/kimai2:fpm-${{ env.kimai_version }}
                   push: true
 
-            - name: Build dev image
+            - name: Apache image
-              if: matrix.server == 'apache'
               uses: docker/build-push-action@v5
               with:
                   context: .
+                  file: Dockerfile
+                  build-args: |
+                      KIMAI=${{ env.kimai_version }}
+                      BASE=apache
+                  target: prod
+                  platforms: linux/amd64,linux/arm64
+                  tags: |
+                      kimai/kimai2:apache
+                      kimai/kimai2:apache-${{ env.kimai_version }}
+                  push: true
+
+            - name: Development image
+              uses: docker/build-push-action@v5
+              with:
+                  context: .
+                  file: Dockerfile
                   build-args: |
                       KIMAI=${{ env.kimai_version }}
-                      TIMEZONE=Europe/London
                       BASE=apache
                   target: dev
                   platforms: linux/amd64,linux/arm64
                   tags: |
                       kimai/kimai2:dev
                   push: true
-
-    tag:
-        needs: build
-        runs-on: ubuntu-latest
-        steps:
-
-            - name: Login to DockerHub
-              uses: docker/login-action@v3
-              with:
-                  username: ${{secrets.DOCKERHUB_USERNAME}}
-                  password: ${{secrets.DOCKERHUB_PASSWORD}}
-
-            - name: Install buildx
-              uses: docker/setup-buildx-action@v3
-
-            - name: Pull images
-              run: |
-                  docker pull kimai/kimai2:fpm
-
-            - name: Tag latest
-              run: |
-                  docker buildx imagetools create -t kimai/kimai2:latest kimai/kimai2:fpm

.github/workflows/lockfiles.yaml

@@ -1,23 +1,21 @@
 name: Check .lock files
 on:
-    pull_request: null
+    pull_request_target: null
     push:
         branches:
             - main
+
+permissions:
+    pull-requests: read
+
 jobs:
     lockfiles:
         runs-on: ubuntu-latest
         name: Verify lock file integrity
         steps:
-
-            - name: Clone Kimai
-              uses: actions/checkout@v4
-              with:
-                  persist-credentials: false
-
             - name: Prevent file change
-              uses: xalvarez/prevent-file-change-action@v1
+              uses: xalvarez/prevent-file-change-action@v3
               with:
                   githubToken: ${{ secrets.GITHUB_TOKEN }}
-                  pattern: .*\.lock$
+                  pattern: .*\.lock$|^\.github\/.*$
                   trustedAuthors: kevinpapst, dependabot

.github/workflows/testing.yaml

@@ -19,7 +19,7 @@ jobs:
                 options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
         strategy:
             matrix:
-                php: ['8.1', '8.2', '8.3']
+                php: ['8.4', '8.5']
 
         name: Integration (${{ matrix.php }})
         steps:
@@ -62,7 +62,7 @@ jobs:
                 run: APP_ENV=dev bin/console kimai:reload -n
 
             -   name: Check codestyles
-                run: PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run --verbose --config=.php-cs-fixer.dist.php --using-cache=no --show-progress=none --format=checkstyle | cs2pr
+                run: vendor/bin/php-cs-fixer fix --dry-run --verbose --config=.php-cs-fixer.dist.php --using-cache=no --show-progress=none --format=checkstyle | cs2pr
 
             -   name: Run PHPStan for application
                 run: vendor/bin/phpstan analyse -c phpstan.neon --no-progress --error-format=checkstyle | cs2pr
@@ -87,7 +87,7 @@ jobs:
                     MAILER_URL: null://localhost
 
             -   name: Full test-suite
-                if: matrix.php != '8.2'
+                if: matrix.php != '8.5'
                 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
@@ -95,7 +95,7 @@ jobs:
                     MAILER_URL: null://localhost
 
             -   name: Full test-suite with coverage
-                if: matrix.php == '8.2'
+                if: matrix.php == '8.5'
                 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?charset=utf8mb4&serverVersion=8.0.35
@@ -103,8 +103,8 @@ jobs:
                     MAILER_URL: null://localhost
 
             -   name: Upload code coverage
-                if: matrix.php == '8.2'
+                if: matrix.php == '8.5'
-                uses: codecov/codecov-action@v4
+                uses: codecov/codecov-action@v5
                 with:
                     token: ${{ secrets.CODECOV_TOKEN }}
                     files: ./coverage.xml

.gitignore

@@ -1,9 +1,9 @@
 # some hosters require a htaccess to change the PHP version
 /public/.htaccess
-/.env-*
 /.idea/
 .DS_Store
-/phpstan.sh
+var/templates/
+
 
 # custom apache rules e.g. to deactivate ioncube loader
 /public/.user.ini
@@ -15,12 +15,15 @@
 # YARN 2
 /.yarnrc.yml
 /.yarn
+/.pnp.*
 
 # for keeping empty directories
 /config/packages/local.yaml
 /config/bundles-local.php
+/var/dev/*
 /var/data/*
 /var/cache/*
+/var/share/*
 /var/invoices*
 /var/export*
 /var/log/*
@@ -34,7 +37,6 @@
 /.env.local.php
 /.env.*.local
 /config/secrets/prod/prod.decrypt.private.php
-.env
 /public/bundles/
 /vendor/
 ###< symfony/framework-bundle ###
@@ -45,9 +47,8 @@
 ###< phpunit/phpunit ###
 
 ###> friendsofphp/php-cs-fixer ###
-.php_cs
+/.php-cs-fixer.php
-.php_cs.cache
+/.php-cs-fixer.cache
-.php-cs-fixer.cache
 ###< friendsofphp/php-cs-fixer ###
 
 ###> symfony/phpunit-bridge ###

.php-cs-fixer.dist.php

@@ -8,6 +8,7 @@ file that was distributed with this source code.
 COMMENT;
 
 $fixer = new PhpCsFixer\Config();
+$fixer->setUnsupportedPhpVersionAllowed(true);
 $fixer
     ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
     ->setRiskyAllowed(true)
@@ -43,6 +44,7 @@ $fixer
         'single_line_after_imports' => true,
         'switch_case_semicolon_to_colon' => true,
         'switch_case_space' => true,
+        'php_unit_method_casing' => true,
         'array_syntax' => [
             'syntax' => 'short'
         ],
@@ -141,7 +143,7 @@ $fixer
         'whitespace_after_comma_in_array' => true,
         'yoda_style' => false,
         'ternary_to_null_coalescing' => true,
-        'visibility_required' => ['elements' => [
+        'modifier_keywords' => ['elements' => [
             'const',
             'method',
             'property',

CONTRIBUTING.md

@@ -1,15 +1,16 @@
 # Contributing
 
 Kimai is an open source project, contributions made by the community are welcome.
+But we can only accept contributions with a signed CLA (Contributor License Agreement) to prevent issues in the future (you will see a link when opening a PR).
+
 Send your ideas, code reviews, pull requests and feature requests to help to improve this project.
 
 ## Pull request rules
 
+- Make your changes in a new git branch, based on the latest code in `main`
 - Apply our code-style by running `composer codestyle-fix`
 - Run the static code analysis with `composer phpstan`
-- Verify everything still works with `composer tests-unit` and `composer tests-integration`
+- Verify everything still works with `composer tests` 
 - Add tests for your changes
-- When sending in a PR, you must accept that your contributions/code will be published under MIT license (see the [LICENSE](LICENSE) file as well), otherwise your PR will be closed
-- If one of the PR checks/builds fails, fix it before asking for a review
 
 Further documentation can be found in the [developer documentation](https://www.kimai.org/documentation/developers.html).

Dockerfile

@@ -4,12 +4,27 @@
 # | . \| | | | | | | (_| | |
 # |_|\_\_|_| |_| |_|\__,_|_|
 #
+# Kimai images for:
+# - plain PHP FPM   (kimai/kimai2:fpm)
+# - Apache with PHP (kimai/kimai2:apache)
+# - Development     (kimai/kimai2:dev)
+# ---------------------------------------------------------------------
+# For local testing by maintainer:
+#
+# docker build --no-cache -t kimai-fpm --build-arg BASE=fpm .
+# docker build --no-cache -t kimai-apache --build-arg BASE=apache .
+# docker run -d --name kimai-apache-app kimai-apache
+# docker exec -ti kimai-apache-app /bin/bash
+# ---------------------------------------------------------------------
+# Official PHP images: https://hub.docker.com/_/php/
+# https://github.com/docker-library/docs/blob/master/php/README.md#supported-tags-and-respective-dockerfile-links
+# Pass-through Arguments: https://benkyriakou.com/posts/docker-args-empty
+# Best practices: https://docs.docker.com/build/building/best-practices/
+# ---------------------------------------------------------------------
 
-# Source base [fpm/apache]
+# Source base, one of: fpm, apache
 ARG BASE="fpm"
-ARG PHP_VER="8.2"
+# Kimai branch/tag to run
-ARG COMPOSER_VER="latest"
-# Branch name
 ARG KIMAI="main"
 # Timezone for images
 ARG TIMEZONE="Europe/Berlin"
@@ -18,32 +33,209 @@ ARG TIMEZONE="Europe/Berlin"
 # Shared tools
 ###########################
 
-# full kimai source
+# composer base image
-FROM alpine:latest AS git-dev
+FROM composer:latest AS composer
-# pass-through Arguments in every stage. See: https://benkyriakou.com/posts/docker-args-empty
+
-ARG KIMAI
+###########################
+# PHP extensions
+###########################
+
+# fpm alpine php extension base
+FROM php:8.3-fpm-alpine AS fpm-php-ext-base
+RUN apk add --no-cache \
+    # build-tools
+    autoconf \
+    dpkg \
+    dpkg-dev \
+    file \
+    g++ \
+    gcc \
+    icu-dev \
+    libatomic \
+    libc-dev \
+    libgomp \
+    libmagic \
+    m4 \
+    make \
+    mpc1 \
+    mpfr4 \
+    musl-dev \
+    perl \
+    re2c \
+    # gd
+    freetype-dev \
+    libpng-dev \
+    # icu
+    icu-dev \
+    icu-data-full \
+    # ldap
+    openldap-dev \
+    libldap \
+    # zip
+    libzip-dev \
+    # xsl
+    libxslt-dev
+
+# apache debian php extension base
+FROM php:8.3-apache-bookworm AS apache-php-ext-base
+RUN apt-get update && \
+    apt-get install -y \
+        libldap2-dev \
+        libicu-dev \
+        libpng-dev \
+        libzip-dev \
+        libxslt1-dev \
+        libfreetype6-dev
+
+# php extension gd - 13.86s
+FROM ${BASE}-php-ext-base AS php-ext-gd
+RUN docker-php-ext-configure gd \
+        --with-freetype && \
+    docker-php-ext-install -j$(nproc) gd
+
+# php extension intl : 15.26s
+FROM ${BASE}-php-ext-base AS php-ext-intl
+RUN docker-php-ext-install -j$(nproc) intl
+
+# php extension ldap : 8.45s
+FROM ${BASE}-php-ext-base AS php-ext-ldap
+RUN docker-php-ext-configure ldap && \
+    docker-php-ext-install -j$(nproc) ldap
+
+# php extension pdo_mysql : 6.14s
+FROM ${BASE}-php-ext-base AS php-ext-pdo_mysql
+RUN docker-php-ext-install -j$(nproc) pdo_mysql
+
+# php extension zip : 8.18s
+FROM ${BASE}-php-ext-base AS php-ext-zip
+RUN docker-php-ext-install -j$(nproc) zip
+
+# php extension xsl : ?.?? s
+FROM ${BASE}-php-ext-base AS php-ext-xsl
+RUN docker-php-ext-install -j$(nproc) xsl
+
+# php extension opcache
+FROM ${BASE}-php-ext-base AS php-ext-opcache
+RUN docker-php-ext-install -j$(nproc) opcache
+
+###########################
+# fpm base build
+###########################
+
+FROM php:8.3-fpm-alpine AS fpm-base
 ARG TIMEZONE
-RUN apk add --no-cache git && \
+RUN apk add --no-cache \
-    git clone --depth 1 --branch ${KIMAI} https://github.com/kimai/kimai.git /opt/kimai
+        bash \
+        coreutils \
+        freetype \
+        haveged \
+        icu \
+        icu-data-full \
+        libldap \
+        libpng \
+        libzip \
+        libxslt-dev \
+        fcgi \
+        tzdata && \
+    touch /use_fpm && \
+    sed -i "s/;ping.path/ping.path/g" /usr/local/etc/php-fpm.d/www.conf && \
+    sed -i "s/;access.suppress_path\[\] = \/ping/access.suppress_path\[\] = \/ping/g" /usr/local/etc/php-fpm.d/www.conf
 
-# production kimai source
+EXPOSE 9000
-FROM git-dev AS git-prod
-WORKDIR /opt/kimai
-RUN rm -r tests
 
+HEALTHCHECK --interval=20s --timeout=10s --retries=3 \
+    CMD \
+    SCRIPT_NAME=/ping \
+    SCRIPT_FILENAME=/ping \
+    REQUEST_METHOD=GET \
+    cgi-fcgi -bind -connect 127.0.0.1:9000 || exit 1
 
-# FPM base
+###########################
-FROM kimai/kimai-base:fpm AS fpm-base
+# apache base build
+###########################
+
+FROM php:8.3-apache-bookworm AS apache-base
+ARG TIMEZONE
+RUN apt-get update && \
+    apt-get install -y \
+        bash \
+        haveged \
+        libicu72 \
+        libldap-common \
+        libpng16-16 \
+        libzip4 \
+        libxslt1.1 \
+        libfreetype6 \
+        unzip && \
+    echo "Listen 8001" > /etc/apache2/ports.conf && \
+    a2enmod rewrite && \
+    touch /use_apache
 
-# Apache base
-FROM kimai/kimai-base:apache AS apache-base
 COPY .docker/000-default.conf /etc/apache2/sites-available/000-default.conf
 
+EXPOSE 8001
+
+HEALTHCHECK --interval=20s --timeout=10s --retries=3 \
+    CMD curl -f http://127.0.0.1:8001 || exit 1
+
 ###########################
 # global base build
 ###########################
 
-FROM ${BASE}-base AS base
+FROM ${BASE}-base AS php-base
+ARG TIMEZONE
+
+ENV TIMEZONE=${TIMEZONE}
+RUN ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime && echo ${TIMEZONE} > /etc/timezone && \
+    # make composer home dir
+    mkdir /composer  && \
+    chown -R www-data:www-data /composer
+
+# copy composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer
+
+# copy php extensions
+
+# PHP extension xsl
+COPY --from=php-ext-xsl /usr/local/etc/php/conf.d/docker-php-ext-xsl.ini /usr/local/etc/php/conf.d/docker-php-ext-xsl.ini
+COPY --from=php-ext-xsl /usr/local/lib/php/extensions/no-debug-non-zts-20230831/xsl.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/xsl.so
+# PHP extension pdo_mysql
+COPY --from=php-ext-pdo_mysql /usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini /usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini
+COPY --from=php-ext-pdo_mysql /usr/local/lib/php/extensions/no-debug-non-zts-20230831/pdo_mysql.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/pdo_mysql.so
+# PHP extension zip
+COPY --from=php-ext-zip /usr/local/etc/php/conf.d/docker-php-ext-zip.ini /usr/local/etc/php/conf.d/docker-php-ext-zip.ini
+COPY --from=php-ext-zip /usr/local/lib/php/extensions/no-debug-non-zts-20230831/zip.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/zip.so
+# PHP extension ldap
+COPY --from=php-ext-ldap /usr/local/etc/php/conf.d/docker-php-ext-ldap.ini /usr/local/etc/php/conf.d/docker-php-ext-ldap.ini
+COPY --from=php-ext-ldap /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ldap.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ldap.so
+# PHP extension gd
+COPY --from=php-ext-gd /usr/local/etc/php/conf.d/docker-php-ext-gd.ini /usr/local/etc/php/conf.d/docker-php-ext-gd.ini
+COPY --from=php-ext-gd /usr/local/lib/php/extensions/no-debug-non-zts-20230831/gd.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/gd.so
+# PHP extension intl
+COPY --from=php-ext-intl /usr/local/etc/php/conf.d/docker-php-ext-intl.ini /usr/local/etc/php/conf.d/docker-php-ext-intl.ini
+COPY --from=php-ext-intl /usr/local/lib/php/extensions/no-debug-non-zts-20230831/intl.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/intl.so
+# PHP extension opcache
+COPY --from=php-ext-opcache /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini  /usr/local/etc/php/conf.d/docker-php-ext-opcache.ini
+
+###########################
+# fetch Kimai sources
+###########################
+
+FROM alpine:latest AS git-prod
+ARG KIMAI
+ARG TIMEZONE
+# the convention in the Kimai repository is: tags are always version numbers, branch names always start with a letter
+# if the KIMAI variable starts with a number (e.g. 2.24.0) we assume its a tag, otherwise its a branch
+RUN [[ $KIMAI =~ ^[0-9] ]] && export REF='tags' || export REF='heads' && \
+    wget -O "/opt/kimai.tar.gz" "https://github.com/kimai/kimai/archive/refs/${REF}/${KIMAI}.tar.gz" && \
+    tar -xpzf /opt/kimai.tar.gz -C /opt/ && \
+    mv /opt/kimai-${KIMAI} /opt/kimai
+
+###########################
+# global base build
+###########################
+
+FROM php-base AS base
 ARG KIMAI
 ARG TIMEZONE
 
@@ -55,8 +247,7 @@ LABEL org.opencontainers.image.title="Kimai" \
       org.opencontainers.image.source="https://github.com/kimai/kimai" \
       org.opencontainers.image.version="${KIMAI}" \
       org.opencontainers.image.vendor="Kevin Papst" \
-      org.opencontainers.image.licenses="AGPL-3.0" \
+      org.opencontainers.image.licenses="AGPL-3.0"
-      org.opencontainers.image.base.name="docker.io/library/alpine"
 
 ENV KIMAI=${KIMAI}
 ENV TIMEZONE=${TIMEZONE}
@@ -65,49 +256,37 @@ RUN ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime && echo ${TIMEZONE} >
     chown -R www-data:www-data /composer
 
 # copy startup script & DB checking script
-COPY .docker/startup.sh /startup.sh
-COPY .docker/service.sh /service.sh
-COPY .docker/self-test.sh /self-test.sh
 COPY .docker/dbtest.php /dbtest.php
+COPY .docker/entrypoint.sh /entrypoint.sh
 
-ENV DATABASE_URL="mysql://kimai:kimai@127.0.0.1:3306/kimai?charset=utf8mb4&serverVersion=5.7.40"
+ENV DATABASE_URL="mysql://kimai:kimai@127.0.0.1:3306/kimai?charset=utf8mb4&serverVersion=8.3"
 ENV APP_SECRET=change_this_to_something_unique
 # The default container name for nginx is nginx
 ENV TRUSTED_PROXIES=nginx,localhost,127.0.0.1
-ENV TRUSTED_HOSTS=nginx,localhost,127.0.0.1
 ENV MAILER_FROM=kimai@example.com
 ENV MAILER_URL=null://localhost
 ENV ADMINPASS=
 ENV ADMINMAIL=
-ENV DB_TYPE=
-ENV DB_USER=
-ENV DB_PASS=
-ENV DB_HOST=
-ENV DB_PORT=
-ENV DB_BASE=
-ENV COMPOSER_MEMORY_LIMIT=-1
-# If this set then the image will start, run a self test and then exit. It's used for the release process
-ENV TEST_AND_EXIT=
-ENV COMPOSER_ALLOW_SUPERUSER=1
 ENV USER_ID=
 ENV GROUP_ID=
+# default values to configure composer behavior
+ENV COMPOSER_MEMORY_LIMIT=-1
+ENV COMPOSER_ALLOW_SUPERUSER=1
 
 VOLUME [ "/opt/kimai/var" ]
 
-CMD [ "/startup.sh" ]
+CMD [ "/entrypoint.sh" ]
-
 
 ###########################
 # final builds
 ###########################
 
-# developement build
+# development build
 FROM base AS dev
 # copy kimai develop source
-COPY --from=git-dev --chown=www-data:www-data /opt/kimai /opt/kimai
+COPY --from=git-prod --chown=www-data:www-data /opt/kimai /opt/kimai
 COPY .docker /assets
 # do the composer deps installation
-RUN echo \$PATH
 RUN \
     export COMPOSER_HOME=/composer && \
     composer --no-ansi install --working-dir=/opt/kimai --optimize-autoloader && \
@@ -118,13 +297,12 @@ RUN \
     mkdir -p /opt/kimai/var/logs && chmod 777 /opt/kimai/var/logs && \
     sed "s/128M/-1/g" /usr/local/etc/php/php.ini-development > /opt/kimai/php-cli.ini && \
     sed -i "s/env php/env -S php -c \/opt\/kimai\/php-cli.ini/g" /opt/kimai/bin/console && \
-    tar -C /opt/kimai -zcvf /var/tmp/public.tgz public && \
     /opt/kimai/bin/console kimai:version | awk '{print $2}' > /opt/kimai/version.txt
 ENV APP_ENV=dev
 ENV DATABASE_URL=
-ENV memory_limit=256M
+ENV memory_limit=512M
 
-# production build
+# the "prod" stage (production build) is configured as last stage in the file, as this is the default target in BuildKit
 FROM base AS prod
 # copy kimai production source
 COPY --from=git-prod --chown=www-data:www-data /opt/kimai /opt/kimai
@@ -134,7 +312,7 @@ RUN \
     export COMPOSER_HOME=/composer && \
     composer --no-ansi install --working-dir=/opt/kimai --no-dev --optimize-autoloader && \
     composer --no-ansi clearcache && \
-    composer --no-ansi require --working-dir=/opt/kimai laminas/laminas-ldap && \
+    composer --no-ansi require --update-no-dev --working-dir=/opt/kimai laminas/laminas-ldap && \
     cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \
     sed -i "s/expose_php = On/expose_php = Off/g" /usr/local/etc/php/php.ini && \
     sed -i "s/;opcache.enable=1/opcache.enable=1/g" /usr/local/etc/php/php.ini && \
@@ -146,8 +324,7 @@ RUN \
     mkdir -p /opt/kimai/var/logs && chmod 777 /opt/kimai/var/logs && \
     sed "s/128M/-1/g" /usr/local/etc/php/php.ini-development > /opt/kimai/php-cli.ini && \
     chown -R www-data:www-data /opt/kimai /usr/local/etc/php/php.ini && \
-    tar -C /opt/kimai -zcvf /var/tmp/public.tgz public && \
     /opt/kimai/bin/console kimai:version | awk '{print $2}' > /opt/kimai/version.txt
 ENV APP_ENV=prod
 ENV DATABASE_URL=
-ENV memory_limit=256M
+ENV memory_limit=512M

README.md

@@ -21,13 +21,6 @@ authentication via SAML/LDAP/Database, two-factor authentication (2FA) with TOTP
 user/customer/project specific rates, advanced search & filtering, money and time budgets, advanced reporting, support for [plugins](https://www.kimai.org/store/)
 and so much more.
 
-### Versions
-
-There are two [versions](https://www.kimai.org/documentation/versions.html) of Kimai existing:
-
-- [Version 2](https://github.com/kimai/kimai) — the current stable release (PHP 8.1+)
-- [Version 1](https://github.com/kimai/kimai/tree/1.x) — do **NOT** use, EOL since mid of 2023 (PHP 7.4) 
-
 ### Links
 
 - [Home](https://www.kimai.org) — Kimai project homepage
@@ -36,7 +29,7 @@ There are two [versions](https://www.kimai.org/documentation/versions.html) of K
 
 ### Requirements
 
-- PHP 8.1.3 minimum (support for PHP 8.2 and 8.3)
+- PHP 8.1.3 minimum with support for 8.2, 8.3, 8.4, 8.5
 - MariaDB or MySQL
 - A webserver and subdomain (subdirectory is not supported)
 - PHP extensions: `gd`, `intl`, `json`, `mbstring`, `pdo`, `tokenizer`, `xml`, `xsl`, `zip`
@@ -51,7 +44,7 @@ There are two [versions](https://www.kimai.org/documentation/versions.html) of K
 
 There are more documented ways for [on-premise hosting](https://www.kimai.org/documentation/chapter-on-premise.html). 
 
-And if you don't want to host Kimai, you can use [the Cloud version](https://www.kimai.cloud/) of it.
+And if you don't want to host Kimai, you can use the [Cloud version](https://www.kimai.cloud/) of it.
 
 ### Updating Kimai
 

SECURITY.md

@@ -7,5 +7,4 @@ As announced in the [README](README.md) security fixes will only be added to the
 | main branch          | :white_check_mark: |
 | older releases       | :x:                |
 
-
 You find all information in our [Bughunter documentation](https://www.kimai.org/documentation/bughunter.html).   

UPGRADING-2.md

@@ -0,0 +1,50 @@
+# Upgrading Kimai - Version 2.x
+
+_Make sure to create a backup before you start!_ 
+
+Read the [updates documentation](https://www.kimai.org/documentation/updates.html) to find out how 
+you can upgrade your Kimai installation to the latest stable release.
+
+Check below if there are more version specific steps required, which need to be executed after the normal update process.
+Perform EACH version specific task between your version and the new one, otherwise you risk data inconsistency or a broken installation.
+
+## [2.0.30](https://github.com/kimai/kimai/releases/tag/2.0.30)
+
+The `DATABASE_URL` in your environment settings (e.g. [.env](https://github.com/kimai/kimai/issues/4246), [docker-compose.yaml](https://github.com/tobybatch/kimai2/issues/531) or webserver config)
+now requires the `charset` and `serverVersion` params, e.g.: `DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=10.5.8-MariaDB` (examples in `.env`).
+
+## [2.0](https://github.com/kimai/kimai/releases/tag/2.0)
+
+**!! This release requires minimum PHP version to 8.1 !!**
+
+### Breaking changes
+
+- All plugins need to be updated: delete all previous version from your installation (`rm -r var/plugins/*`) before updating!
+- The `local.yaml` is not compatible with old version, remove it before the update and then re-create it after everything works
+  - removed: configuring the `dashboard` is not supported any longer
+  - removed: custom translation files via `theme.branding.translation`
+  - removed: changing the plugin directory via `kimai.plugin_dir`
+
+### Developer
+
+Developer read the full documentation at [https://www.kimai.org/documentation/migration-v2.html](https://www.kimai.org/documentation/migration-v2.html).
+
+- Invoice renderer and templates for XML, JSON and TEXT were moved to the [Extended invoicing plugin](https://www.kimai.org/store/invoice-bundle.html) (install if you use one of those)
+- Moved `company.docx` to [external repo](https://github.com/kimai/invoice-templates/tree/main/docx-company) (needs to be re-uploaded if you want to keep on using it!)
+- Role names are forced to be uppercase 
+- Removed unused `public/avatars/` directory 
+- Time-tracking mode `duration_only` was removed, existing installations will be switched to `duration_fixed_begin`
+- Removed Twig filters. You might have to replace them in your custom export/invoice templates:
+  - `date_full` => `date_time`
+  - `duration_decimal` => `duration(true)`
+  - `currency` => `currency_name`
+  - `country` => `country_name`
+  - `language` => `language_name`
+- Removed support for custom translation files (use [TranslationBundle](https://www.kimai.org/store/translation-bundle.html) instead or write your own plugin)
+- Removed all 3rd party mailer packages, you need to install them manually (ONLY if you used a short syntax to configure the `MAILER_URL` in `.env`): 
+  - `composer require symfony/amazon-mailer`
+  - `composer require symfony/google-mailer`
+  - `composer require symfony/mailchimp-mailer`
+  - `composer require symfony/mailgun-mailer`
+  - `composer require symfony/postmark-mailer`
+  - `composer require symfony/sendgrid-mailer`

UPGRADING-3.md

@@ -0,0 +1,32 @@
+# Upgrading Kimai - Version 3.x
+
+_Make sure to create a backup before you start!_ 
+
+Read the [updates documentation](https://www.kimai.org/documentation/updates.html) to find out how you can upgrade your Kimai installation to the latest stable release.
+
+Check below if there are more version specific steps required, which need to be executed after the normal update process.
+Perform EACH version specific task between your version and the new one, otherwise you risk data inconsistency or a broken installation.
+
+## 3.0
+
+**!! This release requires minimum PHP version 8.4 !!**
+
+### Rename .env
+
+Rename your file `.env` to `.env.local` or even better: move all variables to your webserver/container environment.
+
+### Developer
+
+Do not use method chaining: all fluent interface, especially in Entities, are no longer supported.
+
+- Require PHP 8.4
+- Bump to Symfony 7.4
+- Removed old API token `X-AUTH-USER` and `X-AUTH-TOKEN`
+- Removed `TimesheetConstraint` - use a normal `Constraint` as base class and attach the `#[App\Validator\Attribute\TimesheetConstraint]` attribute 
+- Removed `ProjectConstraint` - use a `FormExtension` and attach your custom constraints 
+- Interface `MetaTableTypeInterface` has new methods: `getSection()`, `setSection()`
+- Interface `ExportRendererInterface` has new methods: `getType()`, `isInternal()`
+- Interface `ExportableItem` has new methods: `getTags()`, `getBreak()` 
+- Removed and renamed translations, most important `action.edit` => `edit`, `my.profile` => `user_profile`
+- Removed `User::isExportDecimal()`
+  - Use duration format `HH:mm` in default PDF exports

UPGRADING.md

@@ -1,50 +1,3 @@
-# Upgrading Kimai - Version2.x
+# Upgrading Kimai
 
-_Make sure to create a backup before you start!_ 
+The most recent version is Kimai 3, please read the changelog at [UPGRADING-3.md](UPGRADING-3.md). 
-
-Read the [updates documentation](https://www.kimai.org/documentation/updates.html) to find out how 
-you can upgrade your Kimai installation to the latest stable release.
-
-Check below if there are more version specific steps required, which need to be executed after the normal update process.
-Perform EACH version specific task between your version and the new one, otherwise you risk data inconsistency or a broken installation.
-
-## [2.0.30](https://github.com/kimai/kimai/releases/tag/2.0.30)
-
-The `DATABASE_URL` in your environment settings (e.g. [.env](https://github.com/kimai/kimai/issues/4246), [docker-compose.yaml](https://github.com/tobybatch/kimai2/issues/531) or webserver config)
-now requires the `charset` and `serverVersion` params, e.g.: `DATABASE_URL=mysql://user:password@127.0.0.1:3306/database?charset=utf8mb4&serverVersion=10.5.8-MariaDB` (examples in `.env`).
-
-## [2.0](https://github.com/kimai/kimai/releases/tag/2.0)
-
-**!! This release requires minimum PHP version to 8.1 !!**
-
-### Breaking changes
-
-- All plugins need to be updated: delete all previous version from your installation (`rm -r var/plugins/*`) before updating!
-- The `local.yaml` is not compatible with old version, remove it before the update and then re-create it after everything works
-  - removed: configuring the `dashboard` is not supported any longer
-  - removed: custom translation files via `theme.branding.translation`
-  - removed: changing the plugin directory via `kimai.plugin_dir`
-
-### Developer
-
-Developer read the full documentation at [https://www.kimai.org/documentation/migration-v2.html](https://www.kimai.org/documentation/migration-v2.html).
-
-- Invoice renderer and templates for XML, JSON and TEXT were moved to the [Extended invoicing plugin](https://www.kimai.org/store/invoice-bundle.html) (install if you use one of those)
-- Moved `company.docx` to [external repo](https://github.com/kimai/invoice-templates/tree/main/docx-company) (needs to be re-uploaded if you want to keep on using it!)
-- Role names are forced to be uppercase 
-- Removed unused `public/avatars/` directory 
-- Time-tracking mode `duration_only` was removed, existing installations will be switched to `duration_fixed_begin`
-- Removed Twig filters. You might have to replace them in your custom export/invoice templates:
-  - `date_full` => `date_time`
-  - `duration_decimal` => `duration(true)`
-  - `currency` => `currency_name`
-  - `country` => `country_name`
-  - `language` => `language_name`
-- Removed support for custom translation files (use [TranslationBundle](https://www.kimai.org/store/translation-bundle.html) instead or write your own plugin)
-- Removed all 3rd party mailer packages, you need to install them manually (ONLY if you used a short syntax to configure the `MAILER_URL` in `.env`): 
-  - `composer require symfony/amazon-mailer`
-  - `composer require symfony/google-mailer`
-  - `composer require symfony/mailchimp-mailer`
-  - `composer require symfony/mailgun-mailer`
-  - `composer require symfony/postmark-mailer`
-  - `composer require symfony/sendgrid-mailer`

assets/dashboard.js

@@ -1,8 +0,0 @@
-/**
- * https://gridstackjs.com
- * https://github.com/gridstack/gridstack.js/tree/master/doc
- */
-require('gridstack/dist/gridstack.min.css');
-require('gridstack/dist/gridstack-extra.min.css');
-import { GridStack } from 'gridstack';
-global.GridStack = GridStack;

assets/highlight.js

@@ -0,0 +1,5 @@
+require('highlight.js/styles/github-dark.css');
+
+const hljs = require('highlight.js/lib/common');
+
+global.hljs = hljs;

assets/invoice.js

@@ -1,2 +1,4 @@
-
+/**
+ * @deprecated use invoice-pdf instead
+ */
 require('./sass/_invoice.scss');

assets/js/KimaiLoader.js

@@ -43,6 +43,8 @@ import KimaiHotkeys from "./plugins/KimaiHotkeys";
 import KimaiRemoteModal from "./plugins/KimaiRemoteModal";
 import KimaiUser from "./plugins/KimaiUser";
 import KimaiAutocompleteTags from "./forms/KimaiAutocompleteTags";
+import KimaiMonthPicker from "./forms/KimaiMonthPicker";
+import KimaiSortable from "./plugins/KimaiSortable";
 
 export default class KimaiLoader {
 
@@ -76,6 +78,7 @@ export default class KimaiLoader {
         kimai.registerPlugin(new KimaiTeamForm());
         kimai.registerPlugin(new KimaiCopyDataForm());
         kimai.registerPlugin(new KimaiDateNowForm());
+        kimai.registerPlugin(new KimaiMonthPicker());
         kimai.registerPlugin(new KimaiForm());
         kimai.registerPlugin(new KimaiHotkeys());
 
@@ -90,6 +93,7 @@ export default class KimaiLoader {
         kimai.registerPlugin(new KimaiActiveRecords());
         kimai.registerPlugin(new KimaiAPILink('api-link'));
         kimai.registerPlugin(new KimaiMultiUpdateTable());
+        kimai.registerPlugin(new KimaiSortable());
         kimai.registerPlugin(new KimaiThemeInitializer());
 
         // notify all listeners that Kimai plugins can now be registered

assets/js/KimaiPlugin.js

@@ -154,7 +154,7 @@ export default class KimaiPlugin {
         const width = Math.max(
             document.documentElement.clientWidth,
             window.innerWidth || 0
-        )
+        );
 
         return width < 576;
     }

assets/js/forms/KimaiCopyDataForm.js

@@ -29,7 +29,7 @@ export default class KimaiCopyDataForm extends KimaiFormPlugin {
     /**
      * @param {HTMLFormElement} form
      */
-    activateForm(form) // eslint-disable-line no-unused-vars
+    activateForm(form)
     {
         if (this._eventHandler === undefined) {
             this._eventHandler = (event) => {
@@ -48,10 +48,10 @@ export default class KimaiCopyDataForm extends KimaiFormPlugin {
                 if (element.dataset.event !== undefined) {
                     for (const event of element.dataset.event.split(' ')) {
                         target.dispatchEvent(new Event(event));
-                    }
+                        const form = target.closest('form');
-                } else if (element.dataset.eventBubbles !== undefined) {
+                        if (form !== null) {
-                    for (const event of element.dataset.eventBubbles.split(' ')) {
+                            form.dispatchEvent(new Event(event));
-                        target.dispatchEvent(new Event(event, {bubbles: true}));
+                        }
                     }
                 }
                 event.preventDefault();
@@ -63,7 +63,7 @@ export default class KimaiCopyDataForm extends KimaiFormPlugin {
     /**
      * @param {HTMLFormElement} form
      */
-    destroyForm(form) // eslint-disable-line no-unused-vars
+    destroyForm(form)
     {
         form.removeEventListener('click', this._eventHandler);
     }

assets/js/forms/KimaiDateNowForm.js

@@ -43,7 +43,10 @@ export default class KimaiDateNowForm extends KimaiFormPlugin {
                         const formElement = document.getElementById(linkTarget.dataset.target);
                         if (!formElement.disabled) {
                             formElement.value = this.getDateUtils().format(linkTarget.dataset.format, null);
+                            // this should usually work
                             formElement.dispatchEvent(new Event('change', {bubbles: true}));
+                            // this is required for Litepicker to pick the new date (with autoRefresh option)
+                            formElement.dispatchEvent(new Event('keyup', {bubbles: true}));
                         }
 
                         event.preventDefault();

assets/js/forms/KimaiFormSelect.js

@@ -62,13 +62,10 @@ export default class KimaiFormSelect extends KimaiFormTomselectPlugin {
             plugins.push('remove_button');
         }
 
-        /*
+        if (node.dataset['order'] !== undefined && node.dataset['order'] === '1') {
-        const isOrdering = false;
+            //plugins.push('caret_position');
-        if (isOrdering) {
-            plugins.push('caret_position');
             plugins.push('drag_drop');
         }
-        */
 
         let options = {
             // see https://github.com/orchidjs/tom-select/issues/543#issuecomment-1664342257
@@ -83,8 +80,11 @@ export default class KimaiFormSelect extends KimaiFormTomselectPlugin {
             // 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
             // see App\Form\Type\TagsType::MAX_AMOUNT_SELECT
+            // TODO make this value configurable with a data attribute
             maxOptions: 500,
             sortField:[{field: '$order'}, {field: '$score'}],
+            // required so it works in table.responsive, but requires z-index 1056, because bootstrap modal would otherwise hide it
+            dropdownParent: 'body',
         };
 
         let render = {
@@ -236,8 +236,13 @@ export default class KimaiFormSelect extends KimaiFormTomselectPlugin {
             options.push(optGroup);
         }
 
+        // log the one with a group name first (e.g. non-global activities)
         options.forEach(child => node.appendChild(child));
-        emptyOpts.forEach(child => node.appendChild(child));
+
+        // append the ones with no parent at the end (e.g. global activities)
+        const optGroupEmpty = this._createOptgroup('');
+        emptyOpts.forEach(child => optGroupEmpty.appendChild(child));
+        node.appendChild(optGroupEmpty);
 
         // if available, re-select the previous selected option (mostly usable for global activities)
         node.value = selectedValue;
@@ -435,7 +440,7 @@ export default class KimaiFormSelect extends KimaiFormTomselectPlugin {
                     targetSelect.dataset['reloading'] = '0';
                     targetSelect.disabled = false;
                 });
-            }
+            };
 
             document.addEventListener('change', this._eventHandlerApiSelects);
         }
@@ -471,14 +476,14 @@ export default class KimaiFormSelect extends KimaiFormTomselectPlugin {
                             newValue = [...targetField.selectedOptions].map(o => o.value);
                         } else if (newValue !== '') {
                             if (targetField.type === 'date') {
-                                const timeId = targetField.id.replace('_date', '_time')
+                                const timeId = targetField.id.replace('_date', '_time');
                                 const timeElement = document.getElementById(timeId);
                                 const time = timeElement === null ? '12:00:00' : timeElement.value;
                                 // using 12:00 as fallback, because timezone handling might change the date if we use 00:00
                                 const newDate = this.getDateUtils().fromHtml5Input(newValue, time);
                                 newValue = this.getDateUtils().formatForAPI(newDate, false);
                             } else if (targetField.type === 'text' && targetField.name.includes('date')) {
-                                const timeId = targetField.id.replace('_date', '_time')
+                                const timeId = targetField.id.replace('_date', '_time');
                                 const timeElement = document.getElementById(timeId);
                                 // using 12:00 as fallback, because timezone handling might change the date if we use 00:00
                                 let time = '12:00:00';

assets/js/forms/KimaiFormTomselectPlugin.js

@@ -6,7 +6,7 @@
  */
 
 /*!
- * [KIMAI] KimaiFormPlugin: base class for all none ID plugin that handle forms
+ * [KIMAI] KimaiFormTomselectPlugin: base form plugin for everyone using tomselect
  */
 
 import KimaiFormPlugin from './KimaiFormPlugin';
@@ -28,12 +28,12 @@ export default class KimaiFormTomselectPlugin extends KimaiFormPlugin {
                     return null;
                 }
                 const tpl = this.translate('select.search.create');
-                const tplReplaced = tpl.replace('%input%', '<strong>' + name + '</strong>')
+                const tplReplaced = tpl.replace('%input%', '<strong>' + name + '</strong>');
                 return '<div class="create">' + tplReplaced + '</div>';
             },
             no_results: (data, escape) => {
                 const tpl = this.translate('select.search.notfound');
-                const tplReplaced = tpl.replace('%input%', '<strong>' + escape(data.input) + '</strong>')
+                const tplReplaced = tpl.replace('%input%', '<strong>' + escape(data.input) + '</strong>');
                 return '<div class="no-results">' + tplReplaced + '</div>';
             },
         };
@@ -44,7 +44,7 @@ export default class KimaiFormTomselectPlugin extends KimaiFormPlugin {
                     let item = '<div class="list-group-item border-0 p-1 ps-2 text-nowrap">';
                     // if no color is set, do NOT add an empty placeholder
                     if (data.color !== undefined) {
-                        item += '<span style="background-color:' + data.color + '" class="color-choice-item">&nbsp;</span>';
+                        item += '<span style="background-color:' + data.color + '" class="color-choice-item me-2">&nbsp;</span>';
                     }
                     item += escape(data.text) + '</div>';
                     return item;
@@ -53,7 +53,7 @@ export default class KimaiFormTomselectPlugin extends KimaiFormPlugin {
                     let item = '<div class="text-nowrap">';
                     // if no color is set, do NOT add an empty placeholder
                     if (data.color !== undefined) {
-                        item += '<span style="background-color:' + data.color + '" class="color-choice-item">&nbsp;</span>';
+                        item += '<span style="background-color:' + data.color + '" class="color-choice-item me-2">&nbsp;</span>';
                     }
                     item += escape(data.text) + '</div>';
                     return item;

assets/js/forms/KimaiMonthPicker.js

@@ -0,0 +1,44 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*!
+ * [KIMAI] KimaiDatePicker: single date selects (currently unused)
+ */
+
+import KimaiFormPlugin from "./KimaiFormPlugin";
+
+export default class KimaiMonthPicker extends KimaiFormPlugin {
+
+    /**
+     * @param {HTMLFormElement} form
+     * @return boolean
+     */
+    supportsForm(form) // eslint-disable-line no-unused-vars
+    {
+        return true;
+    }
+
+    /**
+     * @param {HTMLFormElement} form
+     */
+    activateForm(form)
+    {
+        const input = document.createElement('input');
+        input.setAttribute('type','month');
+
+        const notADateValue = 'not-a-month';
+        input.setAttribute('value', notADateValue);
+
+        if (input.value === notADateValue) {
+            const polyfills = form.querySelectorAll('a.input-month-polyfill');
+            polyfills.forEach(i => i.classList.toggle('d-none'));
+            const inputs = form.querySelectorAll('input[type="month"]');
+            inputs.forEach(i => i.classList.toggle('d-none'));
+        }
+    }
+
+}

assets/js/forms/KimaiTimesheetForm.js

@@ -40,17 +40,27 @@ export default class KimaiTimesheetForm extends KimaiFormPlugin {
 
         if (this._beginTime !== undefined) {
             this._beginTime.removeEventListener('change', this._beginListener);
+            delete this._beginListener;
+            this._beginTime.removeEventListener('blur', this._beginBlurListener);
+            delete this._beginBlurListener;
             delete this._beginTime;
         }
 
         if (this._endTime !== undefined) {
             this._endTime.removeEventListener('change', this._endListener);
+            delete this._endListener;
+            this._endTime.removeEventListener('blur', this._endBlurListener);
+            delete this._endBlurListener;
             delete this._endTime;
         }
 
         if (this._duration !== undefined) {
             this._duration.removeEventListener('change', this._durationListener);
             delete this._durationListener;
+            this._duration.removeEventListener('keydown', this._durationKeyListener);
+            delete this._durationKeyListener;
+            this._duration.removeEventListener('blur', this._durationBlurListener);
+            delete this._durationBlurListener;
             delete this._duration;
         }
 
@@ -108,13 +118,21 @@ export default class KimaiTimesheetForm extends KimaiFormPlugin {
         }
 
         this._beginListener = () => this._changedBegin();
+        this._beginBlurListener = () => this._parseBeginTime();
         this._endListener = () => this._changedEnd();
+        this._endBlurListener = () => this._parseEndTime();
         this._durationListener = () => this._changedDuration();
+        this._durationKeyListener = (event) => this._changeDurationOnKeypress(event);
+        this._durationBlurListener = () => this._parseDuration();
 
         this._beginDate.addEventListener('change', this._beginListener);
         this._beginTime.addEventListener('change', this._beginListener);
+        this._beginTime.addEventListener('blur', this._beginBlurListener);
         this._endTime.addEventListener('change', this._endListener);
+        this._endTime.addEventListener('blur', this._endBlurListener);
         this._duration.addEventListener('change', this._durationListener);
+        this._duration.addEventListener('keydown', this._durationKeyListener);
+        this._duration.addEventListener('blur', this._durationBlurListener);
 
         if (this._duration !== null && this._durationToggle !== null) {
             this._durationToggleListener = () => {
@@ -124,6 +142,159 @@ export default class KimaiTimesheetForm extends KimaiFormPlugin {
         }
     }
 
+    _parseBeginTime()
+    {
+        if (this._beginTime.value === '') {
+            return;
+        }
+
+        let newBeginTime = this._formatTimeForParsing(this._beginTime.value, this._beginTime.dataset['format']);
+        if (newBeginTime !== this._beginTime.value) {
+            this._beginTime.value = newBeginTime;
+            this._changedBegin();
+        }
+    }
+
+    _parseEndTime()
+    {
+        if (this._endTime.value === '') {
+            return;
+        }
+
+        let newEndTime = this._formatTimeForParsing(this._endTime.value, this._endTime.dataset['format']);
+        if (newEndTime !== this._endTime.value) {
+            this._endTime.value = newEndTime;
+            this._changedEnd();
+        }
+    }
+
+    _parseDuration()
+    {
+        if (this._duration.value === '') {
+            return;
+        }
+
+        this._setDurationAsString(this._getParsedDuration());
+    }
+
+    /**
+     * Receives a time, written by a human, probably in an invalid format.
+     * This method supports 12-hour or 24-hour format, the format string contains an uppercase "A" in case of the 12-hour format.
+     * If it is 12-hour format, then always en-US locallized with AM/PM.
+     *
+     * Ruleset:
+     * - Some locales use a dot instead of a colon, always replace the dot in HH.mm with a colon as in HH:mm
+     * - If there is an "am" or "pm", always uppercase them
+     * - Split the string into time and prefix: if AM/PM is included remove it and remember for later
+     * - If the time is a 1 or 2 character long number: use as hours
+     * - If the time now is 3 character long: use the 1 char as hour and the 2 and 3 char as minute
+     * - If the time now is 4 character long: use the 1 and 2 char as hour and the 3 and 4 char as minutes
+     * - If the format is 12-hour: try to identify the correct time and suffix
+     * - If the format is 12-hour and misses the AM/PM: try to detect whether it
+     * - If the time contains AM or PM, make sure that it is always prefixed by a space character
+     *
+     * @param {string} time
+     * @param {string} format
+     * @returns {string}
+     * @private
+     */
+    _formatTimeForParsing(time, format)
+    {
+        let formatted = time.trim();
+
+        // replace invalid separators with colon
+        formatted = formatted.replace(/\.|;|,/g, ':');
+        // uppercase 12-hour format
+        formatted = formatted.replace(/am/i, 'AM');
+        formatted = formatted.replace(/pm/i, 'PM');
+
+        // Split time and AM/PM suffix if present
+        let suffix = '';
+        let hour = 0;
+        let minute = 0;
+
+        let timePart = formatted;
+        const ampmMatch = formatted.match(/\s*(AM|PM)$/i);
+        if (ampmMatch) {
+            suffix = ampmMatch[1].toUpperCase();
+            timePart = formatted.replace(/\s*(AM|PM)$/i, '').trim();
+        }
+
+        if (timePart.indexOf(':') !== -1) {
+            const match = timePart.match(/(?:(\d+):)?(\d+)/);
+            hour = parseInt(match?.[1] || 0, 10);
+            minute = parseInt(match?.[2] || 0, 10);
+        } else {
+            timePart = timePart.replace(/:/, '');
+
+            if (/^\d{1,2}$/.test(timePart)) {
+                hour = timePart;
+            }
+
+            if (/^\d{3}$/.test(timePart)) {
+                hour = timePart.slice(0, 1);
+                minute = timePart.slice(1);
+            }
+
+            if (/^\d{4}$/.test(timePart)) {
+                hour = timePart.slice(0, 2);
+                minute = timePart.slice(2);
+            }
+        }
+
+        hour = parseInt(hour);
+        minute = parseInt(minute);
+
+        // just in case a person entered a wrong time like 35 hours
+        hour = hour % 24;
+        minute = minute % 60;
+
+        // format is 12-hour
+        if (format.toUpperCase().indexOf('A') !== -1) {
+            // time entered in 24-hour: convert to 12-hour format
+            if (hour > 12 && hour < 24) {
+                hour = hour - 12;
+                suffix = 'PM';
+            }
+
+            // if the person forgot to add a suffix, calculate it and convert time
+            if (suffix === '') {
+                if (hour === 0) {
+                    hour = 12;
+                    suffix = 'AM';
+                } else if (hour === 12) {
+                    suffix = 'PM';
+                } else {
+                    suffix = 'AM';
+                }
+            }
+
+            if (suffix === 'PM' && hour === 0) {
+                hour = 12;
+            }
+
+        } else {
+            // this is the 34-hour format branch
+
+            // check if the person entered time in 12-hour format and convert it
+            if (suffix === 'AM' && hour === 12) {
+                hour = 0;
+            } else if (suffix === 'PM' && hour !== 12) {
+                hour = (hour + 12) % 24;
+            }
+
+            // make sure we have no suffix
+            suffix = '';
+        }
+
+        formatted = hour + ':' + minute.toString().padStart(2, '0');
+        if (suffix !== '') {
+            formatted = formatted + ' ' + suffix.trim();
+        }
+
+        return formatted;
+    }
+
     _isDurationConnected()
     {
         if (this._duration === null && this._durationToggle === null) {
@@ -287,14 +458,14 @@ export default class KimaiTimesheetForm extends KimaiFormPlugin {
 
     /**
      * Ruleset:
-     * - invalid duration => skip
+     * - invalid or empty duration => skip
      * - if begin and end are empty: set begin to now and end to duration
      * - if begin is empty and end is not empty: set begin to end minus duration
      * - if begin is not empty and end is empty and duration is > 0 (running records = 0): set end to begin plus duration
      */
     _changedDuration()
     {
-        if (!this._isDurationConnected()) {
+        if (!this._isDurationConnected() || this._duration.value === '') {
             return;
         }
 
@@ -315,11 +486,11 @@ export default class KimaiTimesheetForm extends KimaiFormPlugin {
         if (begin === null && end === null) {
             const newBegin = DateTime.now();
             this._applyDateToField(newBegin, this._beginDate, this._beginTime);
-            this._applyDateToField(newBegin.plus({seconds: seconds}), null, this._endTime);
+            this._addSecondsToEndDate(newBegin, seconds);
         } else if (begin === null && end !== null) {
             this._applyDateToField(end.minus({seconds: seconds}), this._beginDate, this._beginTime);
         } else if (begin !== null && seconds >= 0) {
-            this._applyDateToField(begin.plus({seconds: seconds}), null, this._endTime);
+            this._addSecondsToEndDate(begin, seconds);
         }
     }
 
@@ -367,7 +538,23 @@ export default class KimaiTimesheetForm extends KimaiFormPlugin {
      */
     _getParsedDuration()
     {
-        return this.getDateUtils().parseDuration(this._duration.value.toUpperCase());
+        return this.getDateUtils().parseDuration(this._duration.value);
+    }
+
+    /**
+     * @param {DateTime} dateTime
+     * @param {int} seconds
+     * @private
+     */
+    _addSecondsToEndDate(dateTime, seconds)
+    {
+        // if the duration is longer than one day, the end field should be empty
+        // so kimai can calculate it after submitting the data from start + duration
+        if (seconds < 86400) {
+            this._applyDateToField(dateTime.plus({seconds: seconds}), null, this._endTime);
+        } else {
+            this._endTime.value = '';
+        }
     }
 
     /**
@@ -390,4 +577,122 @@ export default class KimaiTimesheetForm extends KimaiFormPlugin {
         timeField.value = this.getDateUtils().format(timeField.dataset['format'], dateTime);
     }
 
+    /**
+     * @param {KeyboardEvent} event
+     * @private
+     */
+    _changeDurationOnKeypress(event)
+    {
+        switch (event.key) {
+            case 'ArrowUp':
+            case 'ArrowDown':
+            case 'PageUp':
+            case 'PageDown':
+            case 'Home':
+            case 'End':
+                this._setDurationAsString(this._getParsedDuration());
+                break;
+            default:
+                return; // Ignore other keys
+        }
+
+        this._changeTimeOnKeypress(event, this._duration, 99999, this._durationListener);
+    }
+
+    /**
+     * This method helps the user to change a duration field with simple keyboard interaction:
+     * - Read the current duration from the given timeField input in format HH:MM (no seconds)
+     * - Change the duration based on the rules below
+     * - Write the new duration back to the field
+     * - If the field is empty or invalid it uses 00:00 as start-time
+     * - Duration cannot exceed maxtime (which is given in minutes)
+     * - Duration cannot drop below 00:00
+     * - Read the position of the cursor and decide whether to increase minutes or hours: if the cursor is in the hour section (before the colon) change hours, if the cursor is in the minute section (after the colon) change minutes
+     * - It reads the pressed key from the given KeyboardEvent and changes the duration accordingly to the rules below
+     *
+     * Rules to apply when a key is pressed:
+     * - ArrowUp key to increase the duration (either 5 minutes or 1 hour, depending on the cursor position)
+     * - ArrowDown key to decrease the duration (either 5 minutes or 1 hour, depending on the cursor position)
+     * - PageUp key to increase the duration by 1 hour
+     * - PageDown key to decrease the duration by 1 hour
+     * - Home key to set the duration to 08:00
+     * - End key to set the duration to 00:00
+     * - all other keys are ignored
+     *
+     * @param {KeyboardEvent} event
+     * @param {HTMLElement} timeField
+     * @param {int} maxTime
+     * @param {function} changeCallback
+     * @private
+     */
+    _changeTimeOnKeypress(event, timeField, maxTime, changeCallback)
+    {
+        // Parse current value or default to 00:00
+        let value = timeField.value || '00:00';
+        let [hours, minutes] = value.split(':').map(Number);
+        if (isNaN(hours)) { hours = 0; }
+        if (isNaN(minutes)) { minutes = 0; }
+
+        // Cursor position: before or after colon
+        const cursorPos = timeField.selectionStart || 0;
+        const colonPos = value.indexOf(':');
+        const inHour = cursorPos <= colonPos;
+
+        // Helper to clamp values
+        const clamp = (h, m) => {
+            let total = h * 60 + m;
+            if (total < 0) { total = 0; }
+            if (total > maxTime) { total = maxTime; }
+            h = Math.floor(total / 60);
+            m = total % 60;
+            return [h, m];
+        };
+
+        switch (event.key) {
+            case 'ArrowUp':
+                if (inHour) {
+                    [hours, minutes] = clamp(hours + 1, minutes);
+                } else {
+                    [hours, minutes] = clamp(hours, minutes + 5);
+                }
+                break;
+            case 'ArrowDown':
+                if (inHour) {
+                    [hours, minutes] = clamp(hours - 1, minutes);
+                } else {
+                    [hours, minutes] = clamp(hours, minutes - 5);
+                }
+                break;
+            case 'PageUp':
+                [hours, minutes] = clamp(hours + 1, minutes);
+                event.preventDefault();
+                break;
+            case 'PageDown':
+                [hours, minutes] = clamp(hours - 1, minutes);
+                event.preventDefault();
+                break;
+            case 'Home':
+                // TODO this should use the configured working time for today
+                hours = 8;
+                minutes = 0;
+                event.preventDefault();
+                break;
+            case 'End':
+                hours = 0;
+                minutes = 0;
+                event.preventDefault();
+                break;
+            default:
+                return; // Ignore other keys
+        }
+
+        // Format and set value
+        timeField.value = `${hours}:${minutes.toString().padStart(2, '0')}`;
+        // trigger update of linked fields
+        changeCallback(timeField);
+        // Move cursor to original position if possible
+        setTimeout(() => {
+            timeField.setSelectionRange(cursorPos, cursorPos);
+        }, 0);
+    }
 }

assets/js/plugins/KimaiAjaxModalForm.js

@@ -69,7 +69,7 @@ export default class KimaiAjaxModalForm extends KimaiReducedClickHandler {
 
     _getModal()
     {
-        return Modal.getOrCreateInstance(this._getModalElement())
+        return Modal.getOrCreateInstance(this._getModalElement());
     }
 
     /**

assets/js/plugins/KimaiAlert.js

@@ -208,7 +208,7 @@ export default class KimaiAlert extends KimaiPlugin {
         const toast = new Toast(element);
         element.addEventListener('hidden.bs.toast', function () {
             container.removeChild(element);
-        })
+        });
         toast.show();
     }
 

assets/js/plugins/KimaiDateUtils.js

@@ -273,7 +273,10 @@ export default class KimaiDateUtils extends KimaiPlugin {
         let luxonDuration = null;
 
         if (duration.indexOf(':') !== -1) {
-            const [, hours, minutes, seconds] = duration.match(/(\d+):(\d+)(?::(\d+))*/);
+            const match = duration.match(/(?:(\d+):)?(\d+)(?::(\d+))?/);
+            const hours = parseInt(match?.[1] || 0, 10);
+            const minutes = parseInt(match?.[2] || 0, 10);
+            const seconds = parseInt(match?.[3] || 0, 10);
             luxonDuration = Duration.fromObject({hours: hours, minutes: minutes, seconds: seconds});
         } else if (duration.indexOf('.') !== -1 || duration.indexOf(',') !== -1) {
             duration = duration.replace(/,/, '.');

assets/js/plugins/KimaiHotkeys.js

@@ -36,7 +36,7 @@ export default class KimaiHotkeys extends KimaiPlugin {
                     elements[0].click();
                 }
             }
-        })
+        });
     }
 
     // adopted from Bootstrap 5.1.1, MIT

assets/js/plugins/KimaiMultiUpdateTable.js

@@ -13,9 +13,14 @@ import KimaiPlugin from '../KimaiPlugin';
 
 export default class KimaiMultiUpdateTable extends KimaiPlugin {
 
+    getId()
+    {
+        return 'datatable-batch-action';
+    }
+
     init()
     {
-        if (document.getElementById('multi_update_all') === null) {
+        if (document.getElementsByClassName('multi_update_all').length === 0) {
             return;
         }
 
@@ -23,34 +28,28 @@ export default class KimaiMultiUpdateTable extends KimaiPlugin {
         // via KimaiDatable and everything inside will be removed, including event listeners
         const element = document.querySelector('div.page-body');
         element.addEventListener('change', (event) => {
-            if (event.target.matches('#multi_update_all')) {
+            if (event.target.matches('.multi_update_all')) {
-                // the "check all" checkbox in the upper start corner of the table
+                this.toggle(event.target.checked, event.target.closest('table'));
-                const checked = event.target.checked;
-                for (const element of document.querySelectorAll('.multi_update_single')) {
-                    element.checked = checked;
-                }
-                this._toggleForm();
                 event.stopPropagation();
             } else if (event.target.matches('.multi_update_single')) {
                 // single checkboxes in front of each row
-                this._toggleForm();
+                this._toggleDatatable(event.target.closest('table'));
                 event.stopPropagation();
             }
         });
 
         element.addEventListener('click', (event) => {
             if (event.target.matches('.multi_update_table_action')) {
-                const selectedItem = event.target;
+                const selectedButton = event.target;
-                const ids = this._getSelectedIds();
+                const form = selectedButton.form;
-                const form = document.getElementById('multi_update_form');
+                const ids = form.querySelector('.multi_update_ids').value.split(',');
-                const question = form.dataset['question'].replace(/%action%/, selectedItem.textContent).replace(/%count%/, ids.length.toString());
+                const question = form.dataset['question'].replace(/%action%/, selectedButton.textContent).replace(/%count%/, ids.length.toString());
 
                 /** @type {KimaiAlert} ALERT */
                 const ALERT = this.getPlugin('alert');
                 ALERT.question(question, function(value) {
                     if (value) {
-                        const form = document.getElementById('multi_update_form');
+                        form.action = selectedButton.dataset['href'];
-                        form.action = selectedItem.dataset['href'];
                         form.submit();
                     }
                 });
@@ -58,29 +57,72 @@ export default class KimaiMultiUpdateTable extends KimaiPlugin {
         });
     }
 
-    _getSelectedIds()
+    /**
+     * @param {boolean} checked
+     * @param {HTMLTableElement} table
+     */
+    toggle(checked, table)
     {
+        for (const element of table.querySelectorAll('.multi_update_single')) {
+            element.checked = checked;
+        }
+        this._toggleDatatable(table);
+    }
+
+    /**
+     * @param {boolean} checked
+     */
+    toggleAll(checked)
+    {
+        for (const element of document.querySelectorAll('.multi_update_all')) {
+            this._toggleAll(checked, element);
+        }
+    }
+
+    /**
+     * @param {boolean} checked
+     * @param {string} name
+     */
+    toggleByName(checked, name)
+    {
+        for (const element of document.querySelectorAll('#multi_update_all_' + name)) {
+            this._toggleAll(checked, element);
+        }
+    }
+
+    /**
+     * @param {boolean} checked
+     * @param {Element} name
+     */
+    _toggleAll(checked, element)
+    {
+        element.checked = checked;
+        this.toggle(checked, element.closest('table'));
+    }
+
+    /**
+     * @param {HTMLTableElement} table
+     * @private
+     */
+    _toggleDatatable(table)
+    {
+        const card = table.closest('div.card.data_table');
+
         let ids = [];
-        for (const box of document.querySelectorAll('input.multi_update_single:checked')) {
+        for (const box of table.querySelectorAll('input.multi_update_single:checked')) {
             ids.push(box.value);
         }
 
-        return ids;
+        card.querySelector('.multi_update_ids').value = ids.join(',');
-    }
-    
-    _toggleForm()
-    {
-        const ids = this._getSelectedIds();
-        document.getElementById('multi_update_table_entities').value = ids.join(',');
 
         if (ids.length > 0) {
-            for (const element of document.getElementsByClassName('multi_update_form_hide')) {
+            for (const element of card.querySelectorAll('.multi_update_form_hide')) {
                 element.style.setProperty('display', 'none', 'important');
             }
-            document.getElementById('multi_update_form').style.display = null;//'block';
+            card.querySelector('form.multi_update_form').style.display = null;//'block';
         } else {
-            document.getElementById('multi_update_form').style.setProperty('display', 'none', 'important');
+            card.querySelector('form.multi_update_form').style.setProperty('display', 'none', 'important');
-            for (const element of document.getElementsByClassName('multi_update_form_hide')) {
+            for (const element of card.querySelectorAll('.multi_update_form_hide')) {
                 element.style.display = null;
             }
         }

assets/js/plugins/KimaiNotification.js

@@ -43,7 +43,7 @@ export default class KimaiNotification extends KimaiPlugin {
                     callback(false);
                 }
             });
-        } catch (e) {
+        } catch (e) { // eslint-disable-line no-unused-vars
             Notification.requestPermission((permission) => {
                 if (permission === "granted") {
                     callback(true);

assets/js/plugins/KimaiRemoteModal.js

@@ -6,12 +6,17 @@
  */
 
 /*!
- * [KIMAI] KimaiRecentActivities: responsible to reload the users recent activities
+ * [KIMAI] KimaiRemoteModal: load remote content (without forms) into a modal
  */
 
 import KimaiPlugin from '../KimaiPlugin';
 import { Modal } from 'bootstrap';
 
+/**
+ * Use like this:
+ * <a href="{{ path('your-route') }}" class="remote-modal-load" data-modal-id="remote_modal" data-modal-class="p-0" data-modal-title="Some title" title="Some title">Modal</a>
+ * <a href="{{ path('your-route') }}" class="remote-modal-load" data-modal-title="Some title" title="Some title">Modal</a>
+ */
 export default class KimaiRemoteModal extends KimaiPlugin {
 
     constructor()
@@ -34,43 +39,11 @@ export default class KimaiRemoteModal extends KimaiPlugin {
             this._showModal(event.currentTarget);
             event.stopPropagation();
             event.preventDefault();
-        }
+        };
 
         for (let link of document.querySelectorAll(this._selector)) {
             link.addEventListener('click', this.handle);
         }
-
-        document.addEventListener('kimai.closeRemoteModal', () => { this._hide(); });
-    }
-
-    /**
-     * @param {HTMLElement} element
-     * @private
-     */
-    _initElement(element)
-    {
-        for (let link of element.querySelectorAll('a.remote-modal-reload')) {
-            link.addEventListener('click', this.handle);
-        }
-    }
-
-    _hide()
-    {
-        this._getModal().hide();
-    }
-
-    _getModalElement()
-    {
-        return document.getElementById('remote_modal');
-    }
-
-    /**
-     * @returns {Modal}
-     * @private
-     */
-    _getModal()
-    {
-        return Modal.getOrCreateInstance(this._getModalElement());
     }
 
     /**
@@ -85,21 +58,33 @@ export default class KimaiRemoteModal extends KimaiPlugin {
                     return;
                 }
 
+                let modalSelector = 'remote_modal';
+                if (element.dataset['modalId'] !== undefined) {
+                    modalSelector = element.dataset['modalId'];
+                }
+                const modalElement = document.getElementById(modalSelector);
+                if (modalElement === null) {
+                    console.log('Could not find modal with ID: ' + modalSelector);
+                }
+
                 return response.text().then(html => {
-                    const newFormHtml = document.createElement('div');
+                    const modalBody = document.createElement('div');
-                    newFormHtml.classList.add('modal-body');
+                    modalBody.classList.add('modal-body');
-                    newFormHtml.classList.add('p-0');
+                    if (element.dataset['modalClass'] !== undefined) {
-                    newFormHtml.innerHTML = html;
+                        modalBody.classList.add(element.dataset['modalClass']);
+                    }
+                    modalBody.innerHTML = html;
 
-                    this._initElement(newFormHtml);
+                    for (let link of modalBody.querySelectorAll('a.remote-modal-reload')) {
-
+                        link.addEventListener('click', this.handle);
-                    const modal = this._getModalElement();
-                    modal.querySelector('.modal-body').replaceWith(newFormHtml);
-                    if (element.dataset['modalTitle'] !== undefined) {
-                        modal.querySelector('.modal-title').textContent = element.dataset['modalTitle'];
                     }
 
-                    this._getModal().show();
+                    modalElement.querySelector('.modal-body').replaceWith(modalBody);
+                    if (element.dataset['modalTitle'] !== undefined) {
+                        modalElement.querySelector('.modal-title').textContent = element.dataset['modalTitle'];
+                    }
+
+                    Modal.getOrCreateInstance(modalElement).show();
                 });
             })
             .catch((reason) =>  {

assets/js/plugins/KimaiSortable.js

@@ -0,0 +1,51 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+
+/*!
+ * [KIMAI] KimaiSortable: allow sorting of HTML elements
+ */
+
+import KimaiPlugin from "../KimaiPlugin";
+import Sortable from 'sortablejs';
+
+export default class KimaiSortable extends KimaiPlugin {
+
+    getId() {
+        return 'sortable';
+    }
+
+    /**
+     * Enable sorting on the given selector
+     *
+     * @param {HTMLElement} element
+     * @returns {true}
+     */
+    toggle(element) {
+        if (!element instanceof HTMLElement) {
+            console.error('Given element is invalid');
+            return false;
+        }
+
+        let sortable = Sortable.get(element);
+        if (sortable === undefined || sortable === null) {
+            Sortable.create(element);
+            return true;
+        }
+
+        sortable.destroy();
+        return false;
+    }
+
+    toArray(element) {
+        let sortable = Sortable.get(element);
+        if (sortable === undefined || sortable === null) {
+            return null;
+        }
+        return sortable.toArray();
+    }
+}

assets/js/plugins/KimaiThemeInitializer.js

@@ -48,7 +48,7 @@ export default class KimaiThemeInitializer extends KimaiPlugin {
             }
 
             const temp = document.createElement('div');
-            temp.innerHTML = '<div class="overlay"><div class="fas fa-sync fa-spin"></div></div>';
+            temp.innerHTML = '<div class="overlay"><div class="progress progress-sm"><div class="progress-bar progress-bar-indeterminate"></div></div></div>';
             this.overlay = temp.firstElementChild;
             document.querySelector(container).append(this.overlay);
         });

assets/js/plugins/KimaiUser.js

@@ -49,4 +49,11 @@ export default class KimaiUser extends KimaiPlugin {
         return this.user.superAdmin;
     }
 
+    /**
+     * @returns {array}
+     */
+    getRoles() {
+        return this.user.roles;
+    }
+
 }

assets/js/widgets/KimaiCalendar.js

@@ -14,7 +14,7 @@ import dayGridPlugin from '@fullcalendar/daygrid';
 import timeGridPlugin from '@fullcalendar/timegrid';
 import bootstrap5Plugin, { BootstrapTheme } from '@fullcalendar/bootstrap5';
 import googlePlugin from '@fullcalendar/google-calendar';
-import iCalendarPlugin from '@fullcalendar/icalendar'
+import iCalendarPlugin from '@fullcalendar/icalendar';
 import interactionPlugin, { Draggable } from '@fullcalendar/interaction';
 import arLocale from '@fullcalendar/core/locales/ar';
 import csLocale from '@fullcalendar/core/locales/cs';
@@ -49,6 +49,7 @@ import enGbLocale from '@fullcalendar/core/locales/en-gb';
 import enUsLocale from '@fullcalendar/core/locales/en-gb';
 import KimaiColor from './KimaiColor';
 import KimaiContextMenu from "./KimaiContextMenu";
+import { DateTime } from 'luxon';
 
 export default class KimaiCalendar {
 
@@ -72,21 +73,6 @@ export default class KimaiCalendar {
         /** @type {KimaiAlert} ALERT */
         const ALERT = this.kimai.getPlugin('alert');
 
-        let initialView = 'dayGridMonth';
-        switch (options['initialView']) {
-            case 'month':
-                initialView = 'dayGridMonth';
-                break;
-            case 'agendaWeek':
-            case 'week':
-                initialView = 'timeGridWeek';
-                break;
-            case 'agendaDay':
-            case 'day':
-                initialView = 'timeGridDay';
-                break;
-        }
-
         // Instead of using "buttonIcons" the theme needs to be adjusted directly
         // https://fullcalendar.io/docs/buttonIcons
         BootstrapTheme.prototype.classes = {
@@ -109,18 +95,18 @@ export default class KimaiCalendar {
             nextYear: this.options['icons']['nextYear'],
         };
         BootstrapTheme.prototype.rtlIconClasses = {
-            prev: this.options['icons']['next'],
+            prev: this.options['icons']['previous'],
-            next: this.options['icons']['previous'],
+            next: this.options['icons']['next'],
-            prevYear: this.options['icons']['nextYear'],
+            prevYear: this.options['icons']['previousYear'],
-            nextYear: this.options['icons']['previousYear'],
+            nextYear: this.options['icons']['nextYear'],
         };
-
         let calendarOptions = {
             locales: [ enGbLocale, enUsLocale, arLocale, csLocale, daLocale, deLocale, deAtLocale, elLocale,
                 esLocale, euLocale, faLocale, fiLocale, frLocale, heLocale, hrLocale, huLocale, itLocale, jaLocale, koLocale,
                 nbLocale, nlLocale, plLocale, ptLocale, ptBrLocale, roLocale, ruLocale, skLocale, svLocale, trLocale, zhLocale, viLocale ],
             plugins: [ bootstrap5Plugin, dayGridPlugin, timeGridPlugin, googlePlugin, iCalendarPlugin, interactionPlugin ],
-            initialView: initialView,
+            initialView: this.toInternalViewName(this.options['initialView']),
+            initialDate: this.options['initialDate'],
             // https://fullcalendar.io/docs/theming
             themeSystem: 'bootstrap5',
             // https://fullcalendar.io/docs/headerToolbar
@@ -155,8 +141,9 @@ export default class KimaiCalendar {
             slotMinTime: this.options['timeframeBegin'] + ':00',
             slotMaxTime: this.options['timeframeEnd'] === '23:59' ? '24:00:00' : (this.options['timeframeEnd'] + ':59'),
 
-            // auto calculation seems to do the better job, therefor deactivated
+            // deactivate for auto calculation, which does a good job.
-            //slotLabelInterval: this.options['slotDuration'],
+            // but 1h seems to be a "normal distance" for calendar apps (like Google and Apple)
+            slotLabelInterval: '1:00',
 
             // how long should entries look like when they don't have an end
             defaultTimedEventDuration: this.options['slotDuration'],
@@ -172,14 +159,20 @@ export default class KimaiCalendar {
             // once we can configure working days
             // hiddenDays: [ 2, 4 ]
 
-            // when we support holidays and other full day events
-            // allDaySlot: false,
             // dropAccept
 
             dayMaxEventRows: true,
             eventMaxStack: this.options['dayLimit'],
             dayMaxEvents: this.options['dayLimit'],
 
+            // the callbacks "viewDidMount" and "viewWillUnmount" are only called when switching between month and others, not between week and day
+            datesSet: (dateInfo) => {
+                document.dispatchEvent(new CustomEvent('kimai.calendar.changeDate', {detail: {
+                    view: this.toExternalViewName(dateInfo.view.type),
+                    date: dateInfo.start.toISOString().split('T')[0],
+                }}));
+            },
+
             views: {
                 dayGrid: {
                     dayMaxEventRows: this.options['dayLimit']
@@ -265,8 +258,14 @@ export default class KimaiCalendar {
                             contextMenu.createFromApi(jsEvent, result);
                         }, (e) => { console.log('Failed to load actions for context menu', e); });
                     }
-                })
+                });
             },
+
+            // called after all events of one source were set, so this can
+            // and will be called multiple times before the calendar is initialized
+            eventsSet: (events) => {
+                this._renderDayAndWeekSum(this.getCalendar().getCurrentData().viewSpec.type, events);
+            }
         };
 
         // ============= DRAG & DROP =============
@@ -410,13 +409,13 @@ export default class KimaiCalendar {
                         this.hidePopover(info.el);
                     },
                     eventDrop: (eventDropInfo) => {
-                        this.changeHandler(eventDropInfo)
+                        this.changeHandler(eventDropInfo);
                     },
                     eventResizeStart: (info) => {
                         this.hidePopover(info.el);
                     },
                     eventResize: (eventResizeInfo) => {
-                        this.changeHandler(eventResizeInfo)
+                        this.changeHandler(eventResizeInfo);
                     },
                 }};
             }
@@ -529,6 +528,44 @@ export default class KimaiCalendar {
         return (event.source.id.indexOf('kimai-') === 0);
     }
 
+    /**
+     * @param {string} viewName
+     * @returns {string}
+     */
+    toExternalViewName(viewName) {
+        switch(viewName) {
+            case 'timeGridDay':
+                return 'day';
+            case 'timeGridWeek':
+                return 'week';
+            case 'dayGridMonth':
+            default:
+                return 'month';
+        }
+    }
+
+    /**
+     * @param {string} viewName
+     * @returns {string}
+     */
+    toInternalViewName(viewName) {
+        switch(viewName) {
+            case 'day':
+            case 'agendaDay':
+            case 'timeGridDay':
+                return 'timeGridDay';
+            case 'week':
+            case 'agendaWeek':
+            case 'timeGridWeek':
+                return 'timeGridWeek';
+            case 'month':
+            case 'agendaMonth':
+            case 'dayGridMonth':
+            default:
+                return 'dayGridMonth';
+        }
+    }
+
     /**
      * @param {string} name
      * @return {boolean}
@@ -569,7 +606,7 @@ export default class KimaiCalendar {
                 color = apiItem.project.customer.color;
             }
         }
-        if (color == null) {
+        if (color === null) {
             color = defaultColor;
         }
 
@@ -688,4 +725,73 @@ export default class KimaiCalendar {
         });
     }
 
+    /**
+     * @param {string} view
+     * @param {EventApi[]} events
+     * @private
+     */
+    _renderDayAndWeekSum(view, events) {
+        if (view === 'dayGridMonth') {
+            // currently we do not display totals in month view
+            return;
+        }
+
+        /** @type {KimaiDateUtils} DATES */
+        const DATES = this.kimai.getPlugin('date');
+
+        const durations = {};
+
+        if (view === 'timeGridWeek') {
+            // make sure we have an entry for every day of the week, even days without timesheets
+            document.querySelectorAll(`th.fc-col-header-cell[data-date]`).forEach(cell => {
+                durations[cell.dataset.date] = 0;
+            });
+        }
+
+        events.forEach(item => {
+            const start = DateTime.fromJSDate(item.start).toUTC();
+            const dateStr = start.toFormat('yyyy-MM-dd');
+
+            if (!durations[dateStr]) {
+                durations[dateStr] = 0;
+            }
+
+            // absences or public holidays are all day
+            if (item.end !== null) {
+                const end = DateTime.fromJSDate(item.end).toUTC();
+                const duration = end.diff(start, 'hours').as('seconds');
+                durations[dateStr] += duration;
+            }
+        });
+
+        const dailyTotals = document.querySelectorAll('.fc-dailytotal');
+        dailyTotals.forEach(element => element.remove());
+        for (const dateValue in durations) {
+            const durationValue = durations[dateValue];
+
+            if (view === 'timeGridWeek') { // this is the week view
+                const headerCells = document.querySelectorAll(`th.fc-col-header-cell[data-date="${dateValue}"]`);
+
+                headerCells.forEach(cell => {
+                    const newElement = document.createElement('div');
+                    newElement.classList.add('fc-dailytotal');
+                    newElement.textContent = DATES.formatSeconds(durationValue);
+                    cell.appendChild(newElement);
+                });
+            }
+        }
+
+        // this is the day view
+        if (view === 'timeGridDay') {
+            const dayEl = document.querySelector('th.fc-day');
+            const dayDate = dayEl.dataset.date;
+            const dayTotal = document.querySelectorAll('.fc-dailytotal');
+            dayTotal.forEach(element => element.remove());
+
+            const newElement = document.createElement('div');
+            newElement.classList.add('fc-dailytotal');
+            newElement.textContent = DATES.formatSeconds(durations[dayDate]);
+            dayEl.appendChild(newElement);
+        }
+    }
 }

assets/js/widgets/KimaiContextMenu.js

@@ -89,7 +89,7 @@ export default class KimaiContextMenu {
             }
             dropdownElement.removeEventListener('click', dropdownListener);
             document.removeEventListener('click', dropdownListener);
-        }
+        };
 
         dropdownElement.addEventListener('click', dropdownListener);
         document.addEventListener('click', dropdownListener);

assets/js/widgets/KimaiPaginatedBoxWidget.js

@@ -16,7 +16,6 @@ export default class KimaiPaginatedBoxWidget {
     constructor(boxId) {
         this.selector = boxId;
         const widget = document.querySelector(this.selector);
-        this.href = widget.dataset['href'];
 
         if (widget.dataset['reload'] !== undefined) {
             this.events = widget.dataset['reload'].split(' ');
@@ -61,7 +60,7 @@ export default class KimaiPaginatedBoxWidget {
         // and this event will hide it afterwards
         const hideOverlay = () => {
             document.dispatchEvent(new Event('kimai.reloadedContent'));
-        }
+        };
 
         window.kimai.getPlugin('fetch').fetch(url)
             .then(response => {
@@ -93,7 +92,7 @@ export default class KimaiPaginatedBoxWidget {
         if (node.tagName !== undefined && node.tagName === 'SCRIPT') {
             const script  = document.createElement('script');
             script.text = node.innerHTML;
-            node.parentNode.replaceChild(script, node );
+            node.parentNode.replaceChild(script, node);
         } else {
             for (const child of node.childNodes) {
                 this._makeScriptExecutable(child);

assets/sass/_app-rtl.scss

@@ -5,13 +5,20 @@
  * file that was distributed with this source code.
  */
 
-$modal-backdrop-opacity: 0.6 !default;
+$modal-backdrop-opacity: 0.7 !default;
+
+@import "~@tabler/core/scss/config";
 
 /*
     THIS DOES NOT WORK AS EXPECTED, AS TABLER IS NOT REGENERATED HERE.
     SO WE CANNOT CHANGE VARIABLES, LIKE THE ABOVE...
 */
 @import '~@tabler/core/dist/css/tabler.rtl.css';
+@import '~@tabler/core/dist/css/tabler-themes.rtl.css';
+
+@import '~tom-select/dist/scss/tom-select';
+@import '~tom-select/dist/scss/tom-select.bootstrap5';
+
 @import '~@tabler/core/dist/css/tabler-vendors.rtl.css';
 
 /**
@@ -23,21 +30,6 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts/";
 @import '~@fortawesome/fontawesome-free/scss/solid';
 @import '~@fortawesome/fontawesome-free/scss/brands';
 
-/**
- * We need that, to compile the rest of the file
- */
-@import "bootstrap/scss/functions";
-
-@import "@tabler/core/src/scss/variables";
-@import "@tabler/core/src/scss/variables-dark";
-@import "@tabler/core/src/scss/mixins";
-
-@import "bootstrap/scss/variables";
-@import "bootstrap/scss/variables-dark";
-@import "bootstrap/scss/maps";
-@import "bootstrap/scss/mixins";
-@import "bootstrap/scss/utilities";
-
 /**
  * Kimai related stuff
  */

assets/sass/_app.scss

@@ -5,11 +5,14 @@
  * file that was distributed with this source code.
  */
 
-$modal-backdrop-opacity: 0.6 !default;
+$modal-backdrop-opacity: 0.7 !default;
 
-@import '~@tabler/core/src/scss/tabler';
+@import '~@tabler/core/scss/tabler';
-@import '~@tabler/core/src/scss/vendor/litepicker';
+@import '~@tabler/core/scss/tabler-themes';
-@import '~@tabler/core/src/scss/vendor/tom-select';
+@import '~@tabler/core/scss/vendor/litepicker';
+
+@import '~tom-select/dist/scss/tom-select.bootstrap5';
+@import '~@tabler/core/scss/vendor/tom-select';
 
 /**
  * Everyone needs icons

assets/sass/_invoice-pdf.scss

@@ -5,111 +5,30 @@
  * file that was distributed with this source code.
  */
 
-body {
+body { font-family: sans-serif; font-size: 10pt; margin: 4px; padding: 0; }
-    font-family: sans-serif;
+table, tr, td, th, p, h1, h2, h3, h4, h5 { padding: 0; margin: 0;}
-    font-size: 10pt;
+th { border: none; text-align: left; }
-    margin: 4px;
+td { vertical-align: top; }
-    padding: 0;
+p { margin-bottom: 12px; }
-}
+.text-small { font-size: 7pt; }
-table, tr, td, th, p, h1, h2, h3, h4, h5 {
+.padding-left { padding-left: 15px; }
-    padding: 0;
+.text-center { text-align: center; }
-    margin: 0;
+.text-left, .text-begin { text-align: left; }
-}
+.text-right, .text-end { text-align: right; }
-th {
+.text-nowrap { white-space: nowrap; }
-    border: none;
+.date { font-size: 80%; text-align: right; padding-top: 6px; }
-    text-align: left;
+table { width: 100%; border-spacing: 0; }
-}
+table.addresses, p { line-height: 14pt; }
-td {
+table.addresses { margin-bottom: 30px; }
-    vertical-align: top;
+table.header { padding-bottom: 4px; border-bottom: 1px solid #999; }
-}
+table.header .title { font-weight: normal; font-size: 140%; }
-p {
+table.footer { border-top: 1px solid #999; font-size: 80%; padding-top: 8px; line-height: 14px; }
-    margin-bottom: 12px;
+table.footer td { vertical-align: top; }
-}
+table.items { border-collapse: collapse; margin-top: 50px; margin-bottom: 60px; }
-.text-small {
+table.items thead th, table.items tbody td { border-bottom: 1px solid #ccc; }
-    font-size: 7pt;
+table.items thead th.first, table.items tbody td.first { padding-left: 0; }
-}
+table.items thead th.last, table.items tbody td.last, table.items tfoot td.last { padding-right: 0; }
-.padding-left {
+table.items td, table.items th { padding: 8px 6px; }
-    padding-left: 15px;
+table.items tfoot td, table.items tfoot th { padding: 20px 0 0 0; line-height: 1px; }
-}
+table.items tfoot td.last { padding-left: 10px; }
-.text-center {
+table.items tr.odd { background-color: #f5f5f5; }
-    text-align: center;
-}
-.text-left, .text-begin {
-    text-align: left;
-}
-.text-right, .text-end {
-    text-align: right;
-}
-.text-nowrap {
-    white-space: nowrap;
-}
-.date {
-    font-size: 80%;
-    text-align: right;
-    padding-top: 6px;
-}
-table {
-    width: 100%;
-    border-spacing: 0;
-}
-table.addresses, p {
-    line-height: 14pt;
-}
-/* The address table */
-table.addresses {
-    margin-bottom: 30px;
-}
-/* The PDF header */
-table.header {
-    padding-bottom: 4px;
-    border-bottom: 1px solid #999;
-}
-table.header .title {
-    font-weight: normal;
-    font-size: 140%;
-}
-/* The PDF footer */
-table.footer {
-    border-top: 1px solid #999;
-    font-size: 80%;
-    padding-top: 8px;
-    line-height: 14px;
-}
-table.footer td {
-    vertical-align: top;
-}
-/* The invoice items list */
-table.items {
-    border-collapse: collapse;
-    margin-top: 50px;
-    margin-bottom: 60px;
-}
-table.items thead th,
-table.items tbody td {
-    border-bottom: 1px solid #ccc;
-}
-table.items thead th.first,
-table.items tbody td.first {
-    padding-left: 0;
-}
-table.items thead th.last,
-table.items tbody td.last,
-table.items tfoot td.last {
-    padding-right: 0;
-}
-
-table.items td,
-table.items th {
-    padding: 8px 6px;
-}
-table.items tfoot td,
-table.items tfoot th {
-    padding: 20px 0 0 0;
-    line-height: 1px;
-}
-table.items tfoot td.last {
-    padding-left: 10px;
-}
-table.items tr.odd {
-    background-color: #f5f5f5;
-}

assets/sass/_kimai.scss

@@ -11,8 +11,9 @@
 @import "modal";
 @import "progressbar";
 @import "avatar";
-@import "theme-dark";
+@import "weekly-hours";
-@import "pages";
 @import "tabler-fixes";
 @import "help";
+@import "chart";
 @import "rtl";
+@import "dashboard";

assets/sass/chart.scss

@@ -0,0 +1,7 @@
+div.chart-container {
+    position: relative;
+    canvas.chartjs {
+        width: 100%;
+        height: 300px;
+    }
+}

assets/sass/content.scss

@@ -52,6 +52,13 @@ table.dataTable thead > tr > th.hw-min {
     width: 1%;
     white-space: normal;
 }
+@include media-breakpoint-up(sm) {
+    th.w-sm-min,
+    td.w-sm-min {
+        width: 1%;
+        white-space: nowrap;
+    }
+}
 /* If a table column contains ONLY avatar <img> it will collapse, so make it a defined width */
 .w-avatar {
     width: 40px;
@@ -86,3 +93,19 @@ table.dataTable thead > tr > th.hw-min {
         width: 30%;
     }
 }
+
+.markdown {
+    blockquote {
+        p {
+            /* Parsedown wraps content in a <p> like <blockquote><p> */
+            margin: 0;
+        }
+        /* Tabler doesn't style blockquotes */
+        border-left: 15px var(--tblr-border-style) var(--tblr-border-color);
+        background-color: var(--tblr-bg-surface-secondary);
+    }
+    pre code.hljs {
+        padding: 0;
+        background-color: var(--tblr-bg-surface-dark);
+    }
+}

assets/sass/dashboard.scss

@@ -0,0 +1,3 @@
+section.dashboard {
+    .widget { max-height: 600px; }
+}

assets/sass/forms.scss

@@ -26,6 +26,9 @@
                 margin-bottom: 0;
             }
         }
+        .input-group {
+            width: unset;
+        }
     }
 }
 
@@ -33,7 +36,6 @@
     width: 20px;
     height: 20px;
     display: inline-block;
-    margin-right: 10px;
     border-radius: var(--tblr-border-radius);
 }
 
@@ -54,3 +56,18 @@ fieldset > .mb-3.row:last-child {
 .form-fieldset-light:last-child {
     border:none;
 }
+
+.dropdown-item {
+    .dropdown-action {
+        visibility: hidden;
+        opacity: 0.5;
+    }
+    &:hover {
+        .dropdown-action {
+            visibility: visible;
+            &:hover {
+                opacity: 1.0;
+            }
+        }
+    }
+}

assets/sass/layout.scss

@@ -1,9 +1,5 @@
 .inline-search {
     max-width: 200px;
-    /* the entire inline-search should actually use .input-group-flat, but that causes some weird css problems inside the dropdown menu */
-    #searchTerm {
-        border-right: 0;
-    }
 }
 
 @media (min-width: 360px) {

assets/sass/loading-spinner.scss

@@ -12,14 +12,6 @@
     width: 100%;
     height: 100%;
     z-index: 1021;
-    background: rgba(255, 255, 255, 0.7);
+    background-color: var(--tblr-backdrop-bg);
-    > .fas {
+    opacity: $modal-backdrop-opacity;
-        position: absolute;
-        top: 50vh;
-        left: 50vw;
-        margin-left: -15px;
-        margin-top: -15px;
-        color: #000;
-        font-size: 30px;
-    }
 }

assets/sass/pages.scss

@@ -1,39 +0,0 @@
-/*
- * This file is part of the Kimai time-tracking app.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/*
-    ----------- This file contains rules that only page to certain pages -----------
- */
-
-/* weekly working times AKA quick-entries form */
-section.quick-entry-page {
-
-    #quick_entry_form {
-        display: none;
-    }
-
-    /* shrinks the dropdown elements for project and activity to fit into the table, instead of adjusting to the longest option element */
-    .ts-wrapper {
-        display: table;
-        table-layout: fixed;
-    }
-
-    /* make the duration field and dropdown smaller */
-    #quick_entry_box {
-        .duration-widget {
-            .input-group {
-                min-width: 85px;
-            }
-            .btn-duration-preset {
-                padding: 7px 8px 7px 5px;
-            }
-            input {
-                padding: 7px 3px 7px 7px;
-            }
-        }
-    }
-}

assets/sass/print.scss

@@ -15,12 +15,11 @@
     .content-wrapper {
         margin: 0!important;
     }
-    section.content {
-        margin: 0;
-        padding: 0;
-    }
     span i.dot {
         display: none;
         margin-right: 0!important;
     }
+    .float-help {
+        display: none;
+    }
 }

assets/sass/selectpicker.scss

@@ -1,7 +1,11 @@
 
-/* bootstrap thead.sticky-top has z-index 1020 and tomselect dropdowns often hide behind that */
+/*
+1. bootstrap thead.sticky-top has z-index 1020 and tomselect dropdowns often hide behind that: use 1021
+2. bootstrap modal uses 1055, tomselect with dropdownParent: 'body' (required for use in table.responsive, e.g quick.entry on small devices) needs 1056, so it works in modals
+*/
 .ts-dropdown {
-    z-index: 1021;
+    z-index: 1056;
+
 }
 
 /* Tabler defines a min-width of 7rem, what makes many input fields become a two-line field

assets/sass/tabler-fixes.scss

@@ -17,18 +17,35 @@ fieldset.form-fieldset > legend {
     --tblr-dropdown-divider-margin-y: .5rem;
 }
 
-/*
+:host,:root,[data-bs-theme=light] {
-fixes translucent scroll border, e.g. in timesheet modal duration dropdown
+    /* remove the shadow from all form element groups */
-https://github.com/tabler/tabler/issues/1606
+    --tblr-box-shadow-input: none;
-*/
-.dropdown-menu {
-    background-clip: border-box;
 }
 
-/*
+.navbar[data-bs-theme=dark] {
-hide empty fieldset
+    /* give navigation elements slightly higher contrast */
-https://github.com/tabler/tabler/issues/1650
+    --tblr-navbar-color: hsla(0,0%,100%,.8);
-*/
+}
-fieldset:empty {
+
-    display: none;
+/* this is not a bugfix, but it adds a border for better visual segregation */
+.nav-pills .nav-link.active {
+    border-width: 1px;
+    border-style: solid;
+}
+
+/* fixes contrast of batch-update checkboxes - https://github.com/kimai/kimai/issues/5146 */
+.multiupdater[type=checkbox] {
+    --tblr-border-color-translucent: rgba(4, 32, 69, .2);
+}
+
+/* fixes height for long tags https://github.com/kimai/kimai/issues/5169 */
+.tag {
+    --tblr-tag-height: unset;
+}
+
+/* Page title (e.g. Dashboard) does not work properly in navbar, just outside */
+.navbar {
+    .page-title {
+        color: var(--tblr-body-color);
+    }
 }

assets/sass/tables.scss

@@ -17,22 +17,18 @@ table.dataTable {
         position: relative;
     }
 
-    thead .sorting_asc,
-    thead .sorting_desc {
-        font-weight: bold;
-    }
-
     thead .sorting:after,
     thead .sorting_asc:after,
     thead .sorting_desc:after {
         padding-left: 5px;
-        font-family: 'Font Awesome 6 Free';
+        font-family: 'Font Awesome\ 6 Free';
         opacity: 0.5;
         font-size: 12px;
+        font-weight: 700
     }
     thead .sorting:after {
         opacity: 0.2;
-        content: "\f0dc"; /* sort */
+        content: "\f0dc";
     }
     thead .sorting_asc:after {
         content: "\f077";
@@ -42,7 +38,7 @@ table.dataTable {
     }
 
     thead > tr > th {
-        vertical-align: top;
+        vertical-align: middle;
         white-space: nowrap;
     }
 
@@ -92,13 +88,13 @@ table.dataTable {
         &.summary td {
             font-weight: bold;
             border: 0;
-            background-color: var(--tblr-bg-surface-secondary);
+            background-color: var(--tblr-secondary-lt);
         }
         th.multiCheckbox {
             width: 15px;
         }
         &.overlapping {
-            border-top: 2px solid rgba(214,57,57,.1);
+            border-top: 2px solid rgba(214,57,57,.2);
         }
         &.exported {
             opacity: 0.7;
@@ -123,7 +119,7 @@ table.dataTable {
     }
     th.weekend,
     td.weekend {
-        background-color: var(--tblr-gray-50);
+        background-color: var(--tblr-bg-surface-tertiary);
     }
     /* order is important, "today” should overwrite "weekend" therefor later in the file */
     th.today {
@@ -135,14 +131,6 @@ table.dataTable {
     }
 }
 
-/* Quick entry form */
-.form-dataTable {
-    table.dataTable {
-        .form-group {
-            margin-bottom: 0;
-        }
-    }
-}
 
 table.table-hover {
     tr {

assets/sass/theme-dark.scss

@@ -1,45 +0,0 @@
-
-@include color-mode(dark, true) {
-    $dark-font-opacity: 0.6;
-
-    /*
-    --tblr-body-bg: #1e222b;
-    --tblr-bg-surface-tertiary: #1e222b;
-    --tblr-bg-surface: #1e222b;
-    --tblr-bg-surface-secondary: #17202b;
-    //--tblr-muted: #d9dcdf;
-    */
-
-    .table thead th {
-        color: inherit;
-        opacity: $dark-font-opacity;
-    }
-    table.dataTable {
-        th.today {
-            color: var(--tblr-muted);
-        }
-        thead .sorting:after {
-            opacity: $dark-font-opacity;
-        }
-    }
-
-    .overlay {
-        background: rgba(0, 0, 0, 0.5);
-
-        > .fas {
-            color: var(--tblr-white);
-        }
-    }
-    /* Fix tabs pills (e.g. user profile) */
-    .nav {
-        --tblr-nav-link-color: inherit;
-        opacity: $dark-font-opacity;
-    }
-    .datagrid-title {
-        color: inherit;
-        opacity: $dark-font-opacity;
-    }
-    .input-group>:not(:first-child):not(.dropdown-menu):not(.valid-tooltip):not(.valid-feedback):not(.invalid-tooltip):not(.invalid-feedback) {
-        color: inherit;
-    }
-}

assets/sass/weekly-hours.scss

@@ -0,0 +1,178 @@
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/* This file contains rules for the "weekly-hours" AKA "quick-entries" form */
+
+.quick-entry-page {
+
+    .form-dataTable {
+        table.dataTable {
+            .form-group {
+                margin-bottom: 0;
+            }
+        }
+    }
+
+    #quick_entry_form {
+        display: none;
+    }
+
+    .ts-wrapper {
+        min-height: 36px;
+        max-height: 36px;
+        max-width: 150px;
+
+        .ts-control {
+            white-space: nowrap;
+            .item {
+                overflow: hidden;
+            }
+        }
+    }
+
+    .table tbody td:not(.total) {
+        padding: 3px;
+    }
+
+    .duration-widget input.duration-input {
+        min-width: 40px;
+    }
+
+    /* make the duration field and dropdown smaller */
+    #quick_entry_box {
+        .duration-widget {
+            .input-group {
+                max-width: 50px;
+                min-width: 50px;
+            }
+            .btn-duration-preset {
+                display: none;
+                min-width: 30px;
+            }
+            input.duration-input {
+                padding: 7px 5px;
+                max-width: 50px;
+                border-bottom-right-radius: var(--tblr-border-radius);
+                border-top-right-radius: var(--tblr-border-radius);
+            }
+        }
+    }
+
+    /* make sure dropdown never hides behind table responsive */
+    .dropdown-menu {
+        z-index: 1056;
+    }
+}
+
+@media (min-width: 900px) {
+    .quick-entry-page {
+        .ts-wrapper {
+            max-width: 170px;
+        }
+    }
+}
+
+@media (min-width: 992px) {
+    .quick-entry-page {
+        .ts-wrapper {
+            max-width: 100px;
+        }
+    }
+}
+
+@media (min-width: 1100px) {
+    .quick-entry-page {
+        .ts-wrapper {
+            max-width: 160px;
+        }
+    }
+}
+
+@media (min-width: 1200px) {
+    .quick-entry-page {
+        .ts-wrapper {
+            max-width: 165px;
+        }
+        .duration-widget {
+            max-width: 100%;
+        }
+    }
+}
+
+@media (min-width: 1250px) {
+    .quick-entry-page {
+        #quick_entry_box {
+            .duration-widget {
+                .input-group {
+                    max-width: 85px;
+                    min-width: 75px;
+                }
+                .btn-duration-preset {
+                    display: flex;
+                }
+                input.duration-input {
+                    border-bottom-right-radius: 0;
+                    border-top-right-radius: 0;
+                }
+            }
+        }
+    }
+}
+
+@media (min-width: 1300px) {
+    .quick-entry-page {
+        #quick_entry_box {
+            .duration-widget {
+                input.duration-input {
+                    max-width: 100%;
+                }
+            }
+        }
+        .ts-wrapper {
+            max-width: 190px;
+        }
+    }
+}
+
+@media (min-width: 1400px) {
+    .quick-entry-page {
+        .ts-wrapper {
+            max-width: 235px;
+        }
+    }
+}
+
+@media (min-width: 1500px) {
+    .quick-entry-page {
+        .ts-wrapper {
+            max-width: 290px;
+        }
+    }
+}
+
+@media (min-width: 1600px) {
+    .quick-entry-page {
+        .ts-wrapper {
+            max-width: 340px;
+        }
+    }
+}
+
+@media (min-width: 1800px) {
+    .quick-entry-page {
+        .ts-wrapper {
+            max-width: 450px;
+        }
+        #quick_entry_box {
+            .duration-widget {
+                .input-group {
+                    max-width: 100%;
+                }
+            }
+        }
+    }
+}

babel.config.js

@@ -1,17 +0,0 @@
-module.exports = {
-    "sourceType": "unambiguous",
-    "presets": [
-        [
-            "@babel/preset-env",
-            {
-                "modules": false,
-                "targets": {},
-                "useBuiltIns": "usage",
-                "corejs": 3
-            }
-        ]
-    ],
-    "plugins": [
-        "@babel/plugin-syntax-dynamic-import"
-    ]
-}

bin/console

@@ -6,8 +6,8 @@ use App\ConsoleApplication;
 
 set_time_limit(0);
 
-if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
+if (!is_dir(dirname(__DIR__).'/vendor')) {
-    throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
+	throw new LogicException('Dependencies are missing. Try running "composer install".');
 }
 
 require_once dirname(__DIR__).'/vendor/autoload_runtime.php';

composer.json

@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "8.1.*||8.2.*||8.3.*",
+        "php": "8.4.*||8.5.*",
         "ext-gd": "*",
         "ext-intl": "*",
         "ext-json": "*",
@@ -28,49 +28,55 @@
         "azuyalabs/yasumi": "^2.6",
         "composer/semver": "^3.3",
         "doctrine/doctrine-bundle": "^2.7",
-        "doctrine/doctrine-migrations-bundle": "^3.0",
+        "doctrine/doctrine-migrations-bundle": "^3.3",
-        "doctrine/orm": "^2.8",
+        "doctrine/orm": "^3.0",
-        "endroid/qr-code": "^4.8",
+        "easybill/zugferd-php": "^2.1",
-        "erusev/parsedown": "^1.6",
+        "endroid/qr-code": "^6.0",
-        "friendsofsymfony/rest-bundle": "^3.0",
+        "parsedown/parsedown": "^1.6",
+        "friendsofsymfony/rest-bundle": "3.9.0-beta1",
         "gedmo/doctrine-extensions": "^3.6",
+        "horstoeko/zugferd": "^1.0",
+        "horstoeko/zugferdublbridge": "^1.0",
         "jms/serializer-bundle": "^5.0",
-        "kevinpapst/tabler-bundle": "1.4.2",
+        "kevinpapst/tabler-bundle": "^2.0",
         "league/csv": "^9.4",
         "mpdf/mpdf": "^8.0",
-        "nelmio/api-doc-bundle": "^4.0",
+        "nelmio/api-doc-bundle": "^5.0",
         "nelmio/cors-bundle": "^2.0",
         "onelogin/php-saml": "^4.0",
-        "pagerfanta/pagerfanta": "^3.0",
+        "openspout/openspout": "^4.0",
+        "pagerfanta/pagerfanta": "^4.0",
         "phpoffice/phpspreadsheet": "^2.0",
         "phpoffice/phpword": "^1.0",
         "psr/container": "^2.0",
         "psr/log": "^3.0",
-        "scheb/2fa-backup-code": "^6.2",
+        "scheb/2fa-backup-code": "^7.11",
-        "scheb/2fa-bundle": "^6.2",
+        "scheb/2fa-bundle": "^7.11",
-        "scheb/2fa-totp": "^6.2",
+        "scheb/2fa-totp": "^7.11",
-        "symfony/asset": "^6.0",
+        "symfony/asset": "^7.0",
-        "symfony/console": "^6.0",
+        "symfony/console": "^7.0",
-        "symfony/dotenv": "^6.0",
+        "symfony/dependency-injection": "^7.0",
-        "symfony/expression-language": "^6.0",
+        "symfony/dotenv": "^7.0",
+        "symfony/expression-language": "^7.0",
         "symfony/flex": "^2",
-        "symfony/form": "^6.0",
+        "symfony/form": "^7.0",
-        "symfony/framework-bundle": "^6.0",
+        "symfony/framework-bundle": "^7.0",
-        "symfony/http-client": "^6.0",
+        "symfony/http-client": "^7.0",
-        "symfony/intl": "^6.0",
+        "symfony/intl": "^7.0",
-        "symfony/mailer": "^6.0",
+        "symfony/mailer": "^7.0",
-        "symfony/mime": "^6.0",
+        "symfony/mime": "^7.0",
         "symfony/monolog-bundle": "^3.4",
-        "symfony/rate-limiter": "^6.0",
+        "symfony/process": "^7.0",
-        "symfony/runtime": "^6.0",
+        "symfony/rate-limiter": "^7.0",
-        "symfony/security-bundle": "^6.0",
+        "symfony/runtime": "^7.0",
-        "symfony/security-csrf": "^6.0",
+        "symfony/security-bundle": "^7.0",
-        "symfony/serializer": "^6.0",
+        "symfony/security-csrf": "^7.0",
-        "symfony/translation": "^6.0",
+        "symfony/serializer": "^7.0",
-        "symfony/twig-bundle": "^6.0",
+        "symfony/translation": "^7.0",
-        "symfony/validator": "^6.0",
+        "symfony/twig-bundle": "^7.0",
+        "symfony/validator": "^7.0",
         "symfony/webpack-encore-bundle": "^2.0",
-        "symfony/yaml": "^6.0",
+        "symfony/yaml": "^7.0",
         "twig/cssinliner-extra": "^3.0",
         "twig/extra-bundle": "^3.0",
         "twig/inky-extra": "^3.0",
@@ -83,21 +89,21 @@
         "doctrine/doctrine-fixtures-bundle": "^3.2",
         "fakerphp/faker": "^1.15",
         "friendsofphp/php-cs-fixer": "^3.3",
-        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan": "^2.0",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
+        "phpstan/phpstan-deprecation-rules": "^2.0",
-        "phpstan/phpstan-doctrine": "^1.0",
+        "phpstan/phpstan-doctrine": "^2.0",
-        "phpstan/phpstan-phpunit": "^1.0",
+        "phpstan/phpstan-phpunit": "^2.0",
-        "phpstan/phpstan-strict-rules": "^1.0",
+        "phpstan/phpstan-strict-rules": "^2.0",
-        "phpstan/phpstan-symfony": "^1.0",
+        "phpstan/phpstan-symfony": "^2.0",
-        "phpunit/phpunit": "9.5.*",
+        "phpunit/phpunit": "^10.0",
-        "symfony/browser-kit": "^6.0",
+        "symfony/browser-kit": "^7.0",
-        "symfony/css-selector": "^6.0",
+        "symfony/css-selector": "^7.0",
-        "symfony/debug-bundle": "^6.0",
+        "symfony/debug-bundle": "^7.0",
-        "symfony/dom-crawler": "^6.0",
+        "symfony/dom-crawler": "^7.0",
-        "symfony/phpunit-bridge": "^6.0",
+        "symfony/phpunit-bridge": "^7.0",
-        "symfony/stopwatch": "^6.0",
+        "symfony/stopwatch": "^7.0",
-        "symfony/var-dumper": "^6.0",
+        "symfony/var-dumper": "^7.0",
-        "symfony/web-profiler-bundle": "^6.0"
+        "symfony/web-profiler-bundle": "^7.0"
     },
     "repositories": [
         {
@@ -112,7 +118,7 @@
         },
         "optimize-autoloader": true,
         "platform": {
-            "php": "8.1.3"
+            "php": "8.4.4"
         },
         "preferred-install": {
             "*": "dist"
@@ -134,7 +140,14 @@
         "symfony/polyfill-ctype": "*",
         "symfony/polyfill-mbstring": "*",
         "symfony/polyfill-intl": "*",
+        "symfony/polyfill-intl-icu": "*",
+        "symfony/polyfill-intl-grapheme": "*",
+        "symfony/polyfill-intl-idn": "*",
+        "symfony/polyfill-intl-normalizer": "*",
         "symfony/polyfill-iconv": "*",
+        "symfony/polyfill-php84": "*",
+        "symfony/polyfill-php83": "*",
+        "symfony/polyfill-php82": "*",
         "symfony/polyfill-php81": "*",
         "symfony/polyfill-php80": "*",
         "symfony/polyfill-php74": "*",
@@ -200,7 +213,7 @@
         "symfony": {
             "id": "01C3FWRDJJEX9K6Y3A4XDFXPBR",
             "allow-contrib": true,
-            "require": "6.4.*"
+            "require": "7.4.*"
         }
     }
 }

config/bundles.php

@@ -9,7 +9,7 @@ return [
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
-    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
+    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
     DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
     JMS\SerializerBundle\JMSSerializerBundle::class => ['all' => true],
     FOS\RestBundle\FOSRestBundle::class => ['all' => true],

config/packages/assets.yaml

@@ -1,6 +0,0 @@
-framework:
-    assets:
-        json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
-        packages:
-            avatars:
-                base_path: 'avatars'

config/packages/cache.yaml

@@ -1,17 +0,0 @@
-framework:
-    cache:
-        #app: cache.adapter.redis
-        #default_redis_provider: redis://127.0.0.1:6379
-
-        #app: cache.adapter.memcached
-        #default_memcached_provider: 'memcached://localhost'
-
-        # APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues)
-        #app: cache.adapter.apcu
-
-        pools:
-            doctrine.result_cache_pool:
-                adapter: cache.app
-
-            doctrine.system_cache_pool:
-                adapter: cache.system

config/packages/dama_doctrine_test_bundle.yaml

@@ -0,0 +1,5 @@
+when@test:
+    dama_doctrine_test:
+        enable_static_connection: true
+        enable_static_meta_data_cache: true
+        enable_static_query_cache: true

config/packages/debug.yaml

@@ -0,0 +1,5 @@
+when@dev:
+    debug:
+        # Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser.
+        # See the "server:dump" command to start a new server.
+        dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%"

config/packages/doctrine.yaml

@@ -10,27 +10,31 @@ doctrine:
         default_connection: default
         connections:
             default:
+                profiling_collect_backtrace: '%kernel.debug%'
+                use_savepoints: true
                 # existing migrations will fail if the schema filter is activated
                 #schema_filter: ~^(?!(bundle_migration_|kimai2_sessions))~
-                url: '%env(DATABASE_URL)%'
+                url: '%env(resolve:DATABASE_URL)%'
                 driver: 'pdo_mysql'
                 charset: utf8mb4
                 default_table_options:
                     charset: utf8mb4
                     collation: utf8mb4_unicode_ci
                 schema_manager_factory: doctrine.dbal.default_schema_manager_factory
-
         types:
             datetime: App\Doctrine\UTCDateTimeType
             datetime_immutable: App\Doctrine\UTCDateTimeImmutableType
     orm:
         controller_resolver:
-            auto_mapping: true
+            auto_mapping: false
-        auto_generate_proxy_classes: '%kernel.debug%'
+        auto_generate_proxy_classes: true
         default_entity_manager: default
-        enable_lazy_ghost_objects: true
+        enable_native_lazy_objects: true
         entity_managers:
             default:
+                identity_generation_preferences:
+                    Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
+                validate_xml_mapping: true
                 report_fields_where_declared: true
                 connection: default
                 naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
@@ -54,17 +58,23 @@ when@test:
             connections:
                 default:
                     logging: false
-                    use_savepoints: true
 
 when@prod:
     doctrine:
         orm:
-            metadata_cache_driver:
+            auto_generate_proxy_classes: false
-                type: pool
+            proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies'
-                pool: doctrine.system_cache_pool
             query_cache_driver:
                 type: pool
                 pool: doctrine.system_cache_pool
             result_cache_driver:
                 type: pool
                 pool: doctrine.result_cache_pool
+
+framework:
+    cache:
+        pools:
+            doctrine.result_cache_pool:
+                adapter: cache.app
+            doctrine.system_cache_pool:
+                adapter: cache.system

config/packages/doctrine_migrations.yaml

@@ -1,8 +1,11 @@
 doctrine_migrations:
+    migrations_paths:
+        # namespace is arbitrary but should be different from App\Migrations
+        # as migrations classes should NOT be autoloaded
+        'DoctrineMigrations': '%kernel.project_dir%/migrations'
+    enable_profiler: false
     transactional: false
     storage:
         table_storage:
             table_name: 'migration_versions'
-    migrations_paths:
-        'DoctrineMigrations': '%kernel.project_dir%/migrations'
     custom_template: '%kernel.project_dir%/migrations/MigrationTemplate.txt'

config/packages/fos_rest.yaml

@@ -1,3 +1,4 @@
+# Read the documentation: https://fosrestbundle.readthedocs.io/en/3.x/
 fos_rest:
     param_fetcher_listener:
         enabled: true
@@ -39,3 +40,5 @@ fos_rest:
             - { path: ^/api, prefer_extension: true, fallback_format: json, priorities: [ json ] }
     zone:
         - { path: ^/api/* }
+    service:
+        view_handler: App\API\ViewHandler

config/packages/framework.yaml

@@ -1,6 +1,7 @@
 # see https://symfony.com/doc/current/reference/configuration/framework.html
 parameters:
     env(TRUSTED_PROXIES): ''
+    env(TRUSTED_HOSTS): ''
 
 framework:
     secret: '%env(APP_SECRET)%'
@@ -14,6 +15,7 @@ framework:
         enable_attributes: true
 
     trusted_proxies: '%env(string:TRUSTED_PROXIES)%'
+    trusted_hosts: '%env(string:TRUSTED_HOSTS)%'
 
     exceptions:
         App\Validator\ValidationFailedException:
@@ -25,6 +27,7 @@ framework:
     # Enables session support. Note that the session will ONLY be started if you read or write from it.
     # Remove or comment this section to explicitly disable session support.
     session:
+        name: KIMAI_SESSION
         handler_id: App\Security\SessionHandler
         cookie_secure: auto
         cookie_samesite: lax
@@ -34,6 +37,9 @@ framework:
     php_errors:
         log: true
 
+    property_info:
+        with_constructor_extractor: true
+
     mailer:
         dsn: '%env(MAILER_URL)%'
 

config/packages/jms_serializer.yaml

@@ -3,10 +3,6 @@ jms_serializer:
         datetime:
             default_format: 'Y-m-d\TH:i:sO' # DATE_ISO8601
     visitors:
-        json_serialization:
-            options:
-                - JSON_UNESCAPED_SLASHES
-                - JSON_PRESERVE_ZERO_FRACTION
         xml_serialization:
             format_output: '%kernel.debug%'
     metadata:
@@ -18,3 +14,20 @@ jms_serializer:
                 excluded: []
     property_naming:
         id: 'jms_serializer.identical_property_naming_strategy'
+
+when@prod:
+    jms_serializer:
+        visitors:
+            json_serialization:
+                options:
+                    - JSON_UNESCAPED_SLASHES
+                    - JSON_PRESERVE_ZERO_FRACTION
+
+when@dev:
+    jms_serializer:
+        visitors:
+            json_serialization:
+                options:
+                    - JSON_PRETTY_PRINT
+                    - JSON_UNESCAPED_SLASHES
+                    - JSON_PRESERVE_ZERO_FRACTION

config/packages/kimai.yaml

@@ -105,7 +105,7 @@ kimai:
             TEAMS: ['view_team','create_team','edit_team','delete_team']
             LOCKDOWN: ['lockdown_grace_timesheet','lockdown_override_timesheet']
             REPORTING: ['view_reporting','view_other_reporting','project_reporting','customer_reporting']
-            EVERYONE: ['api_access']
+            EVERYONE: ['api_access','hours_own_profile']
             # permissions which are deactivated, as these features are hidden for now
             # brave users can try to activate them and be surprised what happens
             REGISTER_BETA: []
@@ -117,10 +117,10 @@ kimai:
             ROLE_SUPER_ADMIN: ['ACTIVITIES','PROJECTS','CUSTOMERS','INVOICE','INVOICE_ADMIN','TIMESHEET','TIMESHEET_OTHER','PROFILE','PROFILE_OTHER','USER','TEAMS','RATE','RATE_OTHER','EXPORT','BILLABLE','TAGS','LOCKDOWN','REPORTING', 'EVERYONE']
         # mapping a "role name" to an array of "permission names"
         roles:
-            ROLE_USER: ['view_team_member','time_team_project','create_tag','view_reporting','hours_own_profile']
+            ROLE_USER: ['view_team_member','time_team_project','create_tag','view_reporting']
-            ROLE_TEAMLEAD: ['view_rate_own_timesheet','view_rate_other_timesheet','hourly-rate_own_profile','view_team_member','hours_other_profile','hours_own_profile']
+            ROLE_TEAMLEAD: ['view_rate_own_timesheet','view_rate_other_timesheet','hourly-rate_own_profile','view_team_member','hours_other_profile']
-            ROLE_ADMIN: ['hourly-rate_own_profile','edit_exported_timesheet','teams_own_profile','view_team_member','view_all_data','contract_other_profile','hours_other_profile','hours_own_profile']
+            ROLE_ADMIN: ['hourly-rate_own_profile','edit_exported_timesheet','teams_own_profile','view_team_member','view_all_data','contract_other_profile','hours_other_profile','create_export_template']
-            ROLE_SUPER_ADMIN: ['hourly-rate_own_profile','hourly-rate_other_profile','roles_own_profile','supervisor_own_profile','system_information','system_configuration','plugins','edit_exported_timesheet','teams_own_profile','view_team_member','upload_invoice_template','view_all_data','contract_other_profile','hours_other_profile','hours_own_profile']
+            ROLE_SUPER_ADMIN: ['hourly-rate_own_profile','hourly-rate_other_profile','roles_own_profile','supervisor_own_profile','system_information','system_configuration','plugins','edit_exported_timesheet','teams_own_profile','view_team_member','upload_invoice_template','view_all_data','contract_other_profile','hours_other_profile','create_export_template']
 # --------------------------------------------------------------------------------
 
 

config/packages/monolog.yaml

@@ -1,33 +1,25 @@
 monolog:
-    channels: ["deprecation"]
+    channels:
-
+        - deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists
-when@prod:
-    monolog:
-        handlers:
-            main:
-                type: fingers_crossed
-                action_level: notice
-                handler: nested
-                excluded_http_codes: [403, 404]
-                channels: ["!deprecation"]
-            nested:
-                type: stream
-                level: info
-                path: "%kernel.logs_dir%/%kernel.environment%.log"
-                formatter: monolog.formatter.kimai
-            console:
-                type: console
-                process_psr_3_messages: false
-                channels: ["!event", "!doctrine", "!deprecation"]
 
 when@dev:
     monolog:
         handlers:
             main:
+                type: fingers_crossed
+                action_level: notice
+                handler: file_log
+                excluded_http_codes:
+                    - {400: ['^/api/']}
+                    - {401: ['^/api/']}
+                    - 403
+                    - 404
+                    - 405
+                channels: ["!event", "!deprecation"]
+            file_log:
                 type: stream
                 path: "%kernel.logs_dir%/%kernel.environment%.log"
                 level: debug
-                channels: ["!event", "!deprecation"]
                 formatter: monolog.formatter.kimai
             console:
                 type: console
@@ -43,8 +35,37 @@ when@test:
     monolog:
         handlers:
             main:
+                type: fingers_crossed
+                action_level: error
+                handler: nested
+                excluded_http_codes: [404, 405]
+                channels: ["!event"]
+            nested:
                 type: stream
                 path: "%kernel.logs_dir%/%kernel.environment%.log"
-                level: info
+                level: debug
-                channels: ["!event"]
                 formatter: monolog.formatter.kimai
+
+when@prod:
+    monolog:
+        handlers:
+            main:
+                type: fingers_crossed
+                action_level: error
+                handler: file_log
+                excluded_http_codes:
+                    - {400: ['^/api/']}
+                    - {401: ['^/api/']}
+                    - 403
+                    - 404
+                    - {405: ['/homepage$', '/login_check$', '/export/data$']}
+                channels: ["!deprecation"]
+            file_log:
+                type: stream
+                level: info
+                path: "%kernel.logs_dir%/%kernel.environment%.log"
+                formatter: monolog.formatter.kimai
+            console:
+                type: console
+                process_psr_3_messages: false
+                channels: ["!event", "!doctrine", "!deprecation"]

config/packages/nelmio_api_doc.yaml

@@ -1,21 +1,22 @@
 nelmio_api_doc:
+    operation_id_generation: conditionally_prepend
     models:
         use_jms: true
         names:
-            - { alias: CustomerEditForm,            type: App\Form\API\CustomerApiEditForm,         groups: [Default, Entity, Customer] }
+            - { alias: CustomerEditForm,            type: App\Form\API\CustomerApiEditForm,         groups: [Default, Entity, Customer, Customer_Entity] }
             - { alias: CustomerEntity,              type: App\Entity\Customer,                      groups: [Default, Entity, Customer, Customer_Entity, Not_Expanded] }
             - { alias: Customer,                    type: App\Entity\Customer,                      groups: [Default, Not_Expanded] }
             - { alias: CustomerRate,                type: App\Entity\CustomerRate,                  groups: [Default, Entity, Customer_Rate] }
             - { alias: CustomerRateForm,            type: App\Form\API\CustomerRateApiForm,         groups: [Default, Entity, Customer_Rate] }
             - { alias: CustomerCollection,          type: App\Entity\Customer,                      groups: [Default, Collection, Customer] }
-            - { alias: ProjectEditForm,             type: App\Form\API\ProjectApiEditForm,          groups: [Default, Entity, Project] }
+            - { alias: ProjectEditForm,             type: App\Form\API\ProjectApiEditForm,          groups: [Default, Entity, Project, Project_Entity] }
             - { alias: ProjectEntity,               type: App\Entity\Project,                       groups: [Default, Entity, Project, Project_Entity, Not_Expanded] }
             - { alias: Project,                     type: App\Entity\Project,                       groups: [Default, Not_Expanded] }
             - { alias: ProjectExpanded,             type: App\Entity\Project,                       groups: [Default, Expanded] }
             - { alias: ProjectRate,                 type: App\Entity\ProjectRate,                   groups: [Default, Entity, Project_Rate] }
             - { alias: ProjectRateForm,             type: App\Form\API\ProjectRateApiForm,          groups: [Default, Entity, Project_Rate] }
             - { alias: ProjectCollection,           type: App\Entity\Project,                       groups: [Default, Collection, Project] }
-            - { alias: ActivityEditForm,            type: App\Form\API\ActivityApiEditForm,         groups: [Default, Entity, Activity] }
+            - { alias: ActivityEditForm,            type: App\Form\API\ActivityApiEditForm,         groups: [Default, Entity, Activity, Activity_Entity] }
             - { alias: ActivityEntity,              type: App\Entity\Activity,                      groups: [Default, Entity, Activity, Activity_Entity, Not_Expanded] }
             - { alias: Activity,                    type: App\Entity\Activity,                      groups: [Default, Not_Expanded] }
             - { alias: ActivityExpanded,            type: App\Entity\Activity,                      groups: [Default, Expanded] }
@@ -28,7 +29,7 @@ nelmio_api_doc:
             - { alias: TimesheetEntity,             type: App\Entity\Timesheet,                     groups: [Default, Entity, Timesheet, Timesheet_Entity, Not_Expanded] }
             - { alias: TimesheetExpanded,           type: App\Entity\Timesheet,                     groups: [Default, Entity, Timesheet, Timesheet_Entity, Expanded] }
             - { alias: TimesheetCollection,         type: App\Entity\Timesheet,                     groups: [Default, Collection, Timesheet, Not_Expanded] }
-            - { alias: TimesheetCollectionExpanded, type: App\Entity\Timesheet,                     groups: [Default, Collection, Timesheet, Subresource, Expanded] }
+            - { alias: TimesheetCollectionExpanded, type: App\Entity\Timesheet,                     groups: [Default, Collection, Timesheet, Expanded] }
             - { alias: UserCreateForm,              type: App\Form\API\UserApiCreateForm,           groups: [Default, Entity, User, User_Entity] }
             - { alias: UserEditForm,                type: App\Form\API\UserApiEditForm,             groups: [Default, Entity, User, User_Entity] }
             - { alias: User,                        type: App\Entity\User,                          groups: [Default] }
@@ -43,20 +44,28 @@ nelmio_api_doc:
             - { alias: Invoice,                     type: App\Entity\Invoice,                       groups: [Default, Entity, Invoice, Invoice_Entity] }
             - { alias: InvoiceCollection,           type: App\Entity\Invoice,                       groups: [Default, Collection, Invoice] }
     areas:
-        path_patterns:
+        default:
-            - ^/api(?!/doc)
+            path_patterns:
+                - ^/api(?!/doc)
+            security:
+                bearer:
+                    type: 'http'
+                    description: 'API Token'
+                    bearerFormat: 'KIMAI'
+                    scheme: 'bearer'
     documentation:
         info:
             title: Kimai - API
             description: |
-                JSON API for the Kimai time-tracking software. Read our [API documentation](https://www.kimai.org/documentation/rest-api.html) and download the [Open API definition](doc.json) to import into your API client.
+                JSON API for the Kimai time-tracking software. Find more infos in our [API documentation](https://www.kimai.org/documentation/rest-api.html).
-            version: '1.0'
+            version: '1.1'
-        components:
-            securitySchemes:
-                bearer:
-                    type: http
-                    scheme: bearer
-                    bearerFormat: KIMAI
-                    description: API Token
         security:
             - bearer: []
+    html_config:
+#        assets_mode: cdn
+        # https://swagger.io/docs/open-source-tools/swagger-ui/usage/configuration/
+        swagger_ui_config: []
+        # https://redocly.com/docs/redoc/config/
+        redocly_config: []
+        # https://docs.stoplight.io/docs/elements/b074dc47b2826-elements-configuration-options
+        stoplight_config: { basePath: '/api/doc', router: 'memory', logo: '/touch-icon-192x192.png', hideInternal: true }

config/packages/nelmio_cors.yaml

@@ -3,12 +3,7 @@ parameters:
 
 nelmio_cors:
     defaults:
-        allow_credentials: false
+        # for security reasons we do not allow CORS by default
-#        allow_origin: ['%env(CORS_ALLOW_ORIGIN)%']
-#        allow_headers: ['Content-Type', 'Authorization', 'X-AUTH-USER', 'X-AUTH-TOKEN']
-#        allow_methods: ['GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE']
-#        expose_headers: ['Link']
-#        max_age: 3600
         allow_origin: []
         allow_headers: []
         allow_methods: []
@@ -17,10 +12,18 @@ nelmio_cors:
         hosts: []
         origin_regex: true
         forced_allow_origin_value: ~
-#        allow_private_network: true
     paths:
+        # only the API endpoints are accessible
         '^/api/':
+            # allow_origin: ['%env(CORS_ALLOW_ORIGIN)%']
             allow_origin: ['*']
-            allow_headers: ['X-AUTH-USER', 'X-AUTH-TOKEN', 'Content-Type', 'Authorization']
+            allow_headers: ['Content-Type', 'Authorization']
             allow_methods: ['GET', 'OPTIONS', 'POST', 'PUT', 'PATCH', 'DELETE']
+            # expose_headers: ['Link']
             max_age: 3600
+
+when@dev:
+    nelmio_cors:
+        paths:
+            '^/api/':
+                allow_private_network: true

config/packages/rate_limiter.yaml

@@ -5,3 +5,17 @@ framework:
             limit: 250
             interval: '1 hour'
             lock_factory: null
+        reset_password:
+            policy: 'fixed_window'
+            limit: 10
+            interval: '1 hour'
+            lock_factory: null
+
+when@test:
+    framework:
+        rate_limiter:
+            reset_password:
+                policy: 'fixed_window'
+                limit: 100
+                interval: '1 minute'
+                lock_factory: null

config/packages/routing.yaml

@@ -1,3 +1,6 @@
+parameters:
+    env(default_uri): 'http://localhost'
+
 framework:
     router:
         utf8: true
@@ -5,7 +8,7 @@ framework:
 
         # Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
         # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
-        #default_uri: http://localhost
+        default_uri: '%env(DEFAULT_URI)%'
 
 when@test:
     framework:

config/packages/security.yaml

@@ -1,7 +1,8 @@
 security:
+    # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
     password_hashers:
         App\Entity\User: auto
-
+    # https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider
     providers:
         chain_provider:
             chain:
@@ -11,12 +12,11 @@ security:
                 class: App\Entity\User
         kimai_ldap:
             id: App\Ldap\LdapUserProvider
-
     firewalls:
         dev:
+            # Ensure dev tools and static assets are always allowed
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
-
         api:
             access_token:
                 token_handler: App\API\Authentication\AccessTokenHandler
@@ -27,84 +27,70 @@ security:
             stateless: true
             remember_me: false
             provider: chain_provider
-            custom_authenticators:
-                - App\API\Authentication\TokenAuthenticator
-
         secured_area:
             kimai_ldap: ~
             pattern: ^/
             user_checker: App\Security\UserChecker
             stateless: false
-
             entry_point: form_login
-
             custom_authenticators:
                 - App\Saml\SamlAuthenticator
-
             remember_me:
+                name: KIMAI_REMEMBER
                 secret: '%kernel.secret%'
                 lifetime: 604800
                 path: /
                 always_remember_me: true
-
             # activate all configured user provider
             provider: chain_provider
-
             form_login:
                 check_path: security_check
                 login_path: login
                 enable_csrf: true
-
             two_factor:
                 auth_form_path: 2fa_login
                 check_path: 2fa_login_check
                 remember_me_sets_trusted: true
-
             logout:
                 path: logout
                 target: homepage
                 enable_csrf: false
-
             login_throttling:
                 max_attempts: 5
                 interval: '5 minutes'
-
             login_link:
                 check_route: link_login_check
                 signature_properties: ['id']
                 lifetime: 900
                 max_uses: 3
-
     access_decision_manager:
         # only grants access if there is no voter denying access
         strategy: unanimous
         allow_if_all_abstain: false
-
     role_hierarchy:
-        ROLE_USER:        ~
+        ROLE_USER: ~
-        ROLE_TEAMLEAD:    ROLE_USER
+        ROLE_TEAMLEAD: ROLE_USER
-        ROLE_ADMIN:       ROLE_TEAMLEAD
+        ROLE_ADMIN: ROLE_TEAMLEAD
         ROLE_SUPER_ADMIN: ROLE_ADMIN
-
+    # Note: Only the *first* matching rule is applied
     access_control:
-        - { path: '^/auth/2fa', role: IS_AUTHENTICATED_2FA_IN_PROGRESS }
+        - {path: '^/auth/2fa', role: IS_AUTHENTICATED_2FA_IN_PROGRESS}
-        - { path: '^/auth', roles: PUBLIC_ACCESS }
+        - {path: '^/auth', roles: PUBLIC_ACCESS}
-        - { path: '^/{_locale}$', role: PUBLIC_ACCESS }
+        - {path: '^/{_locale}$', role: PUBLIC_ACCESS}
-        - { path: '^/{_locale}/auth', role: PUBLIC_ACCESS }
+        - {path: '^/{_locale}/auth', role: PUBLIC_ACCESS}
-        - { path: '^/{_locale}/login', role: PUBLIC_ACCESS }
+        - {path: '^/{_locale}/login', role: PUBLIC_ACCESS}
-        - { path: '^/{_locale}/register', role: PUBLIC_ACCESS }
+        - {path: '^/{_locale}/register', role: PUBLIC_ACCESS}
-        - { path: '^/{_locale}/resetting', role: PUBLIC_ACCESS }
+        - {path: '^/{_locale}/resetting', role: PUBLIC_ACCESS}
-        - { path: '^/{_locale}/', roles: ROLE_USER }
+        - {path: '^/{_locale}/', roles: ROLE_USER}
-        - { path: '^/api', roles: IS_AUTHENTICATED }
+        - {path: '^/api', roles: IS_AUTHENTICATED}
 
 when@test:
-    # this configuration simplifies testing URLs protected by the security mechanism
-    # See https://symfony.com/doc/current/cookbook/testing/http_authentication.html
     security:
         password_hashers:
+            # Password hashers are resource-intensive by design to ensure security.
+            # In tests, it's safe to reduce their cost to improve performance.
             App\Entity\User:
                 algorithm: auto
-                # see https://github.com/symfony/recipes/pull/1026
                 cost: 4 # Lowest possible value for bcrypt
                 time_cost: 3 # Lowest possible value for argon
                 memory_cost: 10 # Lowest possible value for argon

config/packages/tabler.yaml

@@ -6,20 +6,18 @@
 #
 tabler:
     options:
-        # dark or normal layout
+        theme_auto: true
         dark_mode: false
-        # condensed = one nav-bar, false = two nav-bars
         navbar_condensed: true
-        # overlap = https://preview.tabler.io/layout-navbar-overlap.html
+        navbar_overlap: false
-        navbar_overlap: true
+        navbar_dark: true
-        # boxed layout (true) or full-screen (false)
         boxed_layout: false
-        # right to left = true
         rtl_mode: false
-        # true = only avatar, false = show username and title as well
+        user_menu_condensed: false
-        user_menu_condensed: true
-        # url to your company logo
         logo_url: "touch-icon-192x192.png"
+        theme_base: "neutral"
+        theme_radius: 0.5
+        theme_primary: "blue"
 
     knp_menu:
         enable: false
@@ -47,6 +45,7 @@ tabler:
         barcode: fas fa-barcode
         bookmark: far fa-star
         bookmarked: fas fa-star
+        break: fas fa-utensils
         calendar: far fa-calendar-alt
         cancel: fas fa-times
         clock: far fa-clock
@@ -68,10 +67,10 @@ tabler:
         documentation: fas fa-book
         dot: fas fa-circle
         download: fas fa-download
-        duration: far fa-hourglass
+        duration: fas fa-stopwatch
         edit: far fa-edit
-        end: fas fa-stopwatch
+        end: fas fa-hourglass-end
-        export: fas fa-file-export
+        export: fas fa-download
         failure: fas fa-times
         fax: fas fa-fax
         filter: fas fa-filter
@@ -93,6 +92,7 @@ tabler:
         manual: fas fa-book
         mobile: fas fa-mobile
         money: fas fa-coins
+        move: fas fa-up-down-left-right
         ods: fas fa-table
         off: fas fa-toggle-off
         on: fas fa-toggle-on
@@ -116,6 +116,7 @@ tabler:
         rejected: fas fa-ban
         right: fas fa-chevron-right
         right2: fas fa-angle-double-right
+        remove: fas fa-xmark
         roles: fas fa-user-shield
         save: far fa-save
         search: fas fa-search
@@ -139,7 +140,5 @@ tabler:
         visibility: far fa-eye
         warning: fas fa-exclamation
         weekly-times: fas fa-th
-        widget_add: fas fa-folder-plus
-        widget_remove: fas fa-folder-minus
         work_times: fas fa-calculator
         xlsx: fas fa-file-excel

config/packages/twig.yaml

@@ -1,11 +1,11 @@
 twig:
-    debug: '%kernel.debug%'
+    file_name_pattern: '*.twig'
-    strict_variables: '%kernel.debug%'
     form_themes:
         - 'form/vertical.html.twig'
-    exception_controller: null
     paths:
-        # used in templates/emails/layout.html.twig
-        '%kernel.project_dir%/assets/css': css
         '%kernel.project_dir%/templates/bundles/TablerBundle': theme
         '%kernel.project_dir%/vendor/kevinpapst/tabler-bundle/templates': theme
+
+when@test:
+    twig:
+        strict_variables: true

config/packages/web_profiler.yaml

@@ -1,15 +1,13 @@
 when@dev:
     web_profiler:
         toolbar: true
-        intercept_redirects: false
 
     framework:
-        profiler: { only_exceptions: false }
+        profiler:
+            collect_serializer_data: true
 
 when@test:
-    web_profiler:
-        toolbar: false
-        intercept_redirects: false
-
     framework:
-        profiler: { collect: false }
+        profiler:
+            collect: false
+            collect_serializer_data: true

config/packages/webpack_encore.yaml

@@ -1,17 +1,45 @@
 webpack_encore:
-    # The path where Encore is building the assets.
+    # The path where Encore is building the assets - i.e. Encore.setOutputPath()
-    # This should match Encore.setOutputPath() in webpack.config.js.
     output_path: '%kernel.project_dir%/public/build'
     # If multiple builds are defined (as shown below), you can disable the default build:
     # output_path: false
 
-    # if using Encore.enableIntegrityHashes() specify the crossorigin attribute value (default: false, or use 'anonymous' or 'use-credentials')
+    # Set attributes that will be rendered on all script and link tags
+    script_attributes:
+        defer: true
+        # Uncomment (also under link_attributes) if using Turbo Drive
+        # https://turbo.hotwired.dev/handbook/drive#reloading-when-assets-change
+        # 'data-turbo-track': reload
+    # link_attributes:
+        # Uncomment if using Turbo Drive
+        # 'data-turbo-track': reload
+
+    # If using Encore.enableIntegrityHashes() and need the crossorigin attribute (default: false, or use 'anonymous' or 'use-credentials')
     # crossorigin: 'anonymous'
 
-    # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
+    # Preload all rendered script and link tags automatically via the HTTP/2 Link header
-    # Available in version 1.2
+    # preload: true
-    cache: '%kernel.debug%'
 
-when@dev:
+    # Throw an exception if the entrypoints.json file is missing or an entry is missing from the data
+    # strict_mode: false
+
+    # If you have multiple builds:
+    # builds:
+        # frontend: '%kernel.project_dir%/public/frontend/build'
+
+        # pass the build name as the 3rd argument to the Twig functions
+        # {{ encore_entry_script_tags('entry1', null, 'frontend') }}
+
+framework:
+    assets:
+        json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
+
+when@prod:
     webpack_encore:
-        cache: false
+        # Cache the entrypoints.json (rebuild Symfony's cache when entrypoints.json changes)
+        # Available in version 1.2
+        cache: true
+
+#when@test:
+#    webpack_encore:
+#        strict_mode: false

config/routes.yaml

@@ -1,4 +1,14 @@
+# yaml-language-server: $schema=../vendor/symfony/routing/Loader/schema/routing.schema.json
+
+# This file is the entry point to configure the routes of your app.
+# Methods with the #[Route] attribute are automatically imported.
+# See also https://symfony.com/doc/current/routing.html
+
+# To list all registered routes, run the following command:
+#   bin/console debug:router
+
 controllers:
+#    resource: routing.controllers
     resource: ../src/Controller/
     type: attribute
     prefix: /{_locale}
@@ -8,12 +18,8 @@ controllers:
 api.swagger_ui:
     path: /api/doc
     methods: GET
-    defaults: { _controller: nelmio_api_doc.controller.swagger_ui }
+    defaults:
-
+        _controller: nelmio_api_doc.controller.stoplight
-api.swagger:
-    path: /api/doc.json
-    methods: GET
-    defaults: { _controller: nelmio_api_doc.controller.swagger }
 
 api:
     resource: ../src/API/

config/routes/dev/twig.yaml

@@ -1,5 +0,0 @@
-_errors:
-    resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
-    prefix: /{_locale}/_error
-    defaults:
-        _locale: '%locale%'

config/routes/dev/web_profiler.yaml

@@ -1,7 +0,0 @@
-web_profiler_wdt:
-    resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
-    prefix: /_wdt
-
-web_profiler_profiler:
-    resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
-    prefix: /_profiler

config/routes/framework.yaml

@@ -0,0 +1,6 @@
+when@dev:
+    _errors:
+        resource: '@FrameworkBundle/Resources/config/routing/errors.php'
+        prefix: /{_locale}/_error
+        defaults:
+            _locale: '%locale%'

config/routes/security.yaml

@@ -0,0 +1,3 @@
+_security_logout:
+    resource: security.route_loader.logout
+    type: service

config/routes/web_profiler.yaml

@@ -0,0 +1,8 @@
+when@dev:
+    web_profiler_wdt:
+        resource: '@WebProfilerBundle/Resources/config/routing/wdt.php'
+        prefix: /_wdt
+
+    web_profiler_profiler:
+        resource: '@WebProfilerBundle/Resources/config/routing/profiler.php'
+        prefix: /_profiler

config/services.yaml

@@ -1,16 +1,22 @@
+# yaml-language-server: $schema=../vendor/symfony/dependency-injection/Loader/schema/services.schema.json
+
+# This file is the entry point to configure your own services.
+# Files in the packages/ subdirectory configure your dependencies.
+# See also https://symfony.com/doc/current/service_container/import.html
+
+# Put parameters here that don't need to change on each machine where the app is deployed
+# https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration
 parameters:
     locale: en
     # can be regenerated with: bin/console kimai:reset:locales
-    kimai_locales: ['ar', 'ca', 'cs', 'da', 'de', 'de_CH', 'el', 'en', 'eo', 'es', 'eu', 'fa', 'fi', 'fo', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'nb_NO', 'nl', 'pa', 'pl', 'pt', 'pt_BR', 'ro', 'ru', 'sk', 'sl', 'sv', 'tr', 'uk', 'vi', 'zh_CN', 'zh_Hant', 'zh_Hant_TW', 'ca_AD', 'ca_ES', 'ca_FR', 'ca_IT', 'cs_CZ', 'da_DK', 'da_GL', 'de_AT', 'de_BE', 'de_CH', 'de_DE', 'de_IT', 'de_LI', 'de_LU', 'el_CY', 'el_GR', 'en_AE', 'en_AG', 'en_AI', 'en_AS', 'en_AT', 'en_AU', 'en_BB', 'en_BE', 'en_BI', 'en_BM', 'en_BS', 'en_BW', 'en_BZ', 'en_CA', 'en_CC', 'en_CH', 'en_CK', 'en_CM', 'en_CX', 'en_CY', 'en_DE', 'en_DG', 'en_DK', 'en_DM', 'en_ER', 'en_FI', 'en_FJ', 'en_FK', 'en_FM', 'en_GB', 'en_GD', 'en_GG', 'en_GH', 'en_GI', 'en_GM', 'en_GU', 'en_GY', 'en_HK', 'en_ID', 'en_IE', 'en_IL', 'en_IM', 'en_IN', 'en_IO', 'en_JE', 'en_JM', 'en_KE', 'en_KI', 'en_KN', 'en_KY', 'en_LC', 'en_LR', 'en_LS', 'en_MG', 'en_MH', 'en_MO', 'en_MP', 'en_MS', 'en_MT', 'en_MU', 'en_MV', 'en_MW', 'en_MY', 'en_NA', 'en_NF', 'en_NG', 'en_NH', 'en_NL', 'en_NR', 'en_NU', 'en_NZ', 'en_PG', 'en_PH', 'en_PK', 'en_PN', 'en_PR', 'en_PW', 'en_RH', 'en_RW', 'en_SB', 'en_SC', 'en_SD', 'en_SE', 'en_SG', 'en_SH', 'en_SI', 'en_SL', 'en_SS', 'en_SX', 'en_SZ', 'en_TC', 'en_TK', 'en_TO', 'en_TT', 'en_TV', 'en_TZ', 'en_UG', 'en_UM', 'en_US', 'en_VC', 'en_VG', 'en_VI', 'en_VU', 'en_WS', 'en_ZA', 'en_ZM', 'en_ZW', 'es_AR', 'es_BO', 'es_BR', 'es_BZ', 'es_CL', 'es_CO', 'es_CR', 'es_CU', 'es_DO', 'es_EA', 'es_EC', 'es_ES', 'es_GQ', 'es_GT', 'es_HN', 'es_IC', 'es_MX', 'es_NI', 'es_PA', 'es_PE', 'es_PH', 'es_PR', 'es_PY', 'es_SV', 'es_US', 'es_UY', 'es_VE', 'eu_ES', 'fa_AF', 'fa_IR', 'fi_FI', 'fo_DK', 'fo_FO', 'fr_BE', 'fr_BF', 'fr_BI', 'fr_BJ', 'fr_BL', 'fr_CA', 'fr_CD', 'fr_CF', 'fr_CG', 'fr_CH', 'fr_CI', 'fr_CM', 'fr_DJ', 'fr_DZ', 'fr_FR', 'fr_GA', 'fr_GF', 'fr_GN', 'fr_GP', 'fr_GQ', 'fr_HT', 'fr_KM', 'fr_LU', 'fr_MA', 'fr_MC', 'fr_MF', 'fr_MG', 'fr_ML', 'fr_MQ', 'fr_MR', 'fr_MU', 'fr_NC', 'fr_NE', 'fr_PF', 'fr_PM', 'fr_RE', 'fr_RW', 'fr_SC', 'fr_SN', 'fr_SY', 'fr_TD', 'fr_TG', 'fr_TN', 'fr_VU', 'fr_WF', 'fr_YT', 'he_IL', 'hr_BA', 'hr_HR', 'hu_HU', 'it_CH', 'it_IT', 'it_SM', 'it_VA', 'ja_JP', 'ko_CN', 'ko_KP', 'ko_KR', 'nl_AW', 'nl_BE', 'nl_BQ', 'nl_CW', 'nl_NL', 'nl_SR', 'nl_SX', 'pl_PL', 'pt_AO', 'pt_BR', 'pt_CH', 'pt_CV', 'pt_GQ', 'pt_GW', 'pt_LU', 'pt_MO', 'pt_MZ', 'pt_PT', 'pt_ST', 'pt_TL', 'ro_MD', 'ro_RO', 'ru_BY', 'ru_KG', 'ru_KZ', 'ru_MD', 'ru_RU', 'ru_UA', 'sk_SK', 'sv_AX', 'sv_FI', 'sv_SE', 'tr_CY', 'tr_TR', 'uk_UA', 'vi_VN']
+    kimai_locales: ['ar', 'bg', 'cs', 'da', 'de', 'de_CH', 'el', 'en', 'eo', 'es', 'eu', 'fa', 'fi', 'fo', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'nb_NO', 'nl', 'pa', 'pl', 'pt', 'pt_BR', 'ro', 'ru', 'sk', 'sl', 'sv', 'ta', 'tr', 'uk', 'vi', 'zh_CN', 'zh_Hant', 'zh_Hant_TW', 'cs_CZ', 'da_DK', 'da_GL', 'de_AT', 'de_BE', 'de_CH', 'de_DE', 'de_IT', 'de_LI', 'de_LU', 'el_CY', 'el_GR', 'en_AE', 'en_AG', 'en_AI', 'en_AS', 'en_AT', 'en_AU', 'en_BB', 'en_BE', 'en_BI', 'en_BM', 'en_BS', 'en_BW', 'en_BZ', 'en_CA', 'en_CC', 'en_CH', 'en_CK', 'en_CM', 'en_CX', 'en_CY', 'en_CZ', 'en_DE', 'en_DG', 'en_DK', 'en_DM', 'en_ER', 'en_ES', 'en_FI', 'en_FJ', 'en_FK', 'en_FM', 'en_FR', 'en_GB', 'en_GD', 'en_GG', 'en_GH', 'en_GI', 'en_GM', 'en_GS', 'en_GU', 'en_GY', 'en_HK', 'en_HU', 'en_ID', 'en_IE', 'en_IL', 'en_IM', 'en_IN', 'en_IO', 'en_IT', 'en_JE', 'en_JM', 'en_KE', 'en_KI', 'en_KN', 'en_KY', 'en_LC', 'en_LR', 'en_LS', 'en_MG', 'en_MH', 'en_MO', 'en_MP', 'en_MS', 'en_MT', 'en_MU', 'en_MV', 'en_MW', 'en_MY', 'en_NA', 'en_NF', 'en_NG', 'en_NH', 'en_NL', 'en_NO', 'en_NR', 'en_NU', 'en_NZ', 'en_PG', 'en_PH', 'en_PK', 'en_PL', 'en_PN', 'en_PR', 'en_PT', 'en_PW', 'en_RH', 'en_RO', 'en_RW', 'en_SB', 'en_SC', 'en_SD', 'en_SE', 'en_SG', 'en_SH', 'en_SI', 'en_SK', 'en_SL', 'en_SS', 'en_SX', 'en_SZ', 'en_TC', 'en_TK', 'en_TO', 'en_TT', 'en_TV', 'en_TZ', 'en_UG', 'en_UM', 'en_US', 'en_VC', 'en_VG', 'en_VI', 'en_VU', 'en_WS', 'en_ZA', 'en_ZM', 'en_ZW', 'es_AR', 'es_BO', 'es_BR', 'es_BZ', 'es_CL', 'es_CO', 'es_CR', 'es_CU', 'es_DO', 'es_EA', 'es_EC', 'es_ES', 'es_GQ', 'es_GT', 'es_HN', 'es_IC', 'es_MX', 'es_NI', 'es_PA', 'es_PE', 'es_PH', 'es_PR', 'es_PY', 'es_SV', 'es_US', 'es_UY', 'es_VE', 'eu_ES', 'fa_AF', 'fa_IR', 'fi_FI', 'fo_DK', 'fo_FO', 'fr_BE', 'fr_BF', 'fr_BI', 'fr_BJ', 'fr_BL', 'fr_CA', 'fr_CD', 'fr_CF', 'fr_CG', 'fr_CH', 'fr_CI', 'fr_CM', 'fr_DJ', 'fr_DZ', 'fr_FR', 'fr_GA', 'fr_GF', 'fr_GN', 'fr_GP', 'fr_GQ', 'fr_HT', 'fr_KM', 'fr_LU', 'fr_MA', 'fr_MC', 'fr_MF', 'fr_MG', 'fr_ML', 'fr_MQ', 'fr_MR', 'fr_MU', 'fr_NC', 'fr_NE', 'fr_PF', 'fr_PM', 'fr_RE', 'fr_RW', 'fr_SC', 'fr_SN', 'fr_SY', 'fr_TD', 'fr_TG', 'fr_TN', 'fr_VU', 'fr_WF', 'fr_YT', 'he_IL', 'hr_BA', 'hr_HR', 'hu_HU', 'it_CH', 'it_IT', 'it_SM', 'it_VA', 'ja_JP', 'ko_CN', 'ko_KP', 'ko_KR', 'nl_AW', 'nl_BE', 'nl_BQ', 'nl_CW', 'nl_NL', 'nl_SR', 'nl_SX', 'pl_PL', 'pt_AO', 'pt_BR', 'pt_CH', 'pt_CV', 'pt_GQ', 'pt_GW', 'pt_LU', 'pt_MO', 'pt_MZ', 'pt_PT', 'pt_ST', 'pt_TL', 'ro_MD', 'ro_RO', 'ru_BY', 'ru_KG', 'ru_KZ', 'ru_MD', 'ru_RU', 'ru_UA', 'sk_SK', 'sv_AX', 'sv_FI', 'sv_SE', 'tr_CY', 'tr_TR', 'uk_UA', 'vi_VN']
 
 services:
     # default configuration for services in *this* file
     _defaults:
         autowire: true      # Automatically injects dependencies in your services.
         autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
-        public: false       # Allows optimizing the container by removing unused services; this also means
+        public: false
-                            # fetching services directly from the container via $container->get() won't work.
-                            # The best practice is to be explicit about your dependencies anyway.
         bind:
             $projectDirectory: '%kernel.project_dir%'
             $kernelEnvironment: '%kernel.environment%'
@@ -18,12 +24,14 @@ services:
     # makes classes in src/ available to be used as services
     # this creates a service per class whose id is the fully-qualified class name
     App\:
-        resource: '../src/*'
+        resource: '../src/'
         exclude:
             - '../src/API/Model/'
             - '../src/DependencyInjection/'
-            - '../src/Entity/'
+            - '../src/Doctrine/Extensions/'
             - '../src/Event/'
+            - '../src/Export/Package/'
+            - '../src/Export/Base/'
             - '../src/Form/Model/'
             - '../src/Model/'
             - '../src/Repository/Loader/'
@@ -34,6 +42,9 @@ services:
             - '../src/Kernel.php'
             - '../src/Constants.php'
 
+    # add more service definitions when explicit configuration is needed
+    # please note that last definitions always *replace* previous ones
+
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class
     App\Controller\:
@@ -85,6 +96,9 @@ services:
     App\Timesheet\RateService:
         arguments: ['%kimai.timesheet.rates%']
 
+    App\Timesheet\RateCalculator\RateCalculatorMode:
+        factory: ['@App\Timesheet\RateCalculator\RateCalculatorFactory', getRateCalculatorMode]
+
     # ================================================================================
     # SECURITY & VOTER
     # ================================================================================
@@ -111,58 +125,58 @@ services:
     # ================================================================================
 
     App\Repository\TimesheetRepository:
-        class:     App\Repository\TimesheetRepository
+        class: App\Repository\TimesheetRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Timesheet']
 
     App\Repository\UserRepository:
-        class:     App\Repository\UserRepository
+        class: App\Repository\UserRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\User']
 
     App\Repository\TeamRepository:
-        class:     App\Repository\TeamRepository
+        class: App\Repository\TeamRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Team']
 
     App\Repository\ActivityRepository:
-        class:     App\Repository\ActivityRepository
+        class: App\Repository\ActivityRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Activity']
 
     App\Repository\ProjectRepository:
-        class:     App\Repository\ProjectRepository
+        class: App\Repository\ProjectRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Project']
 
     App\Repository\TagRepository:
-        class:     App\Repository\TagRepository
+        class: App\Repository\TagRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Tag']
 
     App\Repository\CustomerRepository:
-        class:     App\Repository\CustomerRepository
+        class: App\Repository\CustomerRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Customer']
 
     App\Repository\InvoiceTemplateRepository:
-        class:     App\Repository\InvoiceTemplateRepository
+        class: App\Repository\InvoiceTemplateRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\InvoiceTemplate']
 
     App\Repository\ConfigurationRepository:
-        class:     App\Repository\ConfigurationRepository
+        class: App\Repository\ConfigurationRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Configuration']
 
     App\Repository\RoleRepository:
-        class:     App\Repository\RoleRepository
+        class: App\Repository\RoleRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Role']
 
     App\Repository\RolePermissionRepository:
-        class:     App\Repository\RolePermissionRepository
+        class: App\Repository\RolePermissionRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\RolePermission']
 
     App\Repository\InvoiceDocumentRepository:
@@ -170,40 +184,45 @@ services:
         arguments: ['%kimai.invoice.documents%']
 
     App\Repository\CustomerRateRepository:
-        class:     App\Repository\CustomerRateRepository
+        class: App\Repository\CustomerRateRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\CustomerRate']
 
     App\Repository\ActivityRateRepository:
-        class:     App\Repository\ActivityRateRepository
+        class: App\Repository\ActivityRateRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\ActivityRate']
 
     App\Repository\ProjectRateRepository:
-        class:     App\Repository\ProjectRateRepository
+        class: App\Repository\ProjectRateRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\ProjectRate']
 
     App\Repository\InvoiceRepository:
-        class:     App\Repository\InvoiceRepository
+        class: App\Repository\InvoiceRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Invoice']
 
     App\Repository\BookmarkRepository:
-        class:     App\Repository\BookmarkRepository
+        class: App\Repository\BookmarkRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\Bookmark']
 
     App\Repository\WorkingTimeRepository:
-        class:     App\Repository\WorkingTimeRepository
+        class: App\Repository\WorkingTimeRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\WorkingTime']
 
     App\Repository\AccessTokenRepository:
-        class:     App\Repository\AccessTokenRepository
+        class: App\Repository\AccessTokenRepository
-        factory:   ['@doctrine.orm.entity_manager', getRepository]
+        factory: ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\AccessToken']
 
+    App\Repository\ExportTemplateRepository:
+        class: App\Repository\ExportTemplateRepository
+        factory: ['@doctrine.orm.entity_manager', getRepository]
+        arguments: ['App\Entity\ExportTemplate']
+
     monolog.formatter.kimai:
         class: Monolog\Formatter\LineFormatter
         arguments:
@@ -215,3 +234,12 @@ services:
         arguments:
             - "[%%datetime%%] %%message%% %%context%%\n"
             - "Y-m-d H:i:s"
+
+    App\API\ViewHandler:
+        arguments: ['@fos_rest.view_handler.default']
+
+    App\Validator\Constraints\TimesheetAllValidator:
+        arguments: ['%kimai.validator_timesheet%']
+
+    App\Validator\Constraints\QuickEntryTimesheetValidator:
+        arguments: ['%kimai.validator_timesheet%']