From 3a7e3b216810ef28b57d900c52ddcd37cc92edd1 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Wed, 30 Mar 2022 22:23:12 +0200 Subject: [PATCH] bump version 1.19.1 (#3229) --- composer.lock | 157 ++++++++++++------------- src/Constants.php | 4 +- src/Repository/TimesheetRepository.php | 8 +- symfony.lock | 24 +--- 4 files changed, 87 insertions(+), 106 deletions(-) diff --git a/composer.lock b/composer.lock index 4ae207c0..ed7d590c 100644 --- a/composer.lock +++ b/composer.lock @@ -65,30 +65,30 @@ }, { "name": "behat/transliterator", - "version": "v1.3.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/Behat/Transliterator.git", - "reference": "3c4ec1d77c3d05caa1f0bf8fb3aae4845005c7fc" + "reference": "baac5873bac3749887d28ab68e2f74db3a4408af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Transliterator/zipball/3c4ec1d77c3d05caa1f0bf8fb3aae4845005c7fc", - "reference": "3c4ec1d77c3d05caa1f0bf8fb3aae4845005c7fc", + "url": "https://api.github.com/repos/Behat/Transliterator/zipball/baac5873bac3749887d28ab68e2f74db3a4408af", + "reference": "baac5873bac3749887d28ab68e2f74db3a4408af", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.2" }, "require-dev": { "chuyskywalker/rolling-curl": "^3.1", "php-yaoi/php-yaoi": "^1.0", - "phpunit/phpunit": "^4.8.36|^6.3" + "phpunit/phpunit": "^8.5.25 || ^9.5.19" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.x-dev" } }, "autoload": { @@ -108,9 +108,9 @@ ], "support": { "issues": "https://github.com/Behat/Transliterator/issues", - "source": "https://github.com/Behat/Transliterator/tree/v1.3.0" + "source": "https://github.com/Behat/Transliterator/tree/v1.5.0" }, - "time": "2020-01-14T16:39:13+00:00" + "time": "2022-03-30T09:27:43+00:00" }, { "name": "composer/package-versions-deprecated", @@ -669,16 +669,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "2.5.7", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "1e0d1d7a5982eeebc37dcb4d77bb1a5c5961d96d" + "reference": "eca20633225fde77d042ecdac222bc9a5cb20f6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/1e0d1d7a5982eeebc37dcb4d77bb1a5c5961d96d", - "reference": "1e0d1d7a5982eeebc37dcb4d77bb1a5c5961d96d", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/eca20633225fde77d042ecdac222bc9a5cb20f6a", + "reference": "eca20633225fde77d042ecdac222bc9a5cb20f6a", "shasum": "" }, "require": { @@ -698,12 +698,12 @@ "symfony/service-contracts": "^1.1.1|^2.0|^3" }, "conflict": { - "doctrine/orm": "<2.9|>=3.0", + "doctrine/orm": "<2.10|>=3.0", "twig/twig": "<1.34|>=2.0,<2.4" }, "require-dev": { "doctrine/coding-standard": "^9.0", - "doctrine/orm": "^2.9 || ^3.0", + "doctrine/orm": "^2.10 || ^3.0", "friendsofphp/proxy-manager-lts": "^1.0", "phpunit/phpunit": "^7.5 || ^8.0 || ^9.3 || ^10.0", "psalm/plugin-phpunit": "^0.16.1", @@ -762,7 +762,7 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineBundle/issues", - "source": "https://github.com/doctrine/DoctrineBundle/tree/2.5.7" + "source": "https://github.com/doctrine/DoctrineBundle/tree/2.6.0" }, "funding": [ { @@ -778,7 +778,7 @@ "type": "tidelift" } ], - "time": "2022-03-05T10:29:13+00:00" + "time": "2022-03-05T10:43:39+00:00" }, { "name": "doctrine/doctrine-migrations-bundle", @@ -1402,16 +1402,16 @@ }, { "name": "doctrine/persistence", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "e7c8edcf98e819638af00e7b3cbbbd7734b9b2fb" + "reference": "092a52b71410ac1795287bb5135704ef07d18dd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/e7c8edcf98e819638af00e7b3cbbbd7734b9b2fb", - "reference": "e7c8edcf98e819638af00e7b3cbbbd7734b9b2fb", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/092a52b71410ac1795287bb5135704ef07d18dd0", + "reference": "092a52b71410ac1795287bb5135704ef07d18dd0", "shasum": "" }, "require": { @@ -1484,9 +1484,9 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/2.4.0" + "source": "https://github.com/doctrine/persistence/tree/2.4.1" }, - "time": "2022-03-13T16:11:46+00:00" + "time": "2022-03-22T06:44:40+00:00" }, { "name": "doctrine/sql-formatter", @@ -3863,16 +3863,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" + "reference": "77a32518733312af16a44300404e945338981de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", + "reference": "77a32518733312af16a44300404e945338981de3", "shasum": "" }, "require": { @@ -3907,9 +3907,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" }, - "time": "2022-01-04T19:58:01+00:00" + "time": "2022-03-15T21:29:03+00:00" }, { "name": "phpoffice/phpspreadsheet", @@ -4129,35 +4129,30 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.2.0", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e" + "reference": "4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/dbc093d7af60eff5cd575d2ed761b15ed40bd08e", - "reference": "dbc093d7af60eff5cd575d2ed761b15ed40bd08e", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d", + "reference": "4cb3021a4e10ffe3d5f94a4c34cf4b3f6de2fa3d", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.0", + "phpstan/phpstan": "^1.5", "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5", "symfony/process": "^5.2" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, "autoload": { "psr-4": { "PHPStan\\PhpDocParser\\": [ @@ -4172,9 +4167,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.2.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.4.2" }, - "time": "2021-09-16T20:46:02+00:00" + "time": "2022-03-30T13:33:37+00:00" }, { "name": "psr/cache", @@ -10593,16 +10588,16 @@ }, { "name": "twig/twig", - "version": "v3.3.8", + "version": "v3.3.9", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "972d8604a92b7054828b539f2febb0211dd5945c" + "reference": "6ff9b0e440fa66f97f207e181c41340ddfa5683d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/972d8604a92b7054828b539f2febb0211dd5945c", - "reference": "972d8604a92b7054828b539f2febb0211dd5945c", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/6ff9b0e440fa66f97f207e181c41340ddfa5683d", + "reference": "6ff9b0e440fa66f97f207e181c41340ddfa5683d", "shasum": "" }, "require": { @@ -10653,7 +10648,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.3.8" + "source": "https://github.com/twigphp/Twig/tree/v3.3.9" }, "funding": [ { @@ -10665,7 +10660,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T06:59:48+00:00" + "time": "2022-03-25T09:37:52+00:00" }, { "name": "webmozart/assert", @@ -11785,20 +11780,20 @@ }, { "name": "phpstan/phpstan", - "version": "1.4.10", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "898c479c39caa727bedf4311dd294a8f4e250e72" + "reference": "f32e95f571c9587b4e14be05253ae56fedd00b2c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/898c479c39caa727bedf4311dd294a8f4e250e72", - "reference": "898c479c39caa727bedf4311dd294a8f4e250e72", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/f32e95f571c9587b4e14be05253ae56fedd00b2c", + "reference": "f32e95f571c9587b4e14be05253ae56fedd00b2c", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.2|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -11820,7 +11815,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/1.4.10" + "source": "https://github.com/phpstan/phpstan/tree/1.5.2" }, "funding": [ { @@ -11840,25 +11835,25 @@ "type": "tidelift" } ], - "time": "2022-03-14T10:25:45+00:00" + "time": "2022-03-29T07:34:36+00:00" }, { "name": "phpstan/phpstan-doctrine", - "version": "1.2.11", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "580737eff27e48c1924bc019fa43343626242e91" + "reference": "17ad9bcd472d67881480e2ca7f915d360d1f3c6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/580737eff27e48c1924bc019fa43343626242e91", - "reference": "580737eff27e48c1924bc019fa43343626242e91", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/17ad9bcd472d67881480e2ca7f915d360d1f3c6b", + "reference": "17ad9bcd472d67881480e2ca7f915d360d1f3c6b", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0", - "phpstan/phpstan": "^1.4.1" + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.5" }, "conflict": { "doctrine/collections": "<1.0", @@ -11871,7 +11866,7 @@ "doctrine/annotations": "^1.11.0", "doctrine/collections": "^1.6", "doctrine/common": "^2.7 || ^3.0", - "doctrine/dbal": "^2.13.7 || ^3.0", + "doctrine/dbal": "^2.13.8 || ^3.3.3", "doctrine/lexer": "^1.2.1", "doctrine/mongodb-odm": "^1.3 || ^2.1", "doctrine/orm": "^2.11.0", @@ -11887,9 +11882,6 @@ }, "type": "phpstan-extension", "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - }, "phpstan": { "includes": [ "extension.neon", @@ -11909,27 +11901,27 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.2.11" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.0" }, - "time": "2022-02-23T15:14:45+00:00" + "time": "2022-03-29T07:00:35+00:00" }, { "name": "phpstan/phpstan-phpunit", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-phpunit.git", - "reference": "9eb88c9f689003a8a2a5ae9e010338ee94dc39b3" + "reference": "09133ce914f1388a8bb8c7f8573aaa3723cff52a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/9eb88c9f689003a8a2a5ae9e010338ee94dc39b3", - "reference": "9eb88c9f689003a8a2a5ae9e010338ee94dc39b3", + "url": "https://api.github.com/repos/phpstan/phpstan-phpunit/zipball/09133ce914f1388a8bb8c7f8573aaa3723cff52a", + "reference": "09133ce914f1388a8bb8c7f8573aaa3723cff52a", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0", - "phpstan/phpstan": "^1.0" + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.5.0" }, "conflict": { "phpunit/phpunit": "<7.0" @@ -11942,9 +11934,6 @@ }, "type": "phpstan-extension", "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, "phpstan": { "includes": [ "extension.neon", @@ -11964,22 +11953,22 @@ "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.0.0" + "source": "https://github.com/phpstan/phpstan-phpunit/tree/1.1.0" }, - "time": "2021-10-14T08:03:54+00:00" + "time": "2022-03-28T09:20:49+00:00" }, { "name": "phpstan/phpstan-symfony", - "version": "1.1.7", + "version": "1.1.8", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-symfony.git", - "reference": "8ef80f5c4f70ebd31a55647bc082ea9df4bf0132" + "reference": "4bdffcf1033b6c60662a28419d0192e0dda5684f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/8ef80f5c4f70ebd31a55647bc082ea9df4bf0132", - "reference": "8ef80f5c4f70ebd31a55647bc082ea9df4bf0132", + "url": "https://api.github.com/repos/phpstan/phpstan-symfony/zipball/4bdffcf1033b6c60662a28419d0192e0dda5684f", + "reference": "4bdffcf1033b6c60662a28419d0192e0dda5684f", "shasum": "" }, "require": { @@ -12038,9 +12027,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.1.7" + "source": "https://github.com/phpstan/phpstan-symfony/tree/1.1.8" }, - "time": "2022-02-25T19:36:13+00:00" + "time": "2022-03-24T07:56:03+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/src/Constants.php b/src/Constants.php index 5d9c6f69..facd7212 100644 --- a/src/Constants.php +++ b/src/Constants.php @@ -17,11 +17,11 @@ class Constants /** * The current release version */ - public const VERSION = '1.19'; + public const VERSION = '1.19.1'; /** * The current release: major * 10000 + minor * 100 + patch */ - public const VERSION_ID = 11900; + public const VERSION_ID = 11901; /** * The current release status, either "stable" or "dev" */ diff --git a/src/Repository/TimesheetRepository.php b/src/Repository/TimesheetRepository.php index cba65ddc..2659e7e6 100644 --- a/src/Repository/TimesheetRepository.php +++ b/src/Repository/TimesheetRepository.php @@ -1196,6 +1196,11 @@ class TimesheetRepository extends EntityRepository { $qb = $this->getEntityManager()->createQueryBuilder(); + $qb + ->select($qb->expr()->count('t.id')) + ->from(Timesheet::class, 't') + ; + $or = $qb->expr()->orX( $qb->expr()->between(':begin', 't.begin', 't.end') ); @@ -1216,8 +1221,7 @@ class TimesheetRepository extends EntityRepository $begin = clone $timesheet->getBegin(); $begin->add(new DateInterval('PT1S')); - $qb->select($qb->expr()->count('t.id')) - ->from(Timesheet::class, 't') + $qb ->andWhere($qb->expr()->eq('t.user', ':user')) ->andWhere($qb->expr()->isNotNull('t.end')) ->andWhere($or) diff --git a/symfony.lock b/symfony.lock index 34509b73..202761c9 100644 --- a/symfony.lock +++ b/symfony.lock @@ -5,6 +5,12 @@ "behat/transliterator": { "version": "v1.2.0" }, + "composer/package-versions-deprecated": { + "version": "1.11.99.5" + }, + "composer/pcre": { + "version": "1.0.1" + }, "composer/semver": { "version": "1.4.2" }, @@ -225,12 +231,6 @@ "nikic/php-parser": { "version": "v4.0.2" }, - "ocramius/package-versions": { - "version": "1.2.0" - }, - "ocramius/proxy-manager": { - "version": "2.1.1" - }, "onelogin/php-saml": { "version": "3.4.1" }, @@ -246,9 +246,6 @@ "phar-io/version": { "version": "1.0.1" }, - "php": { - "version": "7.2.9" - }, "php-cs-fixer/diff": { "version": "v1.2.0" }, @@ -522,9 +519,6 @@ "symfony/intl": { "version": "v4.0.3" }, - "symfony/ldap": { - "version": "v4.2.8" - }, "symfony/mailchimp-mailer": { "version": "4.4", "recipe": { @@ -786,12 +780,6 @@ "willdurand/negotiation": { "version": "v2.3.1" }, - "zendframework/zend-code": { - "version": "3.3.0" - }, - "zendframework/zend-eventmanager": { - "version": "3.2.0" - }, "zircote/swagger-php": { "version": "2.0.13" }