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

bump theme to get navigation id specific classes (#4065)

Browse Source
This commit is contained in:
Kevin Papst
2023-05-26 22:39:07 +02:00
committed by GitHub
parent 9c1150c50e
commit 2ba9cff281
5 changed files with 65 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -34,7 +34,7 @@
"friendsofsymfony/rest-bundle": "^3.0",
"gedmo/doctrine-extensions": "^3.6",
"jms/serializer-bundle": "^5.0",
"kevinpapst/tabler-bundle": "^0.18",
"kevinpapst/tabler-bundle": "^0.19",
"league/csv": "^9.4",
"mpdf/mpdf": "^8.0",
"nelmio/api-doc-bundle": "^4.0",

121
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "aedc077bff6e5890b17415527e991e17",
"content-hash": "e99c671bcf2fcd2909aa81c5f4c24828",
"packages": [
{
"name": "bacon/bacon-qr-code",
@@ -1550,16 +1550,16 @@
},
{
"name": "doctrine/persistence",
"version": "3.1.4",
"version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/persistence.git",
"reference": "8bf8ab15960787f1a49d405f6eb8c787b4841119"
"reference": "63fee8c33bef740db6730eb2a750cd3da6495603"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/persistence/zipball/8bf8ab15960787f1a49d405f6eb8c787b4841119",
"reference": "8bf8ab15960787f1a49d405f6eb8c787b4841119",
"url": "https://api.github.com/repos/doctrine/persistence/zipball/63fee8c33bef740db6730eb2a750cd3da6495603",
"reference": "63fee8c33bef740db6730eb2a750cd3da6495603",
"shasum": ""
},
"require": {
@@ -1628,7 +1628,7 @@
],
"support": {
"issues": "https://github.com/doctrine/persistence/issues",
"source": "https://github.com/doctrine/persistence/tree/3.1.4"
"source": "https://github.com/doctrine/persistence/tree/3.2.0"
},
"funding": [
{
@@ -1644,7 +1644,7 @@
"type": "tidelift"
}
],
"time": "2023-02-03T11:13:07+00:00"
"time": "2023-05-17T18:32:04+00:00"
},
{
"name": "doctrine/sql-formatter",
@@ -2416,16 +2416,16 @@
},
{
"name": "kevinpapst/tabler-bundle",
"version": "0.18",
"version": "0.19",
"source": {
"type": "git",
"url": "https://github.com/kevinpapst/TablerBundle.git",
"reference": "f438b55cd393331385700a30515d3966747ecd7a"
"reference": "8225d1f7f14f13c3fc7b1b570719da074c0235c3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kevinpapst/TablerBundle/zipball/f438b55cd393331385700a30515d3966747ecd7a",
"reference": "f438b55cd393331385700a30515d3966747ecd7a",
"url": "https://api.github.com/repos/kevinpapst/TablerBundle/zipball/8225d1f7f14f13c3fc7b1b570719da074c0235c3",
"reference": "8225d1f7f14f13c3fc7b1b570719da074c0235c3",
"shasum": ""
},
"require": {
@@ -2474,7 +2474,7 @@
"description": "Admin/Backend theme bundle for Symfony based on Tabler.io",
"support": {
"issues": "https://github.com/kevinpapst/TablerBundle/issues",
"source": "https://github.com/kevinpapst/TablerBundle/tree/0.18"
"source": "https://github.com/kevinpapst/TablerBundle/tree/0.19"
},
"funding": [
{
@@ -2486,7 +2486,7 @@
"type": "github"
}
],
"time": "2023-05-16T16:30:10+00:00"
"time": "2023-05-25T17:54:25+00:00"
},
{
"name": "laminas/laminas-escaper",
@@ -4057,22 +4057,23 @@
},
{
"name": "phpstan/phpdoc-parser",
"version": "1.20.4",
"version": "1.21.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
"reference": "7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd"
"reference": "6df62b08faef4f899772bc7c3bbabb93d2b7a21c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd",
"reference": "7d568c87a9df9c5f7e8b5f075fc469aa8cb0a4cd",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6df62b08faef4f899772bc7c3bbabb93d2b7a21c",
"reference": "6df62b08faef4f899772bc7c3bbabb93d2b7a21c",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0"
},
"require-dev": {
"nikic/php-parser": "^4.15",
"php-parallel-lint/php-parallel-lint": "^1.2",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^1.5",
@@ -4096,9 +4097,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.20.4"
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.21.0"
},
"time": "2023-05-02T09:19:37+00:00"
"time": "2023-05-17T13:13:44+00:00"
},
{
"name": "psr/cache",
@@ -10733,16 +10734,16 @@
},
{
"name": "fakerphp/faker",
"version": "v1.21.0",
"version": "v1.22.0",
"source": {
"type": "git",
"url": "https://github.com/FakerPHP/Faker.git",
"reference": "92efad6a967f0b79c499705c69b662f738cc9e4d"
"reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/92efad6a967f0b79c499705c69b662f738cc9e4d",
"reference": "92efad6a967f0b79c499705c69b662f738cc9e4d",
"url": "https://api.github.com/repos/FakerPHP/Faker/zipball/f85772abd508bd04e20bb4b1bbe260a68d0066d2",
"reference": "f85772abd508bd04e20bb4b1bbe260a68d0066d2",
"shasum": ""
},
"require": {
@@ -10795,22 +10796,22 @@
],
"support": {
"issues": "https://github.com/FakerPHP/Faker/issues",
"source": "https://github.com/FakerPHP/Faker/tree/v1.21.0"
"source": "https://github.com/FakerPHP/Faker/tree/v1.22.0"
},
"time": "2022-12-13T13:54:32+00:00"
"time": "2023-05-14T12:31:37+00:00"
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v3.16.0",
"version": "v3.17.0",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
"reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc"
"reference": "3f0ed862f22386c55a767461ef5083bddceeed79"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/d40f9436e1c448d309fa995ab9c14c5c7a96f2dc",
"reference": "d40f9436e1c448d309fa995ab9c14c5c7a96f2dc",
"url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/3f0ed862f22386c55a767461ef5083bddceeed79",
"reference": "3f0ed862f22386c55a767461ef5083bddceeed79",
"shasum": ""
},
"require": {
@@ -10885,7 +10886,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.16.0"
"source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.17.0"
},
"funding": [
{
@@ -10893,7 +10894,7 @@
"type": "github"
}
],
"time": "2023-04-02T19:30:06+00:00"
"time": "2023-05-22T19:59:32+00:00"
},
{
"name": "masterminds/html5",
@@ -10964,16 +10965,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.15.4",
"version": "v4.15.5",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290"
"reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
"reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e",
"reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e",
"shasum": ""
},
"require": {
@@ -11014,9 +11015,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
"source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4"
"source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5"
},
"time": "2023-03-05T19:49:14+00:00"
"time": "2023-05-19T20:20:00+00:00"
},
{
"name": "phar-io/manifest",
@@ -11131,16 +11132,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.14",
"version": "1.10.15",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "d232901b09e67538e5c86a724be841bea5768a7c"
"reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/d232901b09e67538e5c86a724be841bea5768a7c",
"reference": "d232901b09e67538e5c86a724be841bea5768a7c",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/762c4dac4da6f8756eebb80e528c3a47855da9bd",
"reference": "762c4dac4da6f8756eebb80e528c3a47855da9bd",
"shasum": ""
},
"require": {
@@ -11189,20 +11190,20 @@
"type": "tidelift"
}
],
"time": "2023-04-19T13:47:27+00:00"
"time": "2023-05-09T15:28:01+00:00"
},
{
"name": "phpstan/phpstan-doctrine",
"version": "1.3.38",
"version": "1.3.40",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-doctrine.git",
"reference": "f1499e54358052fef17d349881ee87a7c4cc4c67"
"reference": "f741919a720af6f84249abc62befeb15eee7bc88"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/f1499e54358052fef17d349881ee87a7c4cc4c67",
"reference": "f1499e54358052fef17d349881ee87a7c4cc4c67",
"url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/f741919a720af6f84249abc62befeb15eee7bc88",
"reference": "f741919a720af6f84249abc62befeb15eee7bc88",
"shasum": ""
},
"require": {
@@ -11257,22 +11258,22 @@
"description": "Doctrine extensions for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-doctrine/issues",
"source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.38"
"source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.40"
},
"time": "2023-05-04T10:53:10+00:00"
"time": "2023-05-11T11:26:04+00:00"
},
{
"name": "phpstan/phpstan-phpunit",
"version": "1.3.11",
"version": "1.3.12",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-phpunit.git",
"reference": "9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c"
"reference": "c44246879d692d3b2cf2a21d65be4b4715d6ef21"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c",
"reference": "9e1b9de6d260461f6e99b6a8f2dbb0bbb98b579c",
"url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/c44246879d692d3b2cf2a21d65be4b4715d6ef21",
"reference": "c44246879d692d3b2cf2a21d65be4b4715d6ef21",
"shasum": ""
},
"require": {
@@ -11309,9 +11310,9 @@
"description": "PHPUnit extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-phpunit/issues",
"source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.11"
"source": "https://github.com/phpstan/phpstan-phpunit/tree/1.3.12"
},
"time": "2023-03-25T19:42:13+00:00"
"time": "2023-05-23T11:58:47+00:00"
},
{
"name": "phpstan/phpstan-strict-rules",
@@ -11364,16 +11365,16 @@
},
{
"name": "phpstan/phpstan-symfony",
"version": "1.3.1",
"version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan-symfony.git",
"reference": "7e78605a699d183f5a6936cf91904f4c16ca79b2"
"reference": "7332b90dfc291ac5b4b83fbca2081936faa1e3f9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/7e78605a699d183f5a6936cf91904f4c16ca79b2",
"reference": "7e78605a699d183f5a6936cf91904f4c16ca79b2",
"url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/7332b90dfc291ac5b4b83fbca2081936faa1e3f9",
"reference": "7332b90dfc291ac5b4b83fbca2081936faa1e3f9",
"shasum": ""
},
"require": {
@@ -11429,9 +11430,9 @@
"description": "Symfony Framework extensions and rules for PHPStan",
"support": {
"issues": "https://github.com/phpstan/phpstan-symfony/issues",
"source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.1"
"source": "https://github.com/phpstan/phpstan-symfony/tree/1.3.2"
},
"time": "2023-04-14T16:59:18+00:00"
"time": "2023-05-16T12:46:15+00:00"
},
{
"name": "phpunit/php-code-coverage",

5
phpstan.neon
View File

@@ -1991,11 +1991,6 @@ parameters:
count: 1
path: src/Entity/User.php
-
message: "#^Method App\\\\Entity\\\\User\\:\\:__serialize\\(\\) return type has no value type specified in iterable type array\\.$#"
count: 1
path: src/Entity/User.php
-
message: "#^Method App\\\\Entity\\\\User\\:\\:__toString\\(\\) should return string but returns string\\|null\\.$#"
count: 1

4
src/API/ProjectController.php
View File

@@ -115,8 +115,8 @@ final class ProjectController extends BaseApiController
}
$ignoreDates = false;
if (null !== $paramFetcher->get('ignoreDates')) {
$ignoreDates = \intval($paramFetcher->get('ignoreDates')) === 1;
if (null !== ($ign = $paramFetcher->get('ignoreDates'))) {
$ignoreDates = $ign === 1 || $ign === '1';
}
if (!$ignoreDates) {

2
src/Export/Base/AbstractSpreadsheetRenderer.php
View File

@@ -349,7 +349,7 @@ abstract class AbstractSpreadsheetRenderer
}
if (isset($columns['description']) && !isset($columns['description']['render'])) {
$maxWidth = \array_key_exists('maxWidth', $columns['description']) ? \intval($columns['description']['maxWidth']) : null;
$maxWidth = \array_key_exists('maxWidth', $columns['description']) && is_numeric($columns['description']['maxWidth']) ? (int) $columns['description']['maxWidth'] : null;
$wrapText = \array_key_exists('wrapText', $columns['description']) ? (bool) $columns['description']['wrapText'] : false;
$sanitizeText = \array_key_exists('sanitizeDDE', $columns['description']) ? (bool) $columns['description']['sanitizeDDE'] : true;