jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

Browse Source
This commit is contained in:
Kevin Papst
2022-12-31 21:19:55 +01:00
committed by GitHub
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
.github/ISSUE_TEMPLATE/bug_report.yml vendored
View File

@@ -10,8 +10,8 @@ body:
id: what-happened
attributes:
label: Describe the issue
description: A clear and concise description of the problem you are facing.
placeholder: Tell us what you see!
description: "A clear and concise description of the problem you are facing. Is that a browser issue? Then add device information: Ubuntu 20.04 with Brave 1.46, Windows 10 with Chrome 85, iPhone 10, Mac with Safari 16"
placeholder: Tell us what you see! Include the steps necessary to reproduce the behavior (e.g. go to, scroll down and click here ...)
validations:
required: true
- type: checkboxes
@@ -30,21 +30,8 @@ body:
id: version
attributes:
label: Kimai version
description: Which version of Kimai are you running (check Doctor or About screen)
placeholder: 1.xx.x
validations:
required: true
- type: dropdown
id: php
attributes:
label: Which PHP version are you using?
options:
- "7.3"
- "7.4"
- "8.0"
- "8.1"
- "8.2"
- Other (please mention below)
description: Which version of Kimai are you running (see Doctor/About/Kimai-Cloud screen)
placeholder: 1.xx.x or 2.xx.x
validations:
required: true
- type: dropdown
@@ -52,23 +39,32 @@ body:
attributes:
label: How do you run Kimai?
options:
- kimai.cloud service
- Self-Hosted
- Virtual Server or alike
- KIMAI CLOUD
- Docker
- Synology
- Plesk
- Shared-Hosting
- Other (please mention below)
validations:
required: true
- type: dropdown
id: php
attributes:
label: Which PHP version are you using?
options:
- "8.1"
- Unknown
- "8.2"
- "8.0"
- "7.4"
- "7.3"
- Other (please mention below)
validations:
required: true
- type: textarea
id: reproducer
attributes:
label: Steps to reproduce the behavior
value: |
1. Go to '...'
2. Scroll down to '...'
3. Click on '...'
4. See error
- type: textarea
id: logs
render: Text
attributes:
label: Logfile
description: Please paste the last lines from your logfile at "var/log/prod.log" or "Doctor > Logs", around the time when the problem happened.
@@ -77,11 +73,4 @@ body:
attributes:
label: Screenshots
description: If applicable, add screenshots to better explain your problem.
- type: textarea
id: additional
attributes:
label: Additional context
description: Add any other context about the problem here.
value: |
Device: [Ubuntu Laptop 16 inch, Windows Desktop 27 inch, iPhone 6s]
Browser [e.g. Firefox 81, Chrome 85, Safari 14]

2
.github/PULL_REQUEST_TEMPLATE.md vendored
View File

