more options for future times validation

.docker/000-default.conf

@@ -2,12 +2,14 @@
     ServerAdmin webmaster@localhost
     DocumentRoot /opt/kimai/public
 
+    PassEnv DATABASE_PREFIX
     PassEnv MAILER_FROM
     PassEnv APP_ENV
     PassEnv APP_SECRET
     PassEnv DATABASE_URL
     PassEnv MAILER_URL
     PassEnv TRUSTED_PROXIES
+    PassEnv TRUSTED_HOSTS
 
     <Directory "/opt/kimai/public">
         Require all granted

.docker/dbtest.php

@@ -1,31 +1,35 @@
 <?php
-$DATABASE_HOST = urldecode($argv[1]);
-$DATABASE_BASE = urldecode($argv[2]);
-$DATABASE_PORT = $argv[3];
-$DATABASE_USER = urldecode($argv[4]);
-$DATABASE_PASS = urldecode($argv[5]);
+$DB_HOST = $argv[1];
+$DB_BASE = $argv[2];
+$DB_PORT = $argv[3];
+$DB_USER = $argv[4];
+$DB_PASS = $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=$DATABASE_HOST;dbname=$DATABASE_BASE;port=$DATABASE_PORT", "$DATABASE_USER", "$DATABASE_PASS", [
+    $pdo = new \PDO("mysql:host=$DB_HOST;dbname=$DB_BASE;port=$DB_PORT", "$DB_USER", "$DB_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:
-            // error "Unknown database (1049)" can be ignored, the database will be created by Kimai
-            return;
+            echo 'Unknown database (1049)';
+            die(2);
         // 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) {
-                // error "Unknown database (1049)" can be ignored, the database will be created by Kimai
-                return;
+                echo 'Unknown database (0-1049)';
+                die(3);
             }
             switch ($ex->getMessage()) {
                 // eg. no response (fw) - the startup script should retry it a couple of times

.docker/self-test.sh

@@ -0,0 +1,59 @@
+#!/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

@@ -0,0 +1,61 @@
+#!/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

.docker/startup.sh

@@ -3,21 +3,39 @@
 KIMAI=$(cat /opt/kimai/version.txt)
 echo $KIMAI
 
-function waitForDB() {
-  # Parse sql connection data
-  DATABASE_USER=$(awk -F '[/:@]' '{print $4}' <<< "$DATABASE_URL")
-  DATABASE_PASS=$(awk -F '[/:@]' '{print $5}' <<< "$DATABASE_URL")
-  DATABASE_HOST=$(awk -F '[/:@]' '{print $6}' <<< "$DATABASE_URL")
-  DATABASE_PORT=$(awk -F '[/:@]' '{print $7}' <<< "$DATABASE_URL")
-  DATABASE_BASE=$(awk -F '[/?]' '{print $4}' <<< "$DATABASE_URL")
 
-  re='^[0-9]+$'
-  if ! [[ $DATABASE_PORT =~ $re ]] ; then
-     DATABASE_PORT=3306
+function config() {
+  # set mem limits and copy in custom logger config
+  if [ -z "$memory_limit" ]; then
+    memory_limit=256M
   fi
 
-  echo "Wait for database connection ..."
-  until php /dbtest.php "$DATABASE_HOST" "$DATABASE_BASE" "$DATABASE_PORT" "$DATABASE_USER" "$DATABASE_PASS"; do
+
+  # 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
@@ -26,12 +44,11 @@ function waitForDB() {
 
 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
@@ -73,30 +90,7 @@ function handleStartup() {
   fi
 }
 
-function prepareKimai() {
-  # 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"
-}
-
-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
+config
 handleStartup
-prepareKimai
-runServer
+
+exec /service.sh

.docker/test-lite.sh

@@ -0,0 +1,25 @@
+#!/bin/sh -e
+
+if [ -z "$DATABASE_URL" ]; then
+  DATABASE_URL="mysql://kimai:kimai@127.0.0.1:3306/kimai?charset=utf8mb4&serverVersion=5.7.40"
+fi
+
+/opt/kimai/bin/console kimai:version
+if [ $? != 0 ]; then
+  echo "PHP/Kimai not responding"
+  exit 1
+fi
+
+# Test FPM CGI
+if [ -f /use_fpm ]; then
+    echo Testing FPM
+    php-fpm -t
+fi
+
+# Test Apache/httpd
+if [ -f /use_apache ]; then
+    echo Testing Apache
+    apache2ctl -t
+fi
+
+exit 0

.eslintrc.js

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

.gitattributes

@@ -1,18 +0,0 @@
-.docker export-ignore
-.github export-ignore
-assets export-ignore
-tests export-ignore
-.codecov.yml export-ignore
-.editorconfig export-ignore
-eslint.config.js export-ignore
-.gitattributes export-ignore
-.gitignore 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,3 +1,2 @@
 github: [kevinpapst]
-open_collective: kimai
-custom: ["https://www.kimai.org/", "https://www.kimai.cloud/", "https://www.kevinpapst.de/"]
+custom: ["https://www.kimai.org/donate/", "https://www.paypal.me/kevinpapst"]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -53,11 +53,12 @@ body:
         attributes:
             label: Which PHP version are you using?
             options:
-                - "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,7 +7,6 @@ exclude-labels:
     - 'release'
 exclude-contributors:
     - 'dependabot'
-    - 'weblate'
 change-template: '- $TITLE (#$NUMBER)'
 change-title-escapes: '\<*_&`#@'
 version-resolver:
@@ -22,8 +21,10 @@ version-resolver:
             - 'translation'
     default: patch
 template: |
-    **Compatible with PHP 8.1 to 8.4**
+    [Upgrade Kimai](https://www.kimai.org/documentation/updates.html) - [Install Kimai](https://www.kimai.org/documentation/installation.html) - [Docker](https://tobybatch.github.io/kimai2/)
+
+    **Compatible with PHP 8.1 to 8.3**
     
     $CHANGES
     
-    Involved in this release: $CONTRIBUTORS
+    Involved in this release: $CONTRIBUTORS - thank you!

.github/workflows/docker.yaml

@@ -1,16 +1,17 @@
 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:
+                type: [ dev, prod ]
+                server: [ fpm, apache ]
         runs-on: ubuntu-latest
 
         steps:
@@ -19,75 +20,87 @@ jobs:
               uses: actions/checkout@v4
 
             - name: Install buildx
-              uses: docker/setup-buildx-action@v3
+              uses: docker/setup-buildx-action@v2
+
+            - 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
+              uses: docker/login-action@v2
               with:
                   username: ${{secrets.DOCKERHUB_USERNAME}}
                   password: ${{secrets.DOCKERHUB_PASSWORD}}
 
-            - name: Determine version
+            - name: get lastest version
+              id: remote_version
+              run: echo "kimai_version=$(lastversion https://github.com/kimai/kimai)" >> $GITHUB_ENV
+
+            - name: Build
+              uses: docker/build-push-action@v4
+              with:
+                  context: .
+                  build-args: |
+                      KIMAI=${{ env.kimai_version }}
+                      TIMEZONE=Europe/London
+                      BASE=${{ matrix.server }}
+                  target: ${{ matrix.type }}
+                  platforms: linux/amd64,linux/arm64 #,linux/arm/v8,linux/arm/v7,linux/arm/v6
+                  tags: |
+                      kimai/kimai2:${{ matrix.server }}-${{ matrix.type }}
+                      kimai/kimai2:${{ matrix.server }}-${{ env.kimai_version }}-${{ matrix.type }}
+                  push: true
+            - name: Test Lite
+              run: docker run --rm --entrypoint /assets/test-lite.sh kimai/kimai2:${{ matrix.server }}-${{ matrix.type }}
+
+    tag:
+        needs: build
+        runs-on: ubuntu-latest
+        steps:
+
+            - name: Login to DockerHub
+              uses: docker/login-action@v2
+              with:
+                  username: ${{secrets.DOCKERHUB_USERNAME}}
+                  password: ${{secrets.DOCKERHUB_PASSWORD}}
+
+            - name: Pull images
               run: |
-                  input="${{ github.event.inputs.kimai_tag }}"
-                  
-                  # 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
+                  docker pull kimai/kimai2:fpm-prod
+                  docker pull kimai/kimai2:fpm-dev
+                  docker pull kimai/kimai2:apache-prod
+                  docker pull kimai/kimai2:apache-dev
 
-                  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: Tag fpm
+              run: |
+                  docker tag kimai/kimai2:fpm-prod kimai/kimai2:fpm
+                  docker push kimai/kimai2:fpm
 
-            - name: FPM image
-              uses: docker/build-push-action@v5
-              with:
-                  context: .
-                  file: Dockerfile
-                  build-args: |
-                      KIMAI=${{ env.kimai_version }}
-                      BASE=fpm
-                  target: prod
-                  platforms: linux/amd64,linux/arm64
-                  tags: |
-                      kimai/kimai2:latest
-                      kimai/kimai2:fpm
-                      kimai/kimai2:fpm-${{ env.kimai_version }}
-                  push: true
+            - name: Tag fpm latest
+              run: |
+                  docker tag kimai/kimai2:fpm-prod kimai/kimai2:fpm-latest
+                  docker push kimai/kimai2:fpm-latest
 
-            - name: Apache image
-              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: Tag latest
+              run: |
+                  docker tag kimai/kimai2:fpm-prod kimai/kimai2:latest
+                  docker push kimai/kimai2:latest
 
-            - name: Development image
-              uses: docker/build-push-action@v5
-              with:
-                  context: .
-                  file: Dockerfile
-                  build-args: |
-                      KIMAI=${{ env.kimai_version }}
-                      BASE=apache
-                  target: dev
-                  platforms: linux/amd64,linux/arm64
-                  tags: |
-                      kimai/kimai2:dev
-                  push: true
+            - name: Tag prod
+              run: |
+                  docker tag kimai/kimai2:fpm-prod kimai/kimai2:prod
+                  docker push kimai/kimai2:prod
+
+            - name: Tag apache
+              run: |
+                  docker tag kimai/kimai2:apache-prod kimai/kimai2:apache
+                  docker push kimai/kimai2:apache
+
+            - name: Tag apache latest
+              run: |
+                  docker tag kimai/kimai2:apache-prod kimai/kimai2:apache-latest
+                  docker push kimai/kimai2:apache-latest
+
+            - name: Tag dev
+              run: |
+                  docker tag kimai/kimai2:apache-dev kimai/kimai2:dev
+                  docker push kimai/kimai2:dev

.github/workflows/lock-threads.yaml

@@ -1,29 +0,0 @@
-name: 'Lock Threads'
-
-on:
-    schedule:
-        - cron: '17 1 * * *'
-    workflow_dispatch:
-
-permissions:
-    issues: write
-    pull-requests: write
-
-concurrency:
-    group: lock-threads
-
-jobs:
-    action:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: dessant/lock-threads@v5
-              with:
-                  process-only: 'issues, prs'
-                  github-token: ${{ secrets.GITHUB_TOKEN }}
-                  issue-inactive-days: '90'
-                  issue-comment: >
-                    This thread has been automatically locked since there has not been any recent activity after it was closed. 
-                    Please share your experience with the community and [leave a testimonial](https://love.kimai.org/) to support Kimai.
-                  issue-lock-reason: 'resolved'
-                  pr-inactive-days: '180'
-                  log-output: true

.github/workflows/lock.yaml

@@ -0,0 +1,56 @@
+name: 'Lock Threads'
+
+on:
+    schedule:
+        - cron: '0 0 * * *'
+    workflow_dispatch:
+
+permissions:
+    issues: write
+    pull-requests: write
+
+concurrency:
+    group: lock
+
+jobs:
+    action:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: dessant/lock-threads@v4
+              with:
+                  github-token: ${{ github.token }}
+                  issue-inactive-days: '90'
+                  exclude-issue-created-before: ''
+                  exclude-issue-created-after: ''
+                  exclude-issue-created-between: ''
+                  exclude-issue-closed-before: ''
+                  exclude-issue-closed-after: ''
+                  exclude-issue-closed-between: ''
+                  include-any-issue-labels: ''
+                  include-all-issue-labels: ''
+                  exclude-any-issue-labels: ''
+                  add-issue-labels: ''
+                  remove-issue-labels: ''
+                  issue-comment: >
+                    This thread has been automatically locked since there has not been
+                    any recent activity after it was closed. Please open a new issue for
+                    related bugs.
+                    If you use Kimai on a daily basis, please [consider donating](https://www.kimai.org/donate/) to
+                    support further development of Kimai.
+                  issue-lock-reason: 'resolved'
+                  pr-inactive-days: '180'
+                  exclude-pr-created-before: ''
+                  exclude-pr-created-after: ''
+                  exclude-pr-created-between: ''
+                  exclude-pr-closed-before: ''
+                  exclude-pr-closed-after: ''
+                  exclude-pr-closed-between: ''
+                  include-any-pr-labels: ''
+                  include-all-pr-labels: ''
+                  exclude-any-pr-labels: ''
+                  add-pr-labels: ''
+                  remove-pr-labels: ''
+                  pr-comment: ''
+                  pr-lock-reason: ''
+                  process-only: ''
+                  log-output: false

.github/workflows/release-drafter.yaml

@@ -25,6 +25,6 @@ jobs:
         needs: correct_repository
         runs-on: ubuntu-latest
         steps:
-            - uses: release-drafter/release-drafter@v6
+            - uses: release-drafter/release-drafter@v5
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.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', '8.4']
+                php: ['8.1', '8.2', '8.3']
 
         name: Integration (${{ matrix.php }})
         steps:
@@ -56,13 +56,13 @@ jobs:
                 run: composer install
 
             -   name: Validate Composer
-                run: composer validate --strict --no-check-all
+                run: composer validate --strict
 
             -   name: Warmup cache
                 run: APP_ENV=dev bin/console kimai:reload -n
 
             -   name: Check codestyles
-                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
+                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
 
             -   name: Run PHPStan for application
                 run: vendor/bin/phpstan analyse -c phpstan.neon --no-progress --error-format=checkstyle | cs2pr
@@ -93,6 +93,7 @@ jobs:
                     DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?charset=utf8mb4&serverVersion=8.0.35
                     APP_ENV: test
                     MAILER_URL: null://localhost
+                    TEST_WITH_BUNDLES: 1
 
             -   name: Full test-suite with coverage
                 if: matrix.php == '8.2'
@@ -101,10 +102,11 @@ jobs:
                     DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?charset=utf8mb4&serverVersion=8.0.35
                     APP_ENV: dev
                     MAILER_URL: null://localhost
+                    TEST_WITH_BUNDLES: 1
 
             -   name: Upload code coverage
                 if: matrix.php == '8.2'
-                uses: codecov/codecov-action@v5
+                uses: codecov/codecov-action@v3
                 with:
                     token: ${{ secrets.CODECOV_TOKEN }}
                     files: ./coverage.xml

.github/workflows/website.yaml

@@ -34,7 +34,7 @@ jobs:
           fi
 
       - name: Emit repository_dispatch
-        uses: peter-evans/repository-dispatch@v3
+        uses: peter-evans/repository-dispatch@v2
         with:
           token: ${{ secrets.WEBSITE_ACCESS_TOKEN }}
           repository: kimai/www.kimai.org

.gitignore

@@ -3,6 +3,7 @@
 /.env-*
 /.idea/
 .DS_Store
+/phpstan.sh
 
 # custom apache rules e.g. to deactivate ioncube loader
 /public/.user.ini
@@ -18,7 +19,6 @@
 # for keeping empty directories
 /config/packages/local.yaml
 /config/bundles-local.php
-/var/dev/*
 /var/data/*
 /var/cache/*
 /var/invoices*
@@ -59,6 +59,4 @@
 npm-debug.log
 yarn-error.log
 ###< symfony/webpack-encore-bundle ###
-/nbproject/*
-
-.dockerhub.secrets
+/nbproject/*

.php-cs-fixer.dist.php

@@ -8,9 +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)
     ->setRules([
         'encoding' => true,
@@ -44,7 +42,6 @@ $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'
         ],

CONTRIBUTING.md

@@ -1,16 +1,15 @@
 # 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).
-
+Kimai is an open source project, contributions made by the community are welcome. 
 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` 
+- Verify everything still works with `composer tests-unit` and `composer tests-integration`
 - 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,27 +4,12 @@
 # | . \| | | | | | | (_| | |
 # |_|\_\_|_| |_| |_|\__,_|_|
 #
-# 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, one of: fpm, apache
+# Source base [fpm/apache]
 ARG BASE="fpm"
-# Kimai branch/tag to run
+ARG PHP_VER="8.2"
+ARG COMPOSER_VER="latest"
+# Branch name
 ARG KIMAI="main"
 # Timezone for images
 ARG TIMEZONE="Europe/Berlin"
@@ -33,15 +18,29 @@ ARG TIMEZONE="Europe/Berlin"
 # Shared tools
 ###########################
 
+# full kimai source
+FROM alpine:latest AS git-dev
+# pass-through Arguments in every stage. See: https://benkyriakou.com/posts/docker-args-empty
+ARG KIMAI
+ARG TIMEZONE
+RUN apk add --no-cache git && \
+    git clone --depth 1 --branch ${KIMAI} https://github.com/kimai/kimai.git /opt/kimai
+
+# production kimai source
+FROM git-dev AS git-prod
+
+WORKDIR /opt/kimai
+RUN rm -r tests
+
 # composer base image
-FROM composer:latest AS composer
+FROM composer:${COMPOSER_VER} AS composer
 
 ###########################
 # PHP extensions
 ###########################
 
-# fpm alpine php extension base
-FROM php:8.3-fpm-alpine AS fpm-php-ext-base
+#fpm alpine php extension base
+FROM php:${PHP_VER}-fpm-alpine AS fpm-php-ext-base
 RUN apk add --no-cache \
     # build-tools
     autoconf \
@@ -76,10 +75,11 @@ RUN apk add --no-cache \
     # 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 \
+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 \
@@ -87,6 +87,7 @@ RUN apt-get update && \
         libxslt1-dev \
         libfreetype6-dev
 
+
 # php extension gd - 13.86s
 FROM ${BASE}-php-ext-base AS php-ext-gd
 RUN docker-php-ext-configure gd \
@@ -114,6 +115,11 @@ RUN docker-php-ext-install -j$(nproc) zip
 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
@@ -122,7 +128,9 @@ RUN docker-php-ext-install -j$(nproc) opcache
 # fpm base build
 ###########################
 
-FROM php:8.3-fpm-alpine AS fpm-base
+# fpm base build
+FROM php:${PHP_VER}-fpm-alpine AS fpm-base
+ARG KIMAI
 ARG TIMEZONE
 RUN apk add --no-cache \
         bash \
@@ -137,9 +145,7 @@ RUN apk add --no-cache \
         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
+    touch /use_fpm
 
 EXPOSE 9000
 
@@ -150,12 +156,16 @@ HEALTHCHECK --interval=20s --timeout=10s --retries=3 \
     REQUEST_METHOD=GET \
     cgi-fcgi -bind -connect 127.0.0.1:9000 || exit 1
 
+
+
 ###########################
 # apache base build
 ###########################
 
-FROM php:8.3-apache-bookworm AS apache-base
+FROM php:${PHP_VER}-apache-bookworm AS apache-base
+ARG KIMAI
 ARG TIMEZONE
+COPY .docker/000-default.conf /etc/apache2/sites-available/000-default.conf
 RUN apt-get update && \
     apt-get install -y \
         bash \
@@ -165,32 +175,42 @@ RUN apt-get update && \
         libpng16-16 \
         libzip4 \
         libxslt1.1 \
-        libfreetype6 \
-        unzip && \
+        libfreetype6 && \
     echo "Listen 8001" > /etc/apache2/ports.conf && \
     a2enmod rewrite && \
     touch /use_apache
 
-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 php-base
+FROM ${BASE}-base AS base
+ARG KIMAI
 ARG TIMEZONE
 
+LABEL maintainer="tobias@neontribe.co.uk"
+LABEL maintainer="bastian@schroll-software.de"
+
+ENV KIMAI=${KIMAI}
 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 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 composer
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 
@@ -198,95 +218,66 @@ COPY --from=composer /usr/bin/composer /usr/bin/composer
 
 # 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
+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-20230831/pdo_mysql.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/pdo_mysql.so
+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-20230831/zip.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/zip.so
+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-20230831/ldap.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/ldap.so
+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-20230831/gd.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/gd.so
+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-20230831/intl.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/intl.so
-# PHP extension opcache
+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
 
-###########################
-# 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
-
-LABEL org.opencontainers.image.title="Kimai" \
-      org.opencontainers.image.description="Kimai is a time-tracking application." \
-      org.opencontainers.image.authors="Kimai Community" \
-      org.opencontainers.image.url="https://www.kimai.org/" \
-      org.opencontainers.image.documentation="https://www.kimai.org/documentation/" \
-      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"
-
-ENV KIMAI=${KIMAI}
-ENV TIMEZONE=${TIMEZONE}
-RUN ln -snf /usr/share/zoneinfo/${TIMEZONE} /etc/localtime && echo ${TIMEZONE} > /etc/timezone && \
-    mkdir -p /composer  && \
-    chown -R www-data:www-data /composer
-
-# copy startup script & DB checking script
-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=8.3"
+ENV DATABASE_URL="mysql://kimai:kimai@127.0.0.1:3306/kimai?charset=utf8mb4&serverVersion=5.7.40"
 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 [ "/entrypoint.sh" ]
+CMD [ "/startup.sh" ]
+
+
 
 ###########################
 # final builds
 ###########################
 
-# development build
+# developement build
 FROM base AS dev
 # copy kimai develop source
-COPY --from=git-prod --chown=www-data:www-data /opt/kimai /opt/kimai
+COPY --from=git-dev --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 && \
@@ -297,12 +288,13 @@ 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=512M
+ENV memory_limit=256M
 
-# the "prod" stage (production build) is configured as last stage in the file, as this is the default target in BuildKit
+# production build
 FROM base AS prod
 # copy kimai production source
 COPY --from=git-prod --chown=www-data:www-data /opt/kimai /opt/kimai
@@ -312,7 +304,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 --update-no-dev --working-dir=/opt/kimai laminas/laminas-ldap && \
+    composer --no-ansi require --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 && \
@@ -324,7 +316,8 @@ 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=512M
+ENV memory_limit=256M

README.md

@@ -21,6 +21,15 @@ 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) — EOL since mid of 2023 (PHP 7.4) 
+
+Do **NOT** use Version 1, it won't get any more updates!
+
 ### Links
 
 - [Home](https://www.kimai.org) — Kimai project homepage
@@ -29,20 +38,23 @@ and so much more.
 
 ### Requirements
 
-- PHP 8.1.3 minimum (support for PHP 8.2, 8.3, 8.4)
+- PHP 8.1.3 minimum
 - MariaDB or MySQL
 - A webserver and subdomain (subdirectory is not supported)
 - PHP extensions: `gd`, `intl`, `json`, `mbstring`, `pdo`, `tokenizer`, `xml`, `xsl`, `zip`
 
+Support for PHP 8.2 and 8.3.
+
 ## Installation
 
-- Caddy with Docker-Compose at [Hetzner](https://www.kimai.org/documentation/hosting-hetzner-cloud.html) and [DigitalOcean](https://www.kimai.org/documentation/hosting-digital-ocean.html)
-- [SSH setup](https://www.kimai.org/documentation/installation.html) with Git and Composer
-- [Docker images](https://hub.docker.com/r/kimai/kimai2) with FPM only or incl. Apache
-- [Synology](https://www.kimai.org/documentation/synology.html) user can host the Docker version 
-- [Developer setups](https://www.kimai.org/documentation/developers.html) if you want to create Kimai integrations
+- [Recommended setup](https://www.kimai.org/documentation/installation.html#recommended-setup) — with Git and Composer
+- [Docker](https://hub.docker.com/r/kimai/kimai2) — containerized by [@tobybatch](https://github.com/tobybatch/kimai2)
 
-There are more documented ways for [on-premise hosting](https://www.kimai.org/documentation/chapter-on-premise.html). 
+There are also documentations for:
+- [developer setups](https://www.kimai.org/documentation/developers.html) — on your local machine
+- [shared hostings](https://www.kimai.org/documentation/installation.html#shared-hosting) — the least favorable option
+- [Synology](https://www.kimai.org/documentation/synology.html) — you could try to host the Docker version instead 
+- [1-click installer](https://www.kimai.org/documentation/installation.html#hosting-and-1-click-installations) — hosted environments 
 
 And if you don't want to host Kimai, you can use [the Cloud version](https://www.kimai.cloud/) of it.
 
@@ -53,12 +65,13 @@ And if you don't want to host Kimai, you can use [the Cloud version](https://www
 
 ### Plugins
 
-- [Plugins](https://www.kimai.org/store/) — paid and free plugin marketplace
+- [Plugin marketplace](https://www.kimai.org/store/) — find existing plugins here
 - [Developer documentation](https://www.kimai.org/documentation/developers.html) — how to create a plugin
 
 ## Roadmap and releases
 
-You can see a rough development [roadmap](https://github.com/orgs/kimai/projects/2), which is open for changes and input from the community, your [ideas](https://github.com/kimai/kimai/issues) are welcome.
+You can see a rough development roadmap in the [Milestones](https://github.com/kimai/kimai/milestones) sections.
+It is open for changes and input from the community, your [ideas and questions](https://github.com/kimai/kimai/issues) are welcome.
 
 Release versions will be created on a regular basis, every couple of weeks latest.
 Every code change, whether it's a new feature or a bugfix, will be done on the `main` branch.
@@ -70,7 +83,7 @@ The best way to start is to [open a new issue](https://github.com/kimai/kimai/is
 
 In case you want to contribute, but you wouldn't know how, here are some suggestions:
 
-- Spread the word: Please [write a testimonial for our Wall of love](https://love.kimai.org), vote for Kimai on any software platform, you can toot or tweet about it, share it on LinkedIn, Reddit and any other social media platform!
+- Spread the word: More user means more people testing and contributing to Kimai, which in turn means better stability and more and better features. Please vote for Kimai on any software platform, you can toot or tweet about it, share it on LinkedIn, Reddit or any of your favorite social media platforms. Every bit helps!
 - Answer questions: You know the answer to another user's problem? Share your knowledge.
 - Something can be done better? An essential feature is missing? Create a feature request.
 - Report bugs makes Kimai better for everyone.

SECURITY.md

@@ -1,10 +1,27 @@
 # Security Policy
 
-As announced in the [README](README.md) security fixes will only be added to the `main` branch. 
+## Supported Versions
+
+As announced in the [README](README.md) I only support the latest available release and `main` branch.
 
 | Version              | Supported          |
 |----------------------|--------------------|
 | main branch          | :white_check_mark: |
+| latest minor release | :white_check_mark: |
 | older releases       | :x:                |
 
-You find all information in our [Bughunter documentation](https://www.kimai.org/documentation/bughunter.html).   
+## Reporting a Vulnerability
+
+Please read the [Bughunter](https://www.kimai.org/documentation/bughunter.html) documentation before posting. 
+You can report any security related vulnerability in the [advisory section at GitHub](https://github.com/kimai/kimai/security/advisories) 
+or via email to [support@kimai.org](mailto:support@kimai.org).
+
+I will work as fast as I can to fix the problem and publish a bugfix release / security update. 
+Depending on the size of the required fixes, this might take a couple of hours or a couple of days.
+
+You can expect that your message will be answered ASAP. 
+
+You will be mentioned in the release notes if your issue is valid. 
+I am grateful for any (discrete) disclosure of vulnerabilities!
+
+Please note: if you are asking for money, I will not reply. I receive these scam messages every day...

UPGRADING-3.md

@@ -1,24 +0,0 @@
-# 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 !!**
-
-### Developer
-
-Removed translations:
-- `action.edit`: use `edit` instead
-- `my.profile`: use `user_profile` instead
-- `stats.userAmountToday`: use `` instead
-- `stats.userAmountWeek`: use `` instead
-- `stats.userAmountMonth`: use `` instead
-- `stats.userAmountYear`: use `` instead
-- `stats.userAmountTotal`: use `` instead
-- `update_multiple`

UPGRADING.md

@@ -1,4 +1,4 @@
-# Upgrading Kimai - Version 2.x
+# Upgrading Kimai - Version2.x
 
 _Make sure to create a backup before you start!_ 
 
@@ -10,7 +10,7 @@ Perform EACH version specific task between your version and the new one, otherwi
 
 ## [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)
+The `DATABASE_URL` in your environment settings ([.env](https://github.com/kimai/kimai/issues/4246) or in your [Docker](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)

assets/chart.js

@@ -23,7 +23,6 @@ import {
     Legend,
     Title,
     Tooltip,
-    Colors,
 //    SubTitle
 } from 'chart.js';
 
@@ -51,7 +50,6 @@ Chart.register(
     Legend,
     Title,
     Tooltip,
-    Colors
 //    SubTitle
 );
 

assets/highlight.js

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

assets/js/KimaiLoader.js

@@ -42,7 +42,6 @@ import KimaiNotification from "./plugins/KimaiNotification";
 import KimaiHotkeys from "./plugins/KimaiHotkeys";
 import KimaiRemoteModal from "./plugins/KimaiRemoteModal";
 import KimaiUser from "./plugins/KimaiUser";
-import KimaiAutocompleteTags from "./forms/KimaiAutocompleteTags";
 
 export default class KimaiLoader {
 
@@ -71,7 +70,6 @@ export default class KimaiLoader {
         kimai.registerPlugin(new KimaiDateRangePicker('input[data-daterangepicker="on"]'));
         kimai.registerPlugin(new KimaiDatePicker('input[data-datepicker="on"]'));
         kimai.registerPlugin(new KimaiAutocomplete());
-        kimai.registerPlugin(new KimaiAutocompleteTags());
         kimai.registerPlugin(new KimaiTimesheetForm());
         kimai.registerPlugin(new KimaiTeamForm());
         kimai.registerPlugin(new KimaiCopyDataForm());
@@ -85,7 +83,7 @@ export default class KimaiLoader {
         kimai.registerPlugin(new KimaiDatatable('section.content', 'table.dataTable'));
         kimai.registerPlugin(new KimaiToolbar('form.searchform', 'toolbar-action'));
         kimai.registerPlugin(new KimaiAlternativeLinks('.alternative-link'));
-        kimai.registerPlugin(new KimaiAjaxModalForm('.modal-ajax-form', ['td.multiCheckbox', 'td.actions']));
+        kimai.registerPlugin(new KimaiAjaxModalForm('.modal-ajax-form'));
         kimai.registerPlugin(new KimaiRemoteModal());
         kimai.registerPlugin(new KimaiActiveRecords());
         kimai.registerPlugin(new KimaiAPILink('api-link'));

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/KimaiAutocomplete.js

@@ -6,12 +6,13 @@
  */
 
 import TomSelect from 'tom-select';
-import KimaiFormTomselectPlugin from "./KimaiFormTomselectPlugin";
+import KimaiFormPlugin from "./KimaiFormPlugin";
 
 /**
  * Supporting auto-complete fields via API.
+ * Used for timesheet tagging in toolbar and edit dialogs.
  */
-export default class KimaiAutocomplete extends KimaiFormTomselectPlugin {
+export default class KimaiAutocomplete extends KimaiFormPlugin {
 
     init()
     {
@@ -27,23 +28,11 @@ export default class KimaiAutocomplete extends KimaiFormTomselectPlugin {
         return true;
     }
 
-    loadData(apiUrl, query, callback) {
+    activateForm(form)
+    {
         /** @type {KimaiAPI} API */
         const API = this.getContainer().getPlugin('api');
 
-        API.get(apiUrl, {'name': query}, (data) => {
-            let results = [];
-            for (let item of data) {
-                results.push({text: item.name, value: item.name});
-            }
-            callback(results);
-        }, () => {
-            callback();
-        });
-    }
-
-    activateForm(form)
-    {
         [].slice.call(form.querySelectorAll(this.selector)).map((node) => {
             const apiUrl = node.dataset['autocompleteUrl'];
             let minChars = 3;
@@ -51,7 +40,7 @@ export default class KimaiAutocomplete extends KimaiFormTomselectPlugin {
                 minChars = parseInt(node.dataset['minimumCharacter']);
             }
 
-            let options = {
+            new TomSelect(node, {
                 // see https://github.com/orchidjs/tom-select/issues/543#issuecomment-1664342257
                 onItemAdd: function(){
                     // remove remaining characters from input after selecting an item
@@ -69,21 +58,36 @@ export default class KimaiAutocomplete extends KimaiFormTomselectPlugin {
                     return query.length >= minChars;
                 },
                 load: (query, callback) => {
-                    this.loadData(apiUrl, query, callback);
+                    API.get(apiUrl, {'name': query}, (data) => {
+                        const results = [].slice.call(data).map((result) => {
+                            return {text: result, value: result};
+                        });
+                        callback(results);
+                    }, () => {
+                        callback();
+                    });
                 },
-            };
-
-            let render = {
-                // eslint-disable-next-line
-                not_loading: (data, escape) => {
-                    // no default content
+                render: {
+                    // eslint-disable-next-line
+                    not_loading: (data, escape) => {
+                        // no default content
+                    },
+                    option_create: (data, escape) => {
+                        const name = escape(data.input);
+                        if (name.length < 3) {
+                            return null;
+                        }
+                        const tpl = this.translate('select.search.create');
+                        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>')
+                        return '<div class="no-results">' + tplReplaced + '</div>';
+                    },
                 },
-            };
-
-            const rendererType = (node.dataset['renderer'] !== undefined) ? node.dataset['renderer'] : 'default';
-            options.render = {...render, ...this.getRenderer(rendererType)};
-
-            new TomSelect(node, options);
+            });
         });
     }
 

assets/js/forms/KimaiAutocompleteTags.js

@@ -1,34 +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.
- */
-
-import KimaiAutocomplete from "./KimaiAutocomplete";
-
-/**
- * Used for timesheet tagging in toolbar and edit dialogs.
- */
-export default class KimaiAutocompleteTags extends KimaiAutocomplete {
-
-    init()
-    {
-        this.selector = '[data-form-widget="tags"]';
-    }
-
-    loadData(apiUrl, query, callback) {
-        /** @type {KimaiAPI} API */
-        const API = this.getContainer().getPlugin('api');
-
-        API.get(apiUrl, {'name': query}, (data) => {
-            let results = [];
-            for (let item of data) {
-                results.push({text: item.name, value: item.name, color: item['color-safe']});
-            }
-            callback(results);
-        }, () => {
-            callback();
-        });
-    }
-}

assets/js/forms/KimaiCopyDataForm.js

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

assets/js/forms/KimaiDateNowForm.js

@@ -43,10 +43,7 @@ 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

@@ -10,9 +10,9 @@
  */
 
 import TomSelect from 'tom-select';
-import KimaiFormTomselectPlugin from "./KimaiFormTomselectPlugin";
+import KimaiFormPlugin from "./KimaiFormPlugin";
 
-export default class KimaiFormSelect extends KimaiFormTomselectPlugin {
+export default class KimaiFormSelect extends KimaiFormPlugin {
 
     constructor(selector, apiSelects)
     {
@@ -62,10 +62,13 @@ export default class KimaiFormSelect extends KimaiFormTomselectPlugin {
             plugins.push('remove_button');
         }
 
-        if (node.dataset['order'] !== undefined && node.dataset['order'] === '1') {
-            //plugins.push('caret_position');
+        /*
+        const isOrdering = false;
+        if (isOrdering) {
+            plugins.push('caret_position');
             plugins.push('drag_drop');
         }
+        */
 
         let options = {
             // see https://github.com/orchidjs/tom-select/issues/543#issuecomment-1664342257
@@ -79,22 +82,30 @@ export default class KimaiFormSelect extends KimaiFormTomselectPlugin {
             plugins: plugins,
             // 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
             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 = {
+            option_create: (data, escape) => {
+                const name = escape(data.input);
+                if (name.length < 3) {
+                    return null;
+                }
+                const tpl = this.translate('select.search.create');
+                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>');
+                return '<div class="no-results">' + tplReplaced + '</div>';
+            },
             onOptionAdd: (value) => {
                 node.dispatchEvent(new CustomEvent('create', {detail: {'value': value}}));
             },
         };
 
-        const rendererType = (node.dataset['renderer'] !== undefined) ? node.dataset['renderer'] : 'default';
-        options.render = {...render, ...this.getRenderer(rendererType)};
-
         if (node.dataset['create'] !== undefined) {
             options = {...options, ...{
                 persist: true,
@@ -113,6 +124,44 @@ export default class KimaiFormSelect extends KimaiFormTomselectPlugin {
             }};
         }
 
+        if (node.dataset['renderer'] !== undefined && node.dataset['renderer'] === 'color') {
+            options.render = {...render, ...{
+                option: function(data, escape) {
+                    let item = '<div class="list-group-item border-0 p-1 ps-2 text-nowrap">';
+                    if (data.color !== undefined) {
+                        item += '<span style="background-color:' + data.color + '" class="color-choice-item">&nbsp;</span>';
+                    } else {
+                        item += '<span class="color-choice-item">&nbsp;</span>';
+                    }
+                    item += escape(data.text) + '</div>';
+                    return item;
+                },
+                item: function(data, escape) {
+                    let item = '<div class="text-nowrap">';
+                    if (data.color !== undefined) {
+                        item += '<span style="background-color:' + data.color + '" class="color-choice-item">&nbsp;</span>';
+                    } else {
+                        item += '<span class="color-choice-item">&nbsp;</span>';
+                    }
+                    item += escape(data.text) + '</div>';
+                    return item;
+                }
+            }};
+        } else {
+            options.render = {...render, ...{
+                // the empty entry would collapse and only show as a tiny 5px line if there is no content inside
+                option: function(data, escape) {
+                    let text = data.text;
+                    if (text === null || text.trim() === '') {
+                        text = '&nbsp;';
+                    } else {
+                        text = escape(text);
+                    }
+                    return '<div>' + text + '</div>';
+                }
+            }};
+        }
+
         const select = new TomSelect(node, options);
         node.addEventListener('data-reloaded', (event) => {
             select.clear(true);
@@ -235,13 +284,8 @@ 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));
-
-        // 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);
+        emptyOpts.forEach(child => node.appendChild(child));
 
         // if available, re-select the previous selected option (mostly usable for global activities)
         node.value = selectedValue;
@@ -439,7 +483,7 @@ export default class KimaiFormSelect extends KimaiFormTomselectPlugin {
                     targetSelect.dataset['reloading'] = '0';
                     targetSelect.disabled = false;
                 });
-            };
+            }
 
             document.addEventListener('change', this._eventHandlerApiSelects);
         }
@@ -475,14 +519,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

@@ -1,80 +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.
- */
-
-/*!
- * [KIMAI] KimaiFormPlugin: base class for all none ID plugin that handle forms
- */
-
-import KimaiFormPlugin from './KimaiFormPlugin';
-
-export default class KimaiFormTomselectPlugin extends KimaiFormPlugin {
-
-    /**
-     * @param {string} rendererType
-     * @return array
-     */
-    getRenderer(rendererType)
-    {
-        // default renderer
-
-        let render = {
-            option_create: (data, escape) => {
-                const name = escape(data.input);
-                if (name.length < 3) {
-                    return null;
-                }
-                const tpl = this.translate('select.search.create');
-                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>');
-                return '<div class="no-results">' + tplReplaced + '</div>';
-            },
-        };
-
-        if (rendererType === 'color') {
-            render = {...render, ...{
-                option: function(data, escape) {
-                    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 me-2">&nbsp;</span>';
-                    }
-                    item += escape(data.text) + '</div>';
-                    return item;
-                },
-                item: function(data, escape) {
-                    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 me-2">&nbsp;</span>';
-                    }
-                    item += escape(data.text) + '</div>';
-                    return item;
-                }
-            }};
-        } else {
-            render = {...render, ...{
-                // the empty entry would collapse and only show as a tiny 5px line if there is no content inside
-                option: function(data, escape) {
-                    let text = data.text;
-                    if (text === null || text.trim() === '') {
-                        text = '&nbsp;';
-                    } else {
-                        text = escape(text);
-                    }
-                    return '<div>' + text + '</div>';
-                }
-            }};
-        }
-
-        return render;
-    }
-
-}

assets/js/forms/KimaiTimesheetForm.js

@@ -40,27 +40,17 @@ 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;
         }
 
@@ -118,21 +108,13 @@ 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 = () => {
@@ -142,159 +124,6 @@ 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) {
@@ -458,14 +287,14 @@ export default class KimaiTimesheetForm extends KimaiFormPlugin {
 
     /**
      * Ruleset:
-     * - invalid or empty duration => skip
+     * - invalid 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() || this._duration.value === '') {
+        if (!this._isDurationConnected()) {
             return;
         }
 
@@ -486,11 +315,11 @@ export default class KimaiTimesheetForm extends KimaiFormPlugin {
         if (begin === null && end === null) {
             const newBegin = DateTime.now();
             this._applyDateToField(newBegin, this._beginDate, this._beginTime);
-            this._addSecondsToEndDate(newBegin, seconds);
+            this._applyDateToField(newBegin.plus({seconds: seconds}), null, this._endTime);
         } else if (begin === null && end !== null) {
             this._applyDateToField(end.minus({seconds: seconds}), this._beginDate, this._beginTime);
         } else if (begin !== null && seconds >= 0) {
-            this._addSecondsToEndDate(begin, seconds);
+            this._applyDateToField(begin.plus({seconds: seconds}), null, this._endTime);
         }
     }
 
@@ -538,23 +367,7 @@ export default class KimaiTimesheetForm extends KimaiFormPlugin {
      */
     _getParsedDuration()
     {
-        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 = '';
-        }
+        return this.getDateUtils().parseDuration(this._duration.value.toUpperCase());
     }
 
     /**
@@ -577,122 +390,4 @@ 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/KimaiAPI.js

@@ -19,6 +19,7 @@ export default class KimaiAPI extends KimaiPlugin {
 
     _headers() {
         const headers = new Headers();
+        headers.append('X-AUTH-SESSION', '1');
         headers.append('Content-Type', 'application/json');
 
         return headers;

assets/js/plugins/KimaiAjaxModalForm.js

@@ -17,10 +17,9 @@ import { Modal } from 'bootstrap';
 
 export default class KimaiAjaxModalForm extends KimaiReducedClickHandler {
 
-    constructor(selector, stopSelector) {
+    constructor(selector) {
         super();
         this._selector = selector;
-        this._stopSelector = stopSelector;
     }
 
     getId()
@@ -64,12 +63,12 @@ export default class KimaiAjaxModalForm extends KimaiReducedClickHandler {
 
         this.addClickHandler(this._selector, (href) => {
             this.openUrlInModal(href);
-        }, this._stopSelector);
+        });
     }
 
     _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/KimaiAlternativeLinks.js

@@ -24,7 +24,7 @@ export default class KimaiAlternativeLinks extends KimaiReducedClickHandler {
     init() {
         this.addClickHandler(this._selector, function(href) {
             window.location = href;
-        }, []);
+        });
     }
 
 }

assets/js/plugins/KimaiDateUtils.js

@@ -273,10 +273,7 @@ export default class KimaiDateUtils extends KimaiPlugin {
         let luxonDuration = null;
 
         if (duration.indexOf(':') !== -1) {
-            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);
+            const [, hours, minutes, seconds] = duration.match(/(\d+):(\d+)(?::(\d+))*/);
             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,14 +13,9 @@ import KimaiPlugin from '../KimaiPlugin';
 
 export default class KimaiMultiUpdateTable extends KimaiPlugin {
 
-    getId()
-    {
-        return 'datatable-batch-action';
-    }
-
     init()
     {
-        if (document.getElementsByClassName('multi_update_all').length === 0) {
+        if (document.getElementById('multi_update_all') === null) {
             return;
         }
 
@@ -28,101 +23,64 @@ 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')) {
-                this.toggle(event.target.checked, event.target.closest('table'));
+            if (event.target.matches('#multi_update_all')) {
+                // the "check all" checkbox in the upper start corner of the 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._toggleDatatable(event.target.closest('table'));
+                this._toggleForm();
                 event.stopPropagation();
             }
         });
 
         element.addEventListener('click', (event) => {
             if (event.target.matches('.multi_update_table_action')) {
-                const selectedButton = event.target;
-                const form = selectedButton.form;
-                const ids = form.querySelector('.multi_update_ids').value.split(',');
-                const question = form.dataset['question'].replace(/%action%/, selectedButton.textContent).replace(/%count%/, ids.length.toString());
+                const selectedItem = event.target;
+                const ids = this._getSelectedIds();
+                const form = document.getElementById('multi_update_form');
+                const question = form.dataset['question'].replace(/%action%/, selectedItem.textContent).replace(/%count%/, ids.length.toString());
 
                 /** @type {KimaiAlert} ALERT */
                 const ALERT = this.getPlugin('alert');
                 ALERT.question(question, function(value) {
                     if (value) {
-                        form.action = selectedButton.dataset['href'];
+                        const form = document.getElementById('multi_update_form');
+                        form.action = selectedItem.dataset['href'];
                         form.submit();
                     }
                 });
             }
         });
     }
-
-    /**
-     * @param {boolean} checked
-     * @param {HTMLTableElement} table
-     */
-    toggle(checked, table)
+    
+    _getSelectedIds()
     {
-        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 table.querySelectorAll('input.multi_update_single:checked')) {
+        for (const box of document.querySelectorAll('input.multi_update_single:checked')) {
             ids.push(box.value);
         }
 
-        card.querySelector('.multi_update_ids').value = ids.join(',');
+        return ids;
+    }
+    
+    _toggleForm()
+    {
+        const ids = this._getSelectedIds();
+        document.getElementById('multi_update_table_entities').value = ids.join(',');
 
         if (ids.length > 0) {
-            for (const element of card.querySelectorAll('.multi_update_form_hide')) {
+            for (const element of document.getElementsByClassName('multi_update_form_hide')) {
                 element.style.setProperty('display', 'none', 'important');
             }
-            card.querySelector('form.multi_update_form').style.display = null;//'block';
+            document.getElementById('multi_update_form').style.display = null;//'block';
         } else {
-            card.querySelector('form.multi_update_form').style.setProperty('display', 'none', 'important');
-            for (const element of card.querySelectorAll('.multi_update_form_hide')) {
+            document.getElementById('multi_update_form').style.setProperty('display', 'none', 'important');
+            for (const element of document.getElementsByClassName('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) { // eslint-disable-line no-unused-vars
+        } catch (e) {
             Notification.requestPermission((permission) => {
                 if (permission === "granted") {
                     callback(true);

assets/js/plugins/KimaiReducedClickHandler.js

@@ -15,11 +15,10 @@ export default class KimaiReducedClickHandler extends KimaiPlugin {
 
     /**
      * No _underscore naming for now, as it would be mangled otherwise
-     * @param {string} selector
-     * @param {callback} callback
-     * @param {array<string>} stopSelector
+     * @param selector
+     * @param callback
      */
-    addClickHandler(selector, callback, stopSelector) {
+    addClickHandler(selector, callback) {
         document.body.addEventListener('click', (event) => {
             // event.currentTarget is ALWAYS the body
 
@@ -39,12 +38,6 @@ export default class KimaiReducedClickHandler extends KimaiPlugin {
                     return;
                 }
 
-                for (let x of stopSelector) {
-                    if (target.matches(x)) {
-                        return;
-                    }
-                }
-
                 target = target.parentNode;
             }
 
@@ -61,12 +54,6 @@ export default class KimaiReducedClickHandler extends KimaiPlugin {
                 return;
             }
 
-            for (let x of stopSelector) {
-                if (target.matches(x)) {
-                    return;
-                }
-            }
-
             event.preventDefault();
             event.stopPropagation();
 

assets/js/plugins/KimaiRemoteModal.js

@@ -34,7 +34,7 @@ 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);

assets/js/plugins/KimaiUser.js

@@ -49,11 +49,4 @@ 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,7 +49,6 @@ 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 {
 
@@ -73,6 +72,21 @@ 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 = {
@@ -95,18 +109,18 @@ export default class KimaiCalendar {
             nextYear: this.options['icons']['nextYear'],
         };
         BootstrapTheme.prototype.rtlIconClasses = {
-            prev: this.options['icons']['previous'],
-            next: this.options['icons']['next'],
-            prevYear: this.options['icons']['previousYear'],
-            nextYear: this.options['icons']['nextYear'],
+            prev: this.options['icons']['next'],
+            next: this.options['icons']['previous'],
+            prevYear: this.options['icons']['nextYear'],
+            nextYear: this.options['icons']['previousYear'],
         };
+
         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: this.toInternalViewName(this.options['initialView']),
-            initialDate: this.options['initialDate'],
+            initialView: initialView,
             // https://fullcalendar.io/docs/theming
             themeSystem: 'bootstrap5',
             // https://fullcalendar.io/docs/headerToolbar
@@ -141,9 +155,8 @@ export default class KimaiCalendar {
             slotMinTime: this.options['timeframeBegin'] + ':00',
             slotMaxTime: this.options['timeframeEnd'] === '23:59' ? '24:00:00' : (this.options['timeframeEnd'] + ':59'),
 
-            // deactivate for auto calculation, which does a good job.
-            // but 1h seems to be a "normal distance" for calendar apps (like Google and Apple)
-            slotLabelInterval: '1:00',
+            // auto calculation seems to do the better job, therefor deactivated
+            //slotLabelInterval: this.options['slotDuration'],
 
             // how long should entries look like when they don't have an end
             defaultTimedEventDuration: this.options['slotDuration'],
@@ -159,20 +172,14 @@ 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']
@@ -258,14 +265,8 @@ 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 =============
@@ -409,13 +410,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)
                     },
                 }};
             }
@@ -528,44 +529,6 @@ 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}
@@ -606,7 +569,7 @@ export default class KimaiCalendar {
                 color = apiItem.project.customer.color;
             }
         }
-        if (color === null) {
+        if (color == null) {
             color = defaultColor;
         }
 
@@ -725,73 +688,4 @@ 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,6 +16,7 @@ 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(' ');
@@ -60,7 +61,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 => {
@@ -92,7 +93,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

@@ -26,17 +26,17 @@ $fa-font-path: "~@fortawesome/fontawesome-free/webfonts/";
 /**
  * We need that, to compile the rest of the file
  */
-@import "~bootstrap/scss/functions";
+@import "bootstrap/scss/functions";
 
-@import "~@tabler/core/src/scss/variables";
-@import "~@tabler/core/src/scss/variables-dark";
-@import "~@tabler/core/src/scss/mixins";
+@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";
+@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/_invoice-pdf.scss

@@ -5,30 +5,111 @@
  * file that was distributed with this source code.
  */
 
-body { font-family: sans-serif; font-size: 10pt; margin: 4px; padding: 0; }
-table, tr, td, th, p, h1, h2, h3, h4, h5 { padding: 0; margin: 0;}
-th { border: none; text-align: left; }
-td { vertical-align: top; }
-p { margin-bottom: 12px; }
-.text-small { font-size: 7pt; }
-.padding-left { padding-left: 15px; }
-.text-center { 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; }
-table.addresses { margin-bottom: 30px; }
-table.header { padding-bottom: 4px; border-bottom: 1px solid #999; }
-table.header .title { font-weight: normal; font-size: 140%; }
-table.footer { border-top: 1px solid #999; font-size: 80%; padding-top: 8px; line-height: 14px; }
-table.footer td { vertical-align: top; }
-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; }
+body {
+    font-family: sans-serif;
+    font-size: 10pt;
+    margin: 4px;
+    padding: 0;
+}
+table, tr, td, th, p, h1, h2, h3, h4, h5 {
+    padding: 0;
+    margin: 0;
+}
+th {
+    border: none;
+    text-align: left;
+}
+td {
+    vertical-align: top;
+}
+p {
+    margin-bottom: 12px;
+}
+.text-small {
+    font-size: 7pt;
+}
+.padding-left {
+    padding-left: 15px;
+}
+.text-center {
+    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/content.scss

@@ -52,13 +52,6 @@ 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;
@@ -93,19 +86,3 @@ 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/forms.scss

@@ -26,9 +26,6 @@
                 margin-bottom: 0;
             }
         }
-        .input-group {
-            width: unset;
-        }
     }
 }
 
@@ -36,6 +33,7 @@
     width: 20px;
     height: 20px;
     display: inline-block;
+    margin-right: 10px;
     border-radius: var(--tblr-border-radius);
 }
 
@@ -55,19 +53,4 @@ 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,5 +1,9 @@
 .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/pages.scss

@@ -16,151 +16,23 @@ section.quick-entry-page {
         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 {
-        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;
+        display: table;
+        table-layout: fixed;
     }
 
     /* make the duration field and dropdown smaller */
     #quick_entry_box {
         .duration-widget {
             .input-group {
-                max-width: 50px;
-                min-width: 50px;
+                min-width: 85px;
             }
             .btn-duration-preset {
-                display: none;
-                padding: 7px 5px 7px 2px;
+                padding: 7px 8px 7px 5px;
             }
-            input.duration-input {
-                padding: 7px 5px;
-                max-width: 100%;
-                border-bottom-right-radius: var(--tblr-border-radius);
-                border-top-right-radius: var(--tblr-border-radius);
-            }
-        }
-
-        table.dataTable thead th,
-        table.dataTable td.total {
-            padding: .75rem 2px;
-        }
-    }
-
-    /* make sure dropdown never hides behind table responsive */
-    .dropdown-menu {
-        z-index: 1056;
-    }
-}
-
-@media (min-width: 900px) {
-    section.quick-entry-page {
-        .ts-wrapper {
-            max-width: 170px;
-        }
-    }
-}
-
-@media (min-width: 1000px) {
-    section.quick-entry-page {
-        .ts-wrapper {
-            max-width: 180px;
-        }
-    }
-}
-
-@media (min-width: 1200px) {
-    section.quick-entry-page {
-        .ts-wrapper {
-            max-width: 210px;
-        }
-        .duration-widget {
-            max-width: 100%;
-        }
-    }
-}
-
-@media (min-width: 1250px) {
-    section.quick-entry-page {
-        #quick_entry_box {
-            .duration-widget {
-                .input-group {
-                    max-width: 70px;
-                    min-width: 70px;
-                }
-                .btn-duration-preset {
-                    display: flex;
-                }
-                input.duration-input {
-                    border-bottom-right-radius: 0;
-                    border-top-right-radius: 0;
-                }
-            }
-            table.dataTable thead th,
-            table.dataTable td.total {
-                padding: .75rem;
-            }
-        }
-    }
-}
-
-@media (min-width: 1300px) {
-    section.quick-entry-page {
-        .ts-wrapper {
-            max-width: 230px;
-        }
-    }
-}
-
-@media (min-width: 1400px) {
-    section.quick-entry-page {
-        .ts-wrapper {
-            max-width: 270px;
-        }
-    }
-}
-
-@media (min-width: 1500px) {
-    section.quick-entry-page {
-        .ts-wrapper {
-            max-width: 300px;
-        }
-    }
-}
-
-@media (min-width: 1600px) {
-    section.quick-entry-page {
-        .ts-wrapper {
-            max-width: 370px;
-        }
-    }
-}
-
-@media (min-width: 1800px) {
-    section.quick-entry-page {
-        .ts-wrapper {
-            max-width: 450px;
-        }
-        #quick_entry_box {
-            .duration-widget {
-                .input-group {
-                    max-width: 100%;
-                }
+            input {
+                padding: 7px 3px 7px 7px;
             }
         }
     }

assets/sass/selectpicker.scss

@@ -1,11 +1,7 @@
 
-/*
-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
-*/
+/* bootstrap thead.sticky-top has z-index 1020 and tomselect dropdowns often hide behind that */
 .ts-dropdown {
-    z-index: 1056;
-
+    z-index: 1021;
 }
 
 /* Tabler defines a min-width of 7rem, what makes many input fields become a two-line field

assets/sass/tabler-fixes.scss

@@ -4,7 +4,7 @@ fieldset legend.col-form-label {
 }
 
 /* See project assignment to teams */
-fieldset.form-fieldset > legend {
+fieldset.form-fieldset legend {
     font-size: 1rem;
     font-weight: bold;
 }
@@ -17,46 +17,18 @@ fieldset.form-fieldset > legend {
     --tblr-dropdown-divider-margin-y: .5rem;
 }
 
-/* fix translucent scroll border (e.g. timesheet modal duration dropdown) - see https://github.com/tabler/tabler/issues/1606 */
+/*
+fixes translucent scroll border, e.g. in timesheet modal duration dropdown
+https://github.com/tabler/tabler/issues/1606
+*/
 .dropdown-menu {
     background-clip: border-box;
 }
 
-/* hide empty fieldset - see https://github.com/tabler/tabler/issues/1650 */
+/*
+hide empty fieldset
+https://github.com/tabler/tabler/issues/1650
+*/
 fieldset:empty {
     display: none;
 }
-
-:host,:root,[data-bs-theme=light] {
-    /* remove the shadow from all form element groups */
-    --tblr-box-shadow-input: none;
-}
-
-.navbar[data-bs-theme=dark] {
-    /* give navigation elements slightly higher contrast */
-    --tblr-navbar-color: hsla(0,0%,100%,.8);
-}
-
-/* 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;
-}
-
-[data-bs-theme=dark] {
-    /* fixes  https://github.com/tabler/tabler/issues/1974 */
-    .litepicker .container__days .day-item.is-in-range {
-        --litepicker-is-in-range-color: var(--tblr-primary-text-emphasis);
-    }
-}
-
-/* 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;
-}

assets/sass/tables.scss

@@ -98,7 +98,7 @@ table.dataTable {
             width: 15px;
         }
         &.overlapping {
-            border-top: 2px solid rgba(214,57,57,.2);
+            border-top: 2px solid rgba(214,57,57,.1);
         }
         &.exported {
             opacity: 0.7;
@@ -123,7 +123,7 @@ table.dataTable {
     }
     th.weekend,
     td.weekend {
-        background-color: var(--tblr-bg-surface-tertiary);
+        background-color: var(--tblr-bg-surface-secondary);
     }
     /* order is important, "today” should overwrite "weekend" therefor later in the file */
     th.today {

assets/sass/theme-dark.scss

@@ -1,22 +1,7 @@
-
 @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 {
-        thead .sorting:after {
-            opacity: $dark-font-opacity;
+        th.today {
+            color: var(--tblr-muted);
         }
     }
 
@@ -27,16 +12,4 @@
             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;
-    }
 }

babel.config.js

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

composer.json

@@ -14,7 +14,7 @@
         }
     ],
     "require": {
-        "php": "8.1.*||8.2.*||8.3.*||8.4.*",
+        "php": "8.1.*||8.2.*||8.3.*",
         "ext-gd": "*",
         "ext-intl": "*",
         "ext-json": "*",
@@ -28,23 +28,21 @@
         "azuyalabs/yasumi": "^2.6",
         "composer/semver": "^3.3",
         "doctrine/doctrine-bundle": "^2.7",
-        "doctrine/doctrine-migrations-bundle": "^3.3",
+        "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.8",
-        "easybill/zugferd-php": "^2.1",
         "endroid/qr-code": "^4.8",
         "erusev/parsedown": "^1.6",
         "friendsofsymfony/rest-bundle": "^3.0",
         "gedmo/doctrine-extensions": "^3.6",
         "jms/serializer-bundle": "^5.0",
-        "kevinpapst/tabler-bundle": "^1.4",
+        "kevinpapst/tabler-bundle": "^1.2",
         "league/csv": "^9.4",
         "mpdf/mpdf": "^8.0",
-        "nelmio/api-doc-bundle": "^5.0",
+        "nelmio/api-doc-bundle": "^4.0",
         "nelmio/cors-bundle": "^2.0",
         "onelogin/php-saml": "^4.0",
-        "openspout/openspout": "^4.0",
         "pagerfanta/pagerfanta": "^3.0",
-        "phpoffice/phpspreadsheet": "^2.0",
+        "phpoffice/phpspreadsheet": "^1.16",
         "phpoffice/phpword": "^1.0",
         "psr/container": "^2.0",
         "psr/log": "^3.0",
@@ -63,7 +61,6 @@
         "symfony/mailer": "^6.0",
         "symfony/mime": "^6.0",
         "symfony/monolog-bundle": "^3.4",
-        "symfony/process": "^6.0",
         "symfony/rate-limiter": "^6.0",
         "symfony/runtime": "^6.0",
         "symfony/security-bundle": "^6.0",
@@ -86,13 +83,12 @@
         "doctrine/doctrine-fixtures-bundle": "^3.2",
         "fakerphp/faker": "^1.15",
         "friendsofphp/php-cs-fixer": "^3.3",
-        "phpstan/phpstan": "^2.0",
-        "phpstan/phpstan-deprecation-rules": "^2.0",
-        "phpstan/phpstan-doctrine": "^2.0",
-        "phpstan/phpstan-phpunit": "^2.0",
-        "phpstan/phpstan-strict-rules": "^2.0",
-        "phpstan/phpstan-symfony": "^2.0",
-        "phpunit/phpunit": "^10.0",
+        "phpstan/phpstan": "^1.0",
+        "phpstan/phpstan-doctrine": "^1.0",
+        "phpstan/phpstan-phpunit": "^1.0",
+        "phpstan/phpstan-strict-rules": "^1.0",
+        "phpstan/phpstan-symfony": "^1.0",
+        "phpunit/phpunit": "9.5.*",
         "symfony/browser-kit": "^6.0",
         "symfony/css-selector": "^6.0",
         "symfony/debug-bundle": "^6.0",
@@ -137,10 +133,6 @@
         "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-php81": "*",
         "symfony/polyfill-php80": "*",
@@ -178,6 +170,7 @@
             "@tests-integration"
         ],
         "linting": [
+            "composer validate --strict",
             "bin/console lint:container",
             "bin/console lint:yaml config --parse-tags",
             "bin/console lint:twig templates --show-deprecations",
@@ -204,6 +197,9 @@
         "symfony/symfony": "*"
     },
     "extra": {
+        "branch-alias": {
+            "dev-main": "2.0.x-dev"
+        },
         "symfony": {
             "id": "01C3FWRDJJEX9K6Y3A4XDFXPBR",
             "allow-contrib": true,

config/packages/doctrine.yaml

@@ -22,12 +22,7 @@ doctrine:
 
         types:
             datetime: App\Doctrine\UTCDateTimeType
-            datetime_immutable: App\Doctrine\UTCDateTimeImmutableType
     orm:
-        controller_resolver:
-            # FIXME this is causing a deprecation and needs to be changed
-            # auto_mapping: false
-            auto_mapping: true
         auto_generate_proxy_classes: '%kernel.debug%'
         default_entity_manager: default
         enable_lazy_ghost_objects: true

config/packages/framework.yaml

@@ -7,8 +7,6 @@ framework:
     csrf_protection: true
     annotations: false
     handle_all_throwables: true
-    disallow_search_engine_index: true
-    set_content_language_from_locale: true
 
     serializer:
         enable_attributes: true

config/packages/kimai.yaml

@@ -105,22 +105,21 @@ 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','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: []
         # mapping a "role name" to an array of "set names"
         maps:
-            ROLE_USER: ['TIMESHEET','PROFILE', 'EVERYONE']
-            ROLE_TEAMLEAD: ['ACTIVITIES_TEAMLEAD','PROJECTS_TEAMLEAD','CUSTOMERS_TEAMLEAD','TIMESHEET_OTHER','INVOICE','TIMESHEET','PROFILE','EXPORT','BILLABLE','TAGS','REPORTING', 'EVERYONE']
-            ROLE_ADMIN: ['ACTIVITIES','PROJECTS','CUSTOMERS','INVOICE','INVOICE_ADMIN','TIMESHEET','TIMESHEET_OTHER','PROFILE','TEAMS','RATE','RATE_OTHER','EXPORT','BILLABLE','TAGS','LOCKDOWN','REPORTING', 'EVERYONE']
-            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']
+            ROLE_USER: ['TIMESHEET','PROFILE']
+            ROLE_TEAMLEAD: ['ACTIVITIES_TEAMLEAD','PROJECTS_TEAMLEAD','CUSTOMERS_TEAMLEAD','TIMESHEET_OTHER','INVOICE','TIMESHEET','PROFILE','EXPORT','BILLABLE','TAGS','REPORTING']
+            ROLE_ADMIN: ['ACTIVITIES','PROJECTS','CUSTOMERS','INVOICE','INVOICE_ADMIN','TIMESHEET','TIMESHEET_OTHER','PROFILE','TEAMS','RATE','RATE_OTHER','EXPORT','BILLABLE','TAGS','LOCKDOWN','REPORTING']
+            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']
         # mapping a "role name" to an array of "permission names"
         roles:
             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']
-            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','create_export_template']
+            ROLE_TEAMLEAD: ['view_rate_own_timesheet','view_rate_other_timesheet','hourly-rate_own_profile','view_team_member']
+            ROLE_ADMIN: ['hourly-rate_own_profile','edit_exported_timesheet','teams_own_profile','view_team_member','view_all_data','contract_other_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']
 # --------------------------------------------------------------------------------
 
 

config/packages/monolog.yaml

@@ -6,16 +6,11 @@ when@prod:
         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$']}
+                action_level: notice
+                handler: nested
+                excluded_http_codes: [403, 404]
                 channels: ["!deprecation"]
-            file_log:
+            nested:
                 type: stream
                 level: info
                 path: "%kernel.logs_dir%/%kernel.environment%.log"
@@ -24,25 +19,21 @@ when@prod:
                 type: console
                 process_psr_3_messages: false
                 channels: ["!event", "!doctrine", "!deprecation"]
+# deactivated, because currently there are too many deprecations cause by gedmo and doctrine
+#            deprecation:
+#                type: stream
+#                channels: ["deprecation"]
+#                path: "%kernel.logs_dir%/deprecations.log"
+#                formatter: monolog.formatter.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: ['/homepage$', '/login_check$', '/export/data$']}
-                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

config/packages/nelmio_api_doc.yaml

@@ -1,5 +1,4 @@
 nelmio_api_doc:
-    operation_id_generation: conditionally_prepend
     models:
         use_jms: true
         names:
@@ -41,31 +40,27 @@ nelmio_api_doc:
             - { alias: TeamCollection,              type: App\Entity\Team,                          groups: [Default, Collection, Team] }
             - { alias: TeamMember,                  type: App\Entity\TeamMember,                    groups: [Team_Entity] }
             - { alias: TeamMembership,              type: App\Entity\TeamMember,                    groups: [User_Entity] }
-            - { alias: Invoice,                     type: App\Entity\Invoice,                       groups: [Default, Entity, Invoice, Invoice_Entity] }
-            - { alias: InvoiceCollection,           type: App\Entity\Invoice,                       groups: [Default, Collection, Invoice] }
     areas:
-        default:
-            path_patterns:
-                - ^/api(?!/doc)
-            security:
-                bearer:
-                    type: 'http'
-                    description: 'API Token'
-                    bearerFormat: 'KIMAI'
-                    scheme: 'bearer'
+        path_patterns:
+            - ^/api(?!/doc)
     documentation:
         info:
-            title: Kimai - API
+            title: Kimai - API Docs
             description: |
-                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.1'
+                JSON API for the Kimai time-tracking software: [API documentation](https://www.kimai.org/documentation/rest-api.html), [Swagger definition file](doc.json)
+            version: '0.7'
+        components:
+            securitySchemes:
+                apiUser:
+                    type: apiKey
+                    description: 'Value: {Username}'
+                    name: X-AUTH-USER
+                    in: header
+                apiToken:
+                    type: apiKey
+                    description: 'Value: {API Token}'
+                    name: X-AUTH-TOKEN
+                    in: header
         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 }
+            - X-AUTH-USER: []
+              X-AUTH-TOKEN: []

config/packages/nelmio_cors.yaml

@@ -3,7 +3,12 @@ parameters:
 
 nelmio_cors:
     defaults:
-        # for security reasons we do not allow CORS by default
+        allow_credentials: false
+#        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: []
@@ -13,17 +18,8 @@ nelmio_cors:
         origin_regex: true
         forced_allow_origin_value: ~
     paths:
-        # only the API endpoints are accessible
         '^/api/':
-            # allow_origin: ['%env(CORS_ALLOW_ORIGIN)%']
             allow_origin: ['*']
-            allow_headers: ['Content-Type', 'Authorization', 'X-AUTH-USER', 'X-AUTH-TOKEN']
+            allow_headers: ['X-AUTH-USER', 'X-AUTH-TOKEN', 'Content-Type']
             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

@@ -1,21 +0,0 @@
-framework:
-    rate_limiter:
-        session_prediction:
-            policy: 'fixed_window'
-            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/security.yaml

@@ -18,10 +18,6 @@ security:
             security: false
 
         api:
-            access_token:
-                token_handler: App\API\Authentication\AccessTokenHandler
-                success_handler: App\API\Authentication\AccessTokenSuccessHandler
-                remember_me: false
             request_matcher: App\API\Authentication\ApiRequestMatcher
             user_checker: App\Security\UserChecker
             stateless: true
@@ -39,6 +35,7 @@ security:
             entry_point: form_login
 
             custom_authenticators:
+                - App\API\Authentication\SessionAuthenticator
                 - App\Saml\SamlAuthenticator
 
             remember_me:
@@ -63,7 +60,7 @@ security:
             logout:
                 path: logout
                 target: homepage
-                enable_csrf: false
+                enable_csrf: true
 
             login_throttling:
                 max_attempts: 5
@@ -72,11 +69,10 @@ security:
             login_link:
                 check_route: link_login_check
                 signature_properties: ['id']
-                lifetime: 900
-                max_uses: 3
+                lifetime: 300
+                max_uses: 1
 
     access_decision_manager:
-        # only grants access if there is no voter denying access
         strategy: unanimous
         allow_if_all_abstain: false
 
@@ -89,13 +85,13 @@ security:
     access_control:
         - { path: '^/auth/2fa', role: IS_AUTHENTICATED_2FA_IN_PROGRESS }
         - { path: '^/auth', roles: PUBLIC_ACCESS }
-        - { path: '^/{_locale}$', role: PUBLIC_ACCESS }
-        - { path: '^/{_locale}/auth', role: PUBLIC_ACCESS }
-        - { path: '^/{_locale}/login', role: PUBLIC_ACCESS }
-        - { path: '^/{_locale}/register', role: PUBLIC_ACCESS }
-        - { path: '^/{_locale}/resetting', role: PUBLIC_ACCESS }
-        - { path: '^/{_locale}/', roles: ROLE_USER }
-        - { path: '^/api', roles: IS_AUTHENTICATED }
+        - { path: '^/(%app_locales%)$', role: PUBLIC_ACCESS }
+        - { path: '^/(%app_locales%)/auth', role: PUBLIC_ACCESS }
+        - { path: '^/(%app_locales%)/login', role: PUBLIC_ACCESS }
+        - { path: '^/(%app_locales%)/register', role: PUBLIC_ACCESS }
+        - { path: '^/(%app_locales%)/resetting', role: PUBLIC_ACCESS }
+        - { path: '^/(%app_locales%)/', roles: ROLE_USER }
+        - { path: '^/api', roles: IS_AUTHENTICATED_REMEMBERED }
 
 when@test:
     # this configuration simplifies testing URLs protected by the security mechanism
@@ -108,3 +104,7 @@ when@test:
                 cost: 4 # Lowest possible value for bcrypt
                 time_cost: 3 # Lowest possible value for argon
                 memory_cost: 10 # Lowest possible value for argon
+
+        firewalls:
+            secured_area:
+                http_basic: ~

config/packages/tabler.yaml

@@ -29,6 +29,7 @@ tabler:
     routes:
         tabler_welcome: dashboard
         tabler_login: login
+        tabler_logout: logout
         tabler_login_check: security_check
         tabler_registration: registration_register
         tabler_registration_register: registration_register
@@ -47,7 +48,6 @@ 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
@@ -69,10 +69,10 @@ tabler:
         documentation: fas fa-book
         dot: fas fa-circle
         download: fas fa-download
-        duration: fas fa-stopwatch
+        duration: far fa-hourglass
         edit: far fa-edit
-        end: fas fa-hourglass-end
-        export: fas fa-download
+        end: fas fa-stopwatch
+        export: fas fa-file-export
         failure: fas fa-times
         fax: fas fa-fax
         filter: fas fa-filter
@@ -122,7 +122,7 @@ tabler:
         search: fas fa-search
         settings: fas fa-cog
         shop: fas fa-shopping-cart
-        spinner: fas fa-spinner
+        spinner: fas fa-spinner fa-pulse
         start: fas fa-play
         start-small: far fa-play-circle
         stop: fas fa-stop

config/packages/translation.yaml

@@ -1,6 +1,4 @@
 framework:
-    # https://symfony.com/doc/current/reference/configuration/framework.html#enabled-locales
-    enabled_locales: '%kimai_locales%'
     default_locale: '%locale%'
     translator:
         default_path: '%kernel.project_dir%/translations'

config/packages/twig.yaml

@@ -5,5 +5,7 @@ twig:
         - '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

config/routes.yaml

@@ -2,13 +2,20 @@ controllers:
     resource: ../src/Controller/
     type: attribute
     prefix: /{_locale}
+    requirements:
+        _locale: '%app_locales%'
     defaults:
         _locale: '%locale%'
 
 api.swagger_ui:
     path: /api/doc
     methods: GET
-    defaults: { _controller: nelmio_api_doc.controller.stoplight }
+    defaults: { _controller: nelmio_api_doc.controller.swagger_ui }
+
+api.swagger:
+    path: /api/doc.json
+    methods: GET
+    defaults: { _controller: nelmio_api_doc.controller.swagger }
 
 api:
     resource: ../src/API/
@@ -24,6 +31,8 @@ security:
     resource: ../src/Controller/Security/
     type: attribute
     prefix: /{_locale}
+    requirements:
+        _locale: '%app_locales%'
     defaults:
         _locale: '%locale%'
 
@@ -40,6 +49,8 @@ home:
 
 homeLocale:
     path: /{_locale}
+    requirements:
+        _locale: '%app_locales%'
     defaults:
         _controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController::redirectAction
         _locale: '%locale%'

config/routes/dev/twig.yaml

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

config/routes/test/test_routes.yaml

@@ -1,5 +1,7 @@
 app.test.active_entries:
     path: /{_locale}/layou/active_entries
     controller: App\Controller\LayoutController::activeEntries
+    requirements:
+        _locale: '%app_locales%'
     defaults:
         _locale: '%locale%'

config/services.yaml

@@ -1,14 +1,16 @@
 parameters:
     locale: en
-    # can be regenerated with: bin/console kimai:reset:locales
-    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']
+    # can be regenerated with "bin/console kimai:reset:locales"
+    app_locales: ar|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|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
 
 services:
     # default configuration for services in *this* file
     _defaults:
-        autowire: true
-        autoconfigure: true
-        public: false
+        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
+                            # 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%'
@@ -20,17 +22,13 @@ services:
         exclude:
             - '../src/API/Model/'
             - '../src/DependencyInjection/'
-            - '../src/Doctrine/Extensions/'
             - '../src/Entity/'
-            - '../src/Event/'
-            - '../src/Export/Package/'
-            - '../src/Form/Model/'
-            - '../src/Model/'
             - '../src/Repository/Loader/'
             - '../src/Repository/Paginator/'
             - '../src/Repository/Query/'
             - '../src/Repository/Result/'
-            - '../src/WorkingTime/Calculator/'
+            - '../src/Event/'
+            - '../src/Model/'
             - '../src/Kernel.php'
             - '../src/Constants.php'
 
@@ -102,9 +100,7 @@ services:
     # SAML Services
     # ================================================================================
     App\Saml\SamlProvider:
-        arguments:
-            $userProvider: '@security.user.provider.concrete.kimai_internal'
-            $configuration: '@App\Configuration\SamlConfigurationInterface'
+        arguments: ['@App\Repository\UserRepository', '@security.user.provider.concrete.kimai_internal', '@App\Configuration\SamlConfigurationInterface']
 
     # ================================================================================
     # REPOSITORIES
@@ -199,16 +195,6 @@ services:
         factory:   ['@doctrine.orm.entity_manager', getRepository]
         arguments: ['App\Entity\WorkingTime']
 
-    App\Repository\AccessTokenRepository:
-        class:     App\Repository\AccessTokenRepository
-        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:

config/services_test.yaml

@@ -1,6 +1,6 @@
 parameters:
     locale: en
-    kimai_locales: ['ar', 'cs', 'de', 'de_CH', 'da', 'en', 'eo', 'es', 'eu', 'fr', 'he', 'hu', 'it', 'ja', 'ko', 'nl', 'pl', 'pt_BR', 'ro', 'ru', 'sk', 'sv', 'tr', 'vi', 'zh_CN']
+    app_locales: ar|cs|de|de_CH|da|en|eo|es|eu|fr|he|hu|it|ja|ko|nl|pl|pt_BR|ro|ru|sk|sv|tr|vi|zh_CN
 
 services:
     _defaults:
@@ -23,3 +23,7 @@ services:
     App\User\UserService:
         public: true
         arguments: ['@App\Repository\UserRepository', '@event_dispatcher', '@validator', '@App\Configuration\SystemConfiguration', '@security.user_password_hasher']
+
+    App\Plugin\PluginManager:
+        public: true
+        arguments: [!tagged kimai.plugin]

eslint.config.mjs

@@ -1,22 +0,0 @@
-import js from "@eslint/js";
-import globals from "globals";
-
-export default [
-    js.configs.recommended,
-    {
-        files: ["assets/js/**/*.js"],
-        ignores: ["assets/*.js"],
-        rules: {
-            eqeqeq: 1,
-            curly: "error",
-            semi: ["warn", "always"],
-        },
-        languageOptions: {
-            globals: {
-                ...globals.browser,
-                ...globals.node,
-                ...globals.amd,
-            }
-        }
-    },
-];

kimai.sh

@@ -1,117 +0,0 @@
-#!/bin/bash
-
-# --------------------------------------------------------------------------------
-# This script was added with 2.24.0 and is in BETA status.
-#
-# To improve this script across platforms I need your feedback!
-# --------------------------------------------------------------------------------
-
-function update_kimai() {
-    if [[ "$1" =~ ^([0-9]+\.){2,3}[0-9]+$ ]]; then
-        export VERSION=$1
-    else
-        echo "You need to supply a full Kimai version like: \"2.24.0\""
-        exit 1
-    fi
-    git checkout -- composer.json
-    git checkout -- composer.lock
-    git checkout -- symfony.lock
-
-    if [[ -n $(git status --porcelain) ]]; then
-        echo "Cannot update: file changes detected. Run \"git status\" for details."
-        exit 1
-    fi
-
-    rm -rf var/sessions/ 2>&1
-    rm -rf var/cache/* 2>&1
-    git fetch --tags
-    git checkout "$VERSION"
-    $KIMAI_PHP "$KIMAI_COMPOSER" install --no-dev --optimize-autoloader
-
-    $KIMAI_PHP bin/console kimai:install
-
-    install_plugins
-
-    if [[ -z "${KIMAI_NO_PERMS}" ]]; then
-        set_permission
-    fi
-}
-
-function install_plugins() {
-    # detect if there are additional plugins that we need to install
-    packages="$($PHP bin/console kimai:plugin --composer)"
-    export PACKAGES=$packages
-    if [ -n "$PACKAGES" ]; then
-        $KIMAI_PHP "$KIMAI_COMPOSER" require "$PACKAGES"
-        $KIMAI_PHP bin/console kimai:plugins --install
-    fi
-}
-
-function set_permission() {
-    chown -R "$KIMAI_USER":"$KIMAI_GROUP" .
-    chmod -R g+r .
-    chmod -R g+rw var/
-}
-
-if [[ -z "${KIMAI_USER}" ]]; then
-    export KIMAI_USER=""
-fi
-
-if [[ -z "${KIMAI_GROUP}" ]]; then
-    export KIMAI_GROUP="www-data"
-fi
-
-if [[ -z "${KIMAI_PHP}" ]]; then
-    export KIMAI_PHP="php"
-fi
-
-if [[ -z "${KIMAI_COMPOSER}" ]]; then
-    export KIMAI_COMPOSER="composer"
-fi
-
-cd "$(dirname "$0")" || { echo "Cannot change working directory."; exit 1; }
-
-# we need a few commands installed in order for this script to complete
-command -v $KIMAI_COMPOSER >/dev/null 2>&1 || { echo >&2 "Update requires 'composer' but it's not installed."; exit 1; }
-command -v git >/dev/null 2>&1 || { echo >&2 "Update requires 'git' but it's not installed."; exit 1; }
-command -v $KIMAI_PHP >/dev/null 2>&1 || { echo >&2 "Update requires 'php' but it's not installed."; exit 1; }
-
-if [[ -n $1 ]]; then
-    if [ "$1" == 'update' ]; then
-        update_kimai "$2"
-        exit
-    elif [ "$1" == 'permission' ]; then
-        set_permission
-        exit
-    elif [ "$1" == 'plugins' ]; then
-        install_plugins
-        exit
-    else
-        echo ""
-        echo ">> Unknown command: $1"
-    fi
-fi
-
-echo ""
-echo "This script has the following sub-commands:"
-echo ""
-echo "$0 update <version>  - Install Kimai version <version>"
-echo "$0 permission        - Fix file permissions"
-echo "$0 plugins           - Install plugins from var/packages/*.zip"
-echo ""
-echo "Use the following environment variables to customize the runtime:"
-echo ""
-echo "KIMAI_USER                   - Username of the webserver/php process that needs write access"
-echo "KIMAI_GROUP                  - Group of the webserver/php process that needs write access"
-echo "KIMAI_PHP                    - Full path to PHP executable in the correct version"
-echo "KIMAI_COMPOSER               - Path to composer executable or .phar file"
-echo "KIMAI_NO_PERMS               - Skip changing permissions"
-echo ""
-echo "Examples:"
-echo ""
-echo "$0 2.24.0"
-echo "KIMAI_PHP=/usr/bin/php8.3 $0 2.24.0"
-echo "KIMAI_PHP=/usr/bin/php8.3 KIMAI_COMPOSER=/tmp/composer.phar $0 2.24.0"
-echo "KIMAI_PHP=php8.3 KIMAI_GROUP=httpd $0 2.24.0"
-echo "KIMAI_NO_PERMS=1 KIMAI_PHP=/usr/bin/php8.3 $0 2.24.0"
-echo ""

migrations/MigrationTemplate.txt

@@ -24,15 +24,11 @@ final class <className> extends AbstractMigration
 
     public function up(Schema $schema): void
     {
-        $this->abortIf(true, 'Migration was auto-generated, adapt to your needs before running it.');
-
 <up>
     }
 
     public function down(Schema $schema): void
     {
-        $this->abortIf(true, 'Migration was auto-generated, adapt to your needs before running it.');
-
 <down>
     }<override>
 }

migrations/Version20190219200020.php

@@ -23,9 +23,9 @@ final class Version20190219200020 extends AbstractMigration
 {
     public function up(Schema $schema): void
     {
-        $this->addSql("DELETE FROM kimai2_user_preferences WHERE name = 'theme.fixed_layout'");
-        $this->addSql("DELETE FROM kimai2_user_preferences WHERE name = 'theme.boxed_layout'");
-        $this->addSql("DELETE FROM kimai2_user_preferences WHERE name = 'theme.mini_sidebar'");
+        $this->addSql('DELETE FROM kimai2_user_preferences WHERE name = "theme.fixed_layout"');
+        $this->addSql('DELETE FROM kimai2_user_preferences WHERE name = "theme.boxed_layout"');
+        $this->addSql('DELETE FROM kimai2_user_preferences WHERE name = "theme.mini_sidebar"');
     }
 
     public function down(Schema $schema): void

migrations/Version20240214061246.php

@@ -1,51 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-namespace DoctrineMigrations;
-
-use App\Doctrine\AbstractMigration;
-use Doctrine\DBAL\Schema\Schema;
-
-/**
- * @version 2.14
- */
-final class Version20240214061246 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Adds the table for API access tokens';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $accessTokens = $schema->createTable('kimai2_access_token');
-
-        $accessTokens->addColumn('id', 'integer', ['autoincrement' => true, 'notnull' => true]);
-        $accessTokens->addColumn('user_id', 'integer', ['notnull' => true]);
-        $accessTokens->addColumn('token', 'string', ['notnull' => true, 'length' => 100]);
-        $accessTokens->addColumn('name', 'string', ['notnull' => true, 'length' => 50]);
-        $accessTokens->addColumn('last_usage', 'datetime_immutable', ['notnull' => false, 'default' => null]);
-        $accessTokens->addColumn('expires_at', 'datetime_immutable', ['notnull' => false, 'default' => null]);
-
-        $accessTokens->setPrimaryKey(['id']);
-
-        $accessTokens->addIndex(['user_id'], 'IDX_6FB0DB1EA76ED395');
-        $accessTokens->addUniqueIndex(['token'], 'UNIQ_6FB0DB1E5F37A13B');
-
-        $accessTokens->addForeignKeyConstraint('kimai2_users', ['user_id'], ['id'], ['onDelete' => 'CASCADE'], 'FK_6FB0DB1EA76ED395');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $table = $schema->getTable('kimai2_access_token');
-        $table->removeForeignKey('FK_6FB0DB1EA76ED395');
-
-        $schema->dropTable('kimai2_access_token');
-    }
-}

migrations/Version20240326125247.php

@@ -1,36 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-namespace DoctrineMigrations;
-
-use App\Doctrine\AbstractMigration;
-use Doctrine\DBAL\Schema\Schema;
-
-/**
- * @version 2.14
- */
-final class Version20240326125247 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Adds the number columns to activity and project';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE kimai2_activities ADD number VARCHAR(10) DEFAULT NULL');
-        $this->addSql('ALTER TABLE kimai2_projects ADD number VARCHAR(10) DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE kimai2_projects DROP number');
-        $this->addSql('ALTER TABLE kimai2_activities DROP number');
-    }
-}

migrations/Version20240920105524.php

@@ -1,61 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-namespace DoctrineMigrations;
-
-use App\Doctrine\AbstractMigration;
-use Doctrine\DBAL\Schema\Schema;
-
-/**
- * @version 2.22
- */
-final class Version20240920105524 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Updates the user preferences for configurable work contract type';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $ids = $this->connection->fetchFirstColumn("
-SELECT DISTINCT user_id
-FROM kimai2_user_preferences AS kp
-WHERE kp.value > 0
-  AND kp.name IN ('work_monday', 'work_tuesday', 'work_wednesday', 'work_thursday', 'work_friday', 'work_saturday', 'work_sunday')
-  AND NOT EXISTS (
-    SELECT 1
-    FROM kimai2_user_preferences AS kp2
-    WHERE kp2.user_id = kp.user_id
-      AND kp2.name = 'work_contract_type'
-);");
-
-        foreach ($ids as $id) {
-            $this->addSql('INSERT INTO kimai2_user_preferences (`user_id`, `name`, `value`) VALUES (:id, :name, :value)', [
-                'id' => $id,
-                'name' => 'work_contract_type',
-                'value' => 'day',
-            ]);
-        }
-
-        if (\count($ids) === 0) {
-            $this->preventEmptyMigrationWarning();
-        }
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql("DELETE FROM kimai2_user_preferences WHERE `name` = 'work_contract_type'");
-    }
-
-    public function isTransactional(): bool
-    {
-        return true;
-    }
-}

migrations/Version20240926111739.php

@@ -1,40 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-namespace DoctrineMigrations;
-
-use App\Doctrine\AbstractMigration;
-use Doctrine\DBAL\Schema\Schema;
-
-/**
- * @version 2.23
- */
-final class Version20240926111739 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Adds created_at and break duration column';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE kimai2_activities ADD created_at DATETIME DEFAULT NULL COMMENT \'(DC2Type:datetime_immutable)\'');
-        $this->addSql('ALTER TABLE kimai2_customers ADD created_at DATETIME DEFAULT NULL COMMENT \'(DC2Type:datetime_immutable)\'');
-        $this->addSql('ALTER TABLE kimai2_projects ADD created_at DATETIME DEFAULT NULL COMMENT \'(DC2Type:datetime_immutable)\'');
-        $this->addSql('ALTER TABLE kimai2_timesheet ADD break INT DEFAULT NULL');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE kimai2_timesheet DROP break');
-        $this->addSql('ALTER TABLE kimai2_projects DROP created_at');
-        $this->addSql('ALTER TABLE kimai2_customers DROP created_at');
-        $this->addSql('ALTER TABLE kimai2_activities DROP created_at');
-    }
-}

migrations/Version20250608143244.php

@@ -1,51 +0,0 @@
-<?php
-
-/*
- * 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.
- */
-
-namespace DoctrineMigrations;
-
-use App\Doctrine\AbstractMigration;
-use Doctrine\DBAL\Schema\Schema;
-
-/**
- * @version 2.36.0
- */
-final class Version20250608143244 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Create the export template table';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $table = $schema->createTable('kimai2_export_templates');
-
-        $table->addColumn('id', 'integer', ['autoincrement' => true, 'notnull' => true]);
-        $table->addColumn('title', 'string', ['notnull' => true, 'length' => 100]);
-        $table->addColumn('renderer', 'string', ['notnull' => true, 'length' => 20]);
-        $table->addColumn('language', 'string', ['notnull' => false, 'length' => 6]);
-        $table->addColumn('columns', 'json', ['notnull' => true]);
-        $table->addColumn('options', 'json', ['notnull' => true]);
-
-        $table->setPrimaryKey(['id']);
-        $table->addUniqueIndex(['title'], 'UNIQ_2F0CA26F2B36786B');
-    }
-
-    public function down(Schema $schema): void
-    {
-        if ($schema->hasTable('kimai2_export_templates')) {
-            $schema->dropTable('kimai2_export_templates');
-        }
-    }
-
-    public function isTransactional(): bool
-    {
-        return false;
-    }
-}

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "kimai",
+  "name": "kimai2",
   "homepage": "https://github.com/kimai/kimai",
-  "license": "AGPL",
+  "license": "MIT",
   "maintainers": [
     {
       "name": "Kevin Papst",
@@ -13,46 +13,41 @@
     "url": "git+https://github.com/kimai/kimai.git"
   },
   "scripts": {
-    "dev-server": "yarn encore dev-server",
-    "dev": "yarn encore dev",
-    "watch": "yarn encore dev --watch",
-    "lint": "yarn eslint assets/js/",
-    "build": "yarn encore production"
+    "dev-server": "./node_modules/.bin/encore dev-server",
+    "dev": "./node_modules/.bin/encore dev",
+    "watch": "./node_modules/.bin/encore dev --watch",
+    "build": "./node_modules/.bin/encore production",
+    "prod": "node_modules/.bin/encore production"
   },
   "browserslist": [
     "defaults"
   ],
-  "dependencies": {
-    "@babel/core": "^7",
-    "@babel/eslint-parser": "^7",
-    "@babel/plugin-syntax-dynamic-import": "^7",
-    "@babel/preset-env": "^7",
-    "@eslint/js": "^9",
-    "@fortawesome/fontawesome-free": "^6",
-    "@fullcalendar/bootstrap5": "^5",
-    "@fullcalendar/core": "^5",
-    "@fullcalendar/daygrid": "^5",
-    "@fullcalendar/google-calendar": "^5",
-    "@fullcalendar/icalendar": "^5",
-    "@fullcalendar/interaction": "^5",
-    "@fullcalendar/timegrid": "^5",
-    "@popperjs/core": "^2",
-    "@symfony/webpack-encore": "^5",
-    "@tabler/core": "1.0.0-beta21",
-    "bootstrap": "^5.3",
-    "chart.js": "^4",
-    "core-js": "^3",
-    "eslint": "^9",
-    "globals": "^15",
-    "gridstack": "^7",
-    "highlight.js": "^11.11.1",
-    "litepicker": "^2",
-    "luxon": "^3",
-    "sass": "^1",
-    "sass-loader": "^16",
-    "tom-select": "^2",
-    "webpack": "^5",
-    "webpack-cli": "^5"
-  },
-  "packageManager": "yarn@4.5.3"
+  "packageManager": "yarn@3.2.1",
+  "devDependencies": {
+    "@babel/core": "^7.19.6",
+    "@babel/eslint-parser": "^7.18.2",
+    "@babel/preset-env": "^7.19.4",
+    "@fortawesome/fontawesome-free": "^6.5.0",
+    "@fullcalendar/bootstrap5": "^5.11",
+    "@fullcalendar/core": "^5.11",
+    "@fullcalendar/daygrid": "^5.11",
+    "@fullcalendar/google-calendar": "^5.11",
+    "@fullcalendar/icalendar": "^5.11",
+    "@fullcalendar/interaction": "^5.11",
+    "@fullcalendar/timegrid": "^5.11",
+    "@symfony/webpack-encore": "^4.0",
+    "@tabler/core": "1.0.0-beta19",
+    "chart.js": "^3.9",
+    "core-js": "^3.6",
+    "eslint": "^8.0",
+    "eslint-webpack-plugin": "^3.0",
+    "gridstack": "^7.1",
+    "litepicker": "^2.0",
+    "luxon": "^3.3",
+    "sass": "^1.62.1",
+    "sass-loader": "^13.2",
+    "tom-select": "^2.2",
+    "webpack": "^5.74.0",
+    "webpack-cli": "^4.10.0"
+  }
 }

php-cs-fixer.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-# ----------------------------------------------------------------------
-# Helper script to analyze plugins with PHP Coding Standards Fixer
-# ----------------------------------------------------------------------
-# Usage:
-#
-# ./php-cs-fixer.sh [plugin] [params]
-# [plugin] - name of the plugin to analyze (without "Bundle")
-# [params] - additional parameters for PHPCsFixer, e.g. --dry-run
-# ----------------------------------------------------------------------
-
-phpcsfixer() {
-	vendor/bin/php-cs-fixer fix --config var/plugins/$1Bundle/.php-cs-fixer.dist.php ${ARGS}
-}
-
-if [[ -n $2 ]]; then
-	export ARGS=$2
-else
-	export ARGS=""
-fi
-
-if [[ -n $1 ]]; then
-	if [ -d "var/plugins/$1Bundle/" ]; then
-		phpcsfixer $1
-		exit
-	elif [ "$1" == 'core' ]; then
-		vendor/bin/php-cs-fixer fix --config .php-cs-fixer.dist.php ${ARGS}
-		exit
-	else
-		echo "Plugin $1 not found"
-		exit 1
-	fi
-fi
-
-vendor/bin/php-cs-fixer fix --config .php-cs-fixer.dist.php ${ARGS}
-
-for dir in var/plugins/*Bundle/
-do
-	echo ""
-	vendor/bin/php-cs-fixer fix --config ${dir}.php-cs-fixer.dist.php ${ARGS}
-done

phpstan.sh

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# ----------------------------------------------------------------------
-# Helper script to analyze plugins with PHPStan
-# ----------------------------------------------------------------------
-# Usage:
-#
-# ./phpstan.sh [plugin] [params]
-# [plugin] - name of the plugin to analyze (without "Bundle")
-# [params] - additional parameters for PHPStan, e.g. --level=7 --pro
-# ----------------------------------------------------------------------
-
-phpstan() {
-	vendor/bin/phpstan analyse -c var/plugins/$1Bundle/phpstan.neon var/plugins/$1Bundle/ ${ARGS}
-}
-
-if [[ -n $2 ]]; then
-	export ARGS=$2
-else
-	export ARGS=""
-fi
-
-if [[ -n $1 ]]; then
-	if [ -d "var/plugins/$1Bundle/" ]; then
-		phpstan $1
-		exit
-	elif [ "$1" == 'core' ]; then
-		vendor/bin/phpstan analyse -c phpstan.neon ${ARGS}
-		exit
-	elif [ "$1" == 'test' ] || [ "$1" == 'tests' ]; then
-		vendor/bin/phpstan analyse -c tests/phpstan.neon ${ARGS}
-		exit
-	else
-		echo "Plugin $1 not found"
-		exit 1
-	fi
-fi
-
-vendor/bin/phpstan analyse -c phpstan.neon ${ARGS}
-vendor/bin/phpstan analyse -c tests/phpstan.neon ${ARGS}
-
-for dir in var/plugins/*Bundle/
-do
-	echo ""
-	echo "=======> $dir <======="
-	echo ""
-	vendor/bin/phpstan analyse -c ${dir}phpstan.neon ${dir} ${ARGS}
-done

phpunit.xml.dist

@@ -1,68 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          backupGlobals="false"
          colors="true"
-         bootstrap="tests/bootstrap.php"
-         cacheDirectory="var/cache/phpunit/"
-         displayDetailsOnTestsThatTriggerDeprecations="true"
-         displayDetailsOnTestsThatTriggerErrors="true"
-         displayDetailsOnTestsThatTriggerNotices="true"
-         displayDetailsOnTestsThatTriggerWarnings="true"
-         displayDetailsOnPhpunitDeprecations="true">
-  <php>
-    <ini name="error_reporting" value="-1"/>
-    <ini name="max_execution_time" value="-1"/>
-    <ini name="date.timezone" value="UTC"/>
-    <ini name="intl.default_locale" value="en_US"/>
-    <ini name="date.timezone" value="Europe/Vienna"/>
-    <env name="KERNEL_CLASS" value="App\Kernel" force="true"/>
-    <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
-    <env name="APP_ENV" value="test" force="true"/>
-    <env name="APP_DEBUG" value="0" force="true"/>
-    <env name="APP_SECRET" value="5a79a1c866efef9ca1800f971d689f3e" force="true"/>
-    <env name="DATABASE_URL" value="mysql://kimai2_test:kimai2_test@127.0.0.1:3306/kimai2_test?charset=utf8mb4&amp;serverVersion=10.5.8-MariaDB"/>
-    <env name="CORS_ALLOW_ORIGIN" value="^https?://localhost(:[0-9]+)?$"/>
-    <env name="MAILER_URL" value="null://null"/>
-    <env name="MAILER_FROM" value="kimai@example.com"/>
+         bootstrap="tests/bootstrap.php">
+    <php>
+        <ini name="error_reporting" value="-1"/>
+        <ini name="max_execution_time" value="-1"/>
+        <ini name="date.timezone" value="UTC"/>
+        <ini name="intl.default_locale" value="en_US"/>
+        <ini name="date.timezone" value="Europe/Vienna"/>
+        <env name="KERNEL_CLASS" value="App\Kernel" force="true"/>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
+        <env name="APP_ENV" value="test" force="true"/>
+        <env name="APP_DEBUG" value="0" force="true"/>
+        <env name="APP_SECRET" value="5a79a1c866efef9ca1800f971d689f3e" force="true"/>
+        <env name="DATABASE_URL" value="mysql://kimai2_test:kimai2_test@127.0.0.1:3306/kimai2_test?charset=utf8mb4&amp;serverVersion=10.5.8-MariaDB"/>
+        <env name="CORS_ALLOW_ORIGIN" value="^https?://localhost(:[0-9]+)?$"/>
+        <env name="MAILER_URL" value="null://null"/>
+        <env name="MAILER_FROM" value="kimai@example.com"/>
+        <!--
+            REINSTALL THE TEST DATABASE, eg. AFTER CHANGING STRUCTURE!
+
+            - change to "true"
+            - composer tests
+            - change back to "false"
+
+            CREATE DATABASE IF NOT EXISTS `kimai2_test`;
+            CREATE USER IF NOT EXISTS `kimai2_test`@127.0.0.1;
+            ALTER USER `kimai2_test`@127.0.0.1 IDENTIFIED BY "kimai2_test";
+            GRANT execute,select,insert,update,delete,create,alter,drop,index,references ON `kimai2_test`.* TO kimai2_test@127.0.0.1;
+        -->
+        <env name="BOOTSTRAP_RESET_DATABASE" value="true"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="Kimai">
+            <directory>tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src/</directory>
+            <directory suffix=".php">templates/</directory>
+        </include>
+        <exclude>
+            <directory suffix=".php">migrations/</directory>
+            <directory suffix=".php">assets/</directory>
+            <directory suffix=".php">bin/</directory>
+            <directory suffix=".php">config/</directory>
+            <directory suffix=".php">node_modules/</directory>
+            <directory suffix=".php">public/</directory>
+            <directory suffix=".php">tests/</directory>
+            <directory suffix=".php">translations/</directory>
+            <directory suffix=".php">var/</directory>
+            <directory suffix=".php">vendor/</directory>
+        </exclude>
+    </coverage>
+
     <!--
-        REINSTALL THE TEST DATABASE, eg. AFTER CHANGING STRUCTURE!
-
-        - change to "true"
-        - composer tests
-        - change back to "false"
-
-        CREATE DATABASE IF NOT EXISTS `kimai2_test`;
-        CREATE USER IF NOT EXISTS `kimai2_test`@127.0.0.1;
-        ALTER USER `kimai2_test`@127.0.0.1 IDENTIFIED BY "kimai2_test";
-        GRANT execute,select,insert,update,delete,create,alter,drop,index,references ON `kimai2_test`.* TO kimai2_test@127.0.0.1;
+        wrap tests inside database transactions, so tests can safely manipulate contents without
+        affecting other tests. @see https://github.com/dmaicher/doctrine-test-bundle
     -->
-    <env name="BOOTSTRAP_RESET_DATABASE" value="true"/>
-  </php>
-  <testsuites>
-    <testsuite name="Kimai">
-      <directory>tests/</directory>
-    </testsuite>
-  </testsuites>
-  <extensions>
-    <bootstrap class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension"/>
-  </extensions>
-  <source>
-    <include>
-      <directory suffix=".php">src/</directory>
-      <directory suffix=".php">templates/</directory>
-    </include>
-    <exclude>
-      <directory suffix=".php">migrations/</directory>
-      <directory suffix=".php">assets/</directory>
-      <directory suffix=".php">bin/</directory>
-      <directory suffix=".php">config/</directory>
-      <directory suffix=".php">node_modules/</directory>
-      <directory suffix=".php">public/</directory>
-      <directory suffix=".php">tests/</directory>
-      <directory suffix=".php">translations/</directory>
-      <directory suffix=".php">var/</directory>
-      <directory suffix=".php">vendor/</directory>
-    </exclude>
-  </source>
+    <extensions>
+        <extension class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitExtension"/>
+    </extensions>
+
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+    </listeners>
 </phpunit>

public/.htaccess

@@ -1,5 +1,3 @@
-# See https://github.com/symfony/recipes-contrib/blob/main/symfony/apache-pack/1.0/public/.htaccess#L38
-
 # Use the front controller as index file. It serves as a fallback solution when
 # every other rewrite/redirect fails (e.g. in an aliased environment without
 # mod_rewrite). Additionally, this reduces the matching process for the
@@ -7,46 +5,30 @@
 # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
 DirectoryIndex index.php
 
-# By default, Apache does not evaluate symbolic links if you did not enable this
-# feature in your server configuration. Uncomment the following line if you
-# install assets as symlinks or if you experience problems related to symlinks
-# when compiling LESS/Sass/CoffeScript assets.
-# Options +SymLinksIfOwnerMatch
+# Do NOT use Kimai with http, this is a huge security risk!
+# Activate these lines if you configured SSL and certificates:
 
-# Disabling MultiViews prevents unwanted negotiation, e.g. "/index" should not resolve
-# to the front controller "/index.php" but be rewritten to "/index.php/index".
-<IfModule mod_negotiation.c>
-    Options -MultiViews
-</IfModule>
+#<IfModule mod_rewrite.c>
+#    RewriteEngine On
+#    RewriteCond %{SERVER_PORT} 80
+#    RewriteRule ^(.*)$ https://kimai.example.com/$1 [R,L]
+#</IfModule>
 
 <IfModule mod_rewrite.c>
-    # This Option needs to be enabled for RewriteRule, otherwise it will show an error like
-    # 'Options FollowSymLinks or SymLinksIfOwnerMatch is off which implies that RewriteRule directive is forbidden'
-    Options +SymLinksIfOwnerMatch
-
     RewriteEngine On
 
     # Determine the RewriteBase automatically and set it as environment variable.
     # If you are using Apache aliases to do mass virtual hosting or installed the
     # project in a subdirectory, the base path will be prepended to allow proper
-    # resolution of the index.php file and to redirect to the correct URI. It will
+    # resolution of the app.php file and to redirect to the correct URI. It will
     # work in environments without path prefix as well, providing a safe, one-size
     # fits all solution. But as you do not need it in this case, you can comment
     # the following 2 lines to eliminate the overhead.
-    RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$
-    RewriteRule .* - [E=BASE:%1]
-
-    # Sets the HTTP_AUTHORIZATION header removed by Apache, if PHP is installed as CGI
-    # Required for the API and below are 3 different methods to achieve it
-    RewriteCond %{HTTP:Authorization} .+
-    RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
-    # This might be the only required line
-    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
-    # Apache 2.4.13+
-    # CGIPassAuth On
+    RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$
+    RewriteRule ^(.*) - [E=BASE:%1]
 
     # Redirect to URI without front controller to prevent duplicate content
-    # (with and without `/index.php`). Only do this redirect on the initial
+    # (with and without `/app.php`). Only do this redirect on the initial
     # rewrite by Apache and not on subsequent cycles. Otherwise we would get an
     # endless redirect loop (request -> rewrite to front controller ->
     # redirect -> request -> ...).
@@ -56,14 +38,16 @@ DirectoryIndex index.php
     # - disable this feature by commenting the following 2 lines or
     # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the
     #   following RewriteCond (best solution)
-    RewriteCond %{ENV:REDIRECT_STATUS} =""
-    RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
+    RewriteCond %{ENV:REDIRECT_STATUS} ^$
+    RewriteRule ^index\.php(/(.*)|$) %{ENV:BASE}/$2 [R=301,L]
 
     # If the requested filename exists, simply serve it.
     # We only want to let Apache serve files and not directories.
+    RewriteCond %{REQUEST_FILENAME} -f
+    RewriteRule .? - [L]
+
     # Rewrite all other queries to the front controller.
-    RewriteCond %{REQUEST_FILENAME} !-f
-    RewriteRule ^ %{ENV:BASE}/index.php [L]
+    RewriteRule .? %{ENV:BASE}/index.php [L]
 </IfModule>
 
 <IfModule !mod_rewrite.c>
@@ -71,7 +55,7 @@ DirectoryIndex index.php
         # When mod_rewrite is not available, we instruct a temporary redirect of
         # the start page to the front controller explicitly so that the website
         # and the generated links can still be used.
-        RedirectMatch 307 ^/$ /index.php/
+        RedirectMatch 302 ^/$ /index.php/
         # RedirectTemp cannot be used instead
     </IfModule>
-</IfModule>
+</IfModule>

public/build/app-rtl.3d445498.js

@@ -0,0 +1 @@
+(self.webpackChunkkimai2=self.webpackChunkkimai2||[]).push([[535],{1548:function(i,n,u){u(846)},846:function(i,n,u){"use strict";u.r(n)}},function(i){var n;n=1548,i(i.s=n)}]);

public/build/app-rtl.7a875ca7.js

@@ -1 +0,0 @@
-(self.webpackChunkkimai=self.webpackChunkkimai||[]).push([[113],{2395:function(i,n,u){u(876)},876:function(i,n,u){"use strict";u.r(n)}},function(i){var n;n=2395,i(i.s=n)}]);