diff --git a/composer.lock b/composer.lock index 6dd9989c..23096b8e 100644 --- a/composer.lock +++ b/composer.lock @@ -11838,16 +11838,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "b480ba2ae0699a72d43a340c20b9c00ede91ee3e" + "reference": "e8852764cf5ec8dcd2a3fa8ea03cbcf523639419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/b480ba2ae0699a72d43a340c20b9c00ede91ee3e", - "reference": "b480ba2ae0699a72d43a340c20b9c00ede91ee3e", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e8852764cf5ec8dcd2a3fa8ea03cbcf523639419", + "reference": "e8852764cf5ec8dcd2a3fa8ea03cbcf523639419", "shasum": "" }, "require": { @@ -11873,7 +11873,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.6.0" + "source": "https://github.com/phpstan/phpstan/tree/1.6.1" }, "funding": [ { @@ -11893,7 +11893,7 @@ "type": "tidelift" } ], - "time": "2022-04-26T05:43:03+00:00" + "time": "2022-04-26T18:09:31+00:00" }, { "name": "phpstan/phpstan-doctrine", diff --git a/phpstan.neon b/phpstan.neon index 7a838572..0423af3b 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -3,7 +3,7 @@ includes: - %rootDir%/../phpstan-symfony/rules.neon - %rootDir%/../phpstan-doctrine/extension.neon - %rootDir%/../phpstan-doctrine/rules.neon -# - %rootDir%/../phpstan/conf/bleedingEdge.neon + - %rootDir%/../phpstan/conf/bleedingEdge.neon parameters: tmpDir: %rootDir%/../../../var/cache/phpstan diff --git a/src/Constants.php b/src/Constants.php index 33bc4f76..590584a1 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -17,11 +17,11 @@ class Constants /** * The current release version */ - public const VERSION = '1.19.5'; + public const VERSION = '1.19.6'; /** * The current release: major * 10000 + minor * 100 + patch */ - public const VERSION_ID = 11905; + public const VERSION_ID = 11906; /** * The current release status, either "stable" or "dev" */ diff --git a/src/Form/Type/QuickEntryWeekType.php b/src/Form/Type/QuickEntryWeekType.php index b9b8ed05..788bfce9 100644 --- a/src/Form/Type/QuickEntryWeekType.php +++ b/src/Form/Type/QuickEntryWeekType.php @@ -111,7 +111,7 @@ class QuickEntryWeekType extends AbstractType ], 'allow_add' => true, 'constraints' => [ - new Valid(), + // having "new Valid()," here will trigger constraint violations on activity and project for completely empty rows new All(['constraints' => [new QuickEntryTimesheet()]]) ], ]); diff --git a/templates/reporting/customer/monthly_projects_data.html.twig b/templates/reporting/customer/monthly_projects_data.html.twig index 83cfb55e..ea0cad40 100644 --- a/templates/reporting/customer/monthly_projects_data.html.twig +++ b/templates/reporting/customer/monthly_projects_data.html.twig @@ -18,7 +18,7 @@ {% for activity in stats.activities %} {{ activity.name }} {% endfor %} - {{ dataTypeTitle|trans }} + {{ dataTypeTitle|trans }} {% for activity in stats.activities %}