@@ -9,4 +9,4 @@ A clear and concise description of what this pull request adds or changes.
## Checklist
- [ ] I verified that my code applies to the guidelines (`composer code-check`)
- [ ] I updated the documentation (see [here](https://github.com/kimai/www.kimai.org/tree/master/_documentation))
- [ ] I agree that this code is used in Kimai and will be published under the [MIT license](https://github.com/kimai/kimai/blob/master/LICENSE)
- [ ] I agree that this code is used in Kimai (see [license](https://github.com/kimai/kimai/blob/main/LICENSE))

7
.github/release-drafter.yml vendored
View File

@@ -36,11 +36,10 @@ template: |
[Upgrade Kimai](https://www.kimai.org/documentation/updates.html) - [Install Kimai](https://www.kimai.org/documentation/installation.html) - [Docker](https://tobybatch.github.io/kimai2/)
**PHP Version compatibility:**
- PHP 7.3 is [end-of-life](https://www.php.net/supported-versions.php)
- PHP 7.4 is [end-of-life](https://www.php.net/supported-versions.php) in a few days!
- PHP 7.3 and PHP 7.4 are [end-of-life](https://www.php.net/supported-versions.php)
- PHP 8.0 and PHP 8.1 are supported
**Next release will be PHP 8 ONLY, as [announced one year ago](https://www.kimai.org/blog/2021/sunsetting-php-7/).**
A feature freeze is in place and only bugfix releases will be published for 1.30.x. Next major release will be in the 2.x series (PHP >= 8.1, Symfony 6, Tabler UI, see #2902).
$CHANGES

69
.github/workflows/coverage.yaml vendored
View File

@@ -1,69 +0,0 @@
name: Coverage
on:
pull_request: null
push:
branches:
- master
jobs:
tests:
runs-on: ubuntu-latest
services:
mysql:
image: mysql:5.7
env:
MYSQL_ALLOW_EMPTY_PASSWORD: false
MYSQL_ROOT_PASSWORD: kimai
MYSQL_DATABASE: kimai
ports:
- 3306/tcp
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
php: ['8.0']
name: Coverage (${{ matrix.php }})
steps:
- name: Clone Kimai
uses: actions/checkout@v2
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: pcov
extensions: mbstring, xml, ctype, iconv, intl, mysql, zip, gd, ldap
- name: Determine composer cache directory
id: composer-cache
run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
- name: Cache Composer dependencies
uses: actions/cache@v2
with:
path: "${{ steps.composer-cache.outputs.directory }}"
key: ${{ runner.os }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
- name: Install dependencies
run: composer install
- name: Install LDAP package
run: composer require laminas/laminas-ldap
- name: Setup problem matchers for PHPUnit
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
- name: Run tests
run: vendor/bin/phpunit tests/ --coverage-clover=coverage.xml
env:
DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?serverVersion=5.7
APP_ENV: dev
MAILER_URL: null://localhost
TEST_WITH_BUNDLES: 1
- name: Upload code coverage
uses: codecov/codecov-action@v2
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./coverage.xml
fail_ci_if_error: true

7
.github/workflows/docker.yaml vendored
View File

@@ -5,13 +5,12 @@ on:
jobs:
build:
name: Dispatch release event to tobybatch
name: Trigger docker image build
runs-on: ubuntu-latest
steps:
- name: Emit repository_dispatch
uses: mvasigh/dispatch-action@1.1.6
uses: peter-evans/repository-dispatch@v2
with:
token: ${{ secrets.DOCKER_ACCESS_TOKEN }}
repo: kimai2
owner: tobybatch
repository: tobybatch/kimai2
event_type: kimai_release

6
.github/workflows/lockfiles.yaml vendored
View File

@@ -3,7 +3,7 @@ on:
pull_request: null
push:
branches:
- master
- main
jobs:
lockfiles:
runs-on: ubuntu-latest
@@ -11,7 +11,9 @@ jobs:
steps:
- name: Clone Kimai
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
persist-credentials: false
- name: Prevent file change
uses: xalvarez/prevent-file-change-action@v1

2
.github/workflows/release-drafter.yaml vendored
View File

@@ -3,7 +3,7 @@ name: Release Drafter
on:
push:
branches:
- master
- main
permissions:
contents: read

63
.github/workflows/testing.yaml vendored
View File

@@ -3,13 +3,13 @@ on:
pull_request: null
push:
branches:
- master
- main
jobs:
integration:
runs-on: ubuntu-latest
services:
mysql:
image: mysql:5.7
image: mysql:latest
env:
MYSQL_ALLOW_EMPTY_PASSWORD: false
MYSQL_ROOT_PASSWORD: kimai
@@ -19,30 +19,34 @@ jobs:
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
strategy:
matrix:
php: ['7.4', '8.0', '8.1']
php: ['8.1', '8.2']
name: Integration (${{ matrix.php }})
steps:
- name: Clone Kimai
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
persist-credentials: false
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none
extensions: mbstring, xml, ctype, iconv, intl, mysql, zip, gd, ldap
tools: cs2pr:1.1.0, symfony-cli
coverage: pcov
extensions: ctype, gd, iconv, intl, ldap, mbstring, mysql, xml, zip
tools: cs2pr, symfony-cli
env:
fail-fast: true
- name: Determine composer cache directory
id: composer-cache
run: "echo \"::set-output name=directory::$(composer config cache-dir)\""
run: echo "composer_cache_directory=$(composer config cache-dir)" >> $GITHUB_ENV
- name: Cache Composer dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: "${{ steps.composer-cache.outputs.directory }}"
path: "${{ env.composer_cache_directory }}"
key: ${{ runner.os }}-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
- name: Install dependencies
@@ -51,43 +55,49 @@ jobs:
- name: Validate Composer
run: composer validate --strict
- name: Warmup cache for PHPStan
- 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 on Codebase
run: vendor/bin/phpstan analyse src -c phpstan.neon --level=5 --no-progress --error-format=checkstyle | cs2pr
- name: Run PHPStan for application
run: vendor/bin/phpstan analyse -c phpstan.neon --no-progress --error-format=checkstyle | cs2pr
- name: Run PHPStan on Tests
run: vendor/bin/phpstan analyse tests -c tests/phpstan.neon --level=5 --no-progress --error-format=checkstyle | cs2pr
- name: Run PHPStan for tests
run: vendor/bin/phpstan analyse -c tests/phpstan.neon --no-progress --error-format=checkstyle | cs2pr
- name: Lint codebase
run: composer linting
- name: Check for security issues in packages
run: symfony security:check
- name: Install LDAP package
- name: Install LDAP package (for tests)
run: composer require laminas/laminas-ldap
- name: Setup problem matchers for PHPUnit
- name: Setup problem matchers (for PHPUnit)
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
- name: Run unit tests
run: composer kimai:tests-unit
- name: Run quick unit-tests
run: composer tests-unit
env:
DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?serverVersion=5.7
APP_ENV: dev
MAILER_URL: null://localhost
- name: Run integration tests
run: composer kimai:tests-integration
- name: Full test-suite with coverage
run: vendor/bin/phpunit tests/ --coverage-clover=coverage.xml
env:
DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?serverVersion=5.7
APP_ENV: dev
MAILER_URL: null://localhost
TEST_WITH_BUNDLES: 1
- name: Upload code coverage
if: matrix.php == '8.1'
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: ./coverage.xml
fail_ci_if_error: true
- name: Run migrations on MySQL
run: |
@@ -99,3 +109,6 @@ jobs:
DATABASE_URL: mysql://root:kimai@127.0.0.1:${{ job.services.mysql.ports['3306'] }}/kimai?serverVersion=5.7
APP_ENV: dev
MAILER_URL: null://localhost
- name: Check for security issues in packages
run: symfony security:check