From 8e06f94bdd8f2bae2ea7db477cbaa5665ae3a697 Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Thu, 1 Aug 2019 23:21:43 +0200 Subject: [PATCH] composer prod dependencies and commands (#986) --- .travis.yml | 7 +- UPGRADING.md | 10 +- composer.json | 12 +- composer.lock | 1158 ++++++++++++------------ src/Command/ConvertTimezoneCommand.php | 151 --- src/Command/CreateReleaseCommand.php | 8 + src/Command/ResetCommand.php | 30 +- src/Entity/Timesheet.php | 26 +- 8 files changed, 638 insertions(+), 764 deletions(-) delete mode 100644 src/Command/ConvertTimezoneCommand.php diff --git a/.travis.yml b/.travis.yml index 2a3bacbe..10e3de15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ cache: directories: - $HOME/.composer/cache/files -services: - - mysql - matrix: include: - stage: Code quality @@ -41,6 +38,8 @@ matrix: env: CODECOVERAGE=0 DB=mariadb addons: mariadb: '10.2' + services: + - mysql before_script: - mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;' - stage: Test @@ -48,6 +47,8 @@ matrix: env: CODECOVERAGE=0 DB=mariadb addons: mariadb: '10.2' + services: + - mysql before_script: - mysql -u root -e 'CREATE USER IF NOT EXISTS travis@localhost; GRANT ALL ON *.* TO travis@localhost;' - stage: Code coverage diff --git a/UPGRADING.md b/UPGRADING.md index 48fba076..5e37c336 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -5,10 +5,14 @@ _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. -**Before you leave ...** +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. -There might be more steps required which are version specific and need to be executed after [the update](https://www.kimai.org/documentation/updates.html). -Read and perform EACH version specific task below, otherwise you risk data inconsistency or a broken installation! +## [1.2](https://github.com/kevinpapst/kimai2/releases/tag/1.2) + +### BC breaks + +Deleted timezone conversion command. If you are still using 0.7 or below, you need to upgrade to 1.1 before upgrading to this version. ## [1.1](https://github.com/kevinpapst/kimai2/releases/tag/1.1) diff --git a/composer.json b/composer.json index e72a250c..6f99e352 100644 --- a/composer.json +++ b/composer.json @@ -18,11 +18,9 @@ "ext-pdo": "*", "ext-zip": "*", "beberlei/doctrineextensions": "^1.2", - "doctrine/doctrine-fixtures-bundle": "^3.0", "erusev/parsedown": "^1.6", "friendsofsymfony/rest-bundle": "^2.3", "friendsofsymfony/user-bundle": "~2.0", - "fzaninotto/faker": "^1.8", "gedmo/doctrine-extensions": "^2.4", "jms/metadata": "^2.0", "jms/serializer-bundle": "^3.2", @@ -45,10 +43,8 @@ "symfony/form": "^4.0", "symfony/framework-bundle": "^4.0", "symfony/intl": "^4.0", - "symfony/maker-bundle": "^1.0", "symfony/monolog-bundle": "^3.1", "symfony/orm-pack": "^1.0", - "symfony/profiler-pack": "^1.0", "symfony/security-bundle": "~4.2.0", "symfony/security-csrf": "^4.0", "symfony/serializer": "^4.0", @@ -56,7 +52,6 @@ "symfony/translation": "^4.0", "symfony/twig-bundle": "^4.0", "symfony/validator": "^4.0", - "symfony/web-server-bundle": "^4.0", "symfony/webpack-encore-bundle": "^1.5", "symfony/yaml": "^4.0", "twig/extensions": "^1.5", @@ -64,7 +59,9 @@ }, "require-dev": { "dama/doctrine-test-bundle": "^5.0", + "doctrine/doctrine-fixtures-bundle": "^3.2", "friendsofphp/php-cs-fixer": "^2.10", + "fzaninotto/faker": "^1.8", "phpstan/phpstan": "^0.11.7", "phpstan/phpstan-doctrine": "^0.11.4", "phpstan/phpstan-phpunit": "^0.11.2", @@ -72,8 +69,11 @@ "phpunit/phpunit": "^7.0", "symfony/browser-kit": "^4.0", "symfony/css-selector": "^4.0", + "symfony/maker-bundle": "^1.12", "symfony/phpunit-bridge": "^4.0", - "symfony/thanks": "^1.0" + "symfony/profiler-pack": "^1.0", + "symfony/thanks": "^1.0", + "symfony/web-server-bundle": "~4.2.0" }, "config": { "platform": { diff --git a/composer.lock b/composer.lock index 7db77e9f..fda3af23 100644 --- a/composer.lock +++ b/composer.lock @@ -4,27 +4,27 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "689eb3aa452e83c4ad8a67a1bae462d0", + "content-hash": "8bbf842c58bfaad43a52b2cbac25afe2", "packages": [ { "name": "beberlei/doctrineextensions", - "version": "v1.2.2", + "version": "v1.2.3", "source": { "type": "git", "url": "https://github.com/beberlei/DoctrineExtensions.git", - "reference": "53da6deefe33cff09737bdcc73ac6dbb4423691f" + "reference": "a8747a2aef34f602c365cf2efd1abc94c5ae7e0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/beberlei/DoctrineExtensions/zipball/53da6deefe33cff09737bdcc73ac6dbb4423691f", - "reference": "53da6deefe33cff09737bdcc73ac6dbb4423691f", + "url": "https://api.github.com/repos/beberlei/DoctrineExtensions/zipball/a8747a2aef34f602c365cf2efd1abc94c5ae7e0a", + "reference": "a8747a2aef34f602c365cf2efd1abc94c5ae7e0a", "shasum": "" }, "require": { + "doctrine/orm": "^2.6", "php": "^7.1" }, "require-dev": { - "doctrine/orm": "^2.6", "friendsofphp/php-cs-fixer": "^2.14", "nesbot/carbon": "*", "phpunit/phpunit": "^7.0 || ^8.0", @@ -58,7 +58,7 @@ "doctrine", "orm" ], - "time": "2019-06-24T06:58:56+00:00" + "time": "2019-07-25T15:08:53+00:00" }, { "name": "behat/transliterator", @@ -398,66 +398,6 @@ ], "time": "2018-11-21T01:24:55+00:00" }, - { - "name": "doctrine/data-fixtures", - "version": "v1.3.2", - "source": { - "type": "git", - "url": "https://github.com/doctrine/data-fixtures.git", - "reference": "09b16943b27f3d80d63988d100ff256148c2f78b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/09b16943b27f3d80d63988d100ff256148c2f78b", - "reference": "09b16943b27f3d80d63988d100ff256148c2f78b", - "shasum": "" - }, - "require": { - "doctrine/common": "~2.2", - "php": "^7.1" - }, - "conflict": { - "doctrine/phpcr-odm": "<1.3.0" - }, - "require-dev": { - "doctrine/dbal": "^2.5.4", - "doctrine/orm": "^2.5.4", - "phpunit/phpunit": "^7.0" - }, - "suggest": { - "alcaeus/mongo-php-adapter": "For using MongoDB ODM with PHP 7", - "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", - "doctrine/orm": "For loading ORM fixtures", - "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - } - ], - "description": "Data Fixtures for all Doctrine Object Managers", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "database" - ], - "time": "2019-07-10T18:30:35+00:00" - }, { "name": "doctrine/dbal", "version": "v2.9.2", @@ -720,70 +660,6 @@ ], "time": "2018-11-09T06:25:35+00:00" }, - { - "name": "doctrine/doctrine-fixtures-bundle", - "version": "3.2.2", - "source": { - "type": "git", - "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "90e4a4f968b2dae40e290a6ee516957af043f16c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/90e4a4f968b2dae40e290a6ee516957af043f16c", - "reference": "90e4a4f968b2dae40e290a6ee516957af043f16c", - "shasum": "" - }, - "require": { - "doctrine/data-fixtures": "^1.3", - "doctrine/doctrine-bundle": "^1.6", - "doctrine/orm": "^2.6.0", - "php": "^7.1", - "symfony/doctrine-bridge": "~3.4|^4.1", - "symfony/framework-bundle": "^3.4|^4.1" - }, - "require-dev": { - "doctrine/coding-standard": "^6.0", - "phpunit/phpunit": "^7.4", - "symfony/phpunit-bridge": "^4.1" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "3.2.x-dev" - } - }, - "autoload": { - "psr-4": { - "Doctrine\\Bundle\\FixturesBundle\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" - }, - { - "name": "Doctrine Project", - "homepage": "http://www.doctrine-project.org" - }, - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "Symfony DoctrineFixturesBundle", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "Fixture", - "persistence" - ], - "time": "2019-06-12T12:03:37+00:00" - }, { "name": "doctrine/doctrine-migrations-bundle", "version": "v2.0.0", @@ -1048,28 +924,30 @@ }, { "name": "doctrine/lexer", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8" + "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8", - "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/e17f069ede36f7534b95adec71910ed1b49c74ea", + "reference": "e17f069ede36f7534b95adec71910ed1b49c74ea", "shasum": "" }, "require": { - "php": ">=5.3.2" + "php": "^7.2" }, "require-dev": { - "phpunit/phpunit": "^4.5" + "doctrine/coding-standard": "^6.0", + "phpstan/phpstan": "^0.11.8", + "phpunit/phpunit": "^8.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1082,14 +960,14 @@ "MIT" ], "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, { "name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com" }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com" @@ -1104,20 +982,20 @@ "parser", "php" ], - "time": "2019-06-08T11:03:04+00:00" + "time": "2019-07-30T19:33:28+00:00" }, { "name": "doctrine/migrations", - "version": "v2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/migrations.git", - "reference": "ebe6f891a4c61574f77fc4a06d913d29236b8466" + "reference": "a89fa87a192e90179163c1e863a145c13337f442" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/migrations/zipball/ebe6f891a4c61574f77fc4a06d913d29236b8466", - "reference": "ebe6f891a4c61574f77fc4a06d913d29236b8466", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/a89fa87a192e90179163c1e863a145c13337f442", + "reference": "a89fa87a192e90179163c1e863a145c13337f442", "shasum": "" }, "require": { @@ -1186,7 +1064,7 @@ "migrations", "php" ], - "time": "2019-06-06T15:47:41+00:00" + "time": "2019-07-30T18:51:47+00:00" }, { "name": "doctrine/orm", @@ -1799,56 +1677,6 @@ ], "time": "2018-03-08T08:59:27+00:00" }, - { - "name": "fzaninotto/faker", - "version": "v1.8.0", - "source": { - "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de", - "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "ext-intl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7", - "squizlabs/php_codesniffer": "^1.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.8-dev" - } - }, - "autoload": { - "psr-4": { - "Faker\\": "src/Faker/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "François Zaninotto" - } - ], - "description": "Faker is a PHP library that generates fake data for you.", - "keywords": [ - "data", - "faker", - "fixtures" - ], - "time": "2018-07-12T10:23:15+00:00" - }, { "name": "gedmo/doctrine-extensions", "version": "v2.4.37", @@ -3594,57 +3422,6 @@ ], "time": "2019-06-17T08:53:14+00:00" }, - { - "name": "nikic/php-parser", - "version": "v4.2.2", - "source": { - "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420", - "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420", - "shasum": "" - }, - "require": { - "ext-tokenizer": "*", - "php": ">=7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.5 || ^7.0" - }, - "bin": [ - "bin/php-parse" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.2-dev" - } - }, - "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Nikita Popov" - } - ], - "description": "A PHP parser written in PHP", - "keywords": [ - "parser", - "php" - ], - "time": "2019-05-25T20:07:01+00:00" - }, { "name": "ocramius/package-versions", "version": "1.4.0", @@ -4705,7 +4482,7 @@ }, { "name": "symfony/asset", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/asset.git", @@ -4761,16 +4538,16 @@ }, { "name": "symfony/cache", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "02de00b5dfc1c00b8fd6838c5ace976b435d9d49" + "reference": "2a139a2697dbe06526b5f1d53bb0d21a574ba1f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/02de00b5dfc1c00b8fd6838c5ace976b435d9d49", - "reference": "02de00b5dfc1c00b8fd6838c5ace976b435d9d49", + "url": "https://api.github.com/repos/symfony/cache/zipball/2a139a2697dbe06526b5f1d53bb0d21a574ba1f7", + "reference": "2a139a2697dbe06526b5f1d53bb0d21a574ba1f7", "shasum": "" }, "require": { @@ -4834,20 +4611,20 @@ "caching", "psr6" ], - "time": "2019-06-17T17:31:01+00:00" + "time": "2019-06-28T08:22:31+00:00" }, { "name": "symfony/config", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "074a105281d281667c2dc23932b4aed7ef0f632a" + "reference": "637588756df1fb1c801833aead54a7153967c0cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/074a105281d281667c2dc23932b4aed7ef0f632a", - "reference": "074a105281d281667c2dc23932b4aed7ef0f632a", + "url": "https://api.github.com/repos/symfony/config/zipball/637588756df1fb1c801833aead54a7153967c0cb", + "reference": "637588756df1fb1c801833aead54a7153967c0cb", "shasum": "" }, "require": { @@ -4898,20 +4675,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2019-06-08T06:01:32+00:00" + "time": "2019-07-18T10:29:22+00:00" }, { "name": "symfony/console", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "79860cda331a2edb497c72ee487ed75c484ab75e" + "reference": "fc2e274aade6567a750551942094b2145ade9b6c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/79860cda331a2edb497c72ee487ed75c484ab75e", - "reference": "79860cda331a2edb497c72ee487ed75c484ab75e", + "url": "https://api.github.com/repos/symfony/console/zipball/fc2e274aade6567a750551942094b2145ade9b6c", + "reference": "fc2e274aade6567a750551942094b2145ade9b6c", "shasum": "" }, "require": { @@ -4970,7 +4747,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2019-06-13T10:57:15+00:00" + "time": "2019-07-24T17:13:20+00:00" }, { "name": "symfony/contracts", @@ -5051,16 +4828,16 @@ }, { "name": "symfony/debug", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "bb91fa5ab91e5ef1b2dbd365eb32cfda7b96d61b" + "reference": "f832ecacfb00688b498eedf9b10784e401d969a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/bb91fa5ab91e5ef1b2dbd365eb32cfda7b96d61b", - "reference": "bb91fa5ab91e5ef1b2dbd365eb32cfda7b96d61b", + "url": "https://api.github.com/repos/symfony/debug/zipball/f832ecacfb00688b498eedf9b10784e401d969a6", + "reference": "f832ecacfb00688b498eedf9b10784e401d969a6", "shasum": "" }, "require": { @@ -5103,20 +4880,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2019-06-19T15:26:44+00:00" + "time": "2019-07-23T09:50:15+00:00" }, { "name": "symfony/debug-bundle", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/debug-bundle.git", - "reference": "730c7361c4c66f9f5489172d8f1b606b60191937" + "reference": "7ad133ba7c5c932bca671d118aa634cd77ebb39f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/730c7361c4c66f9f5489172d8f1b606b60191937", - "reference": "730c7361c4c66f9f5489172d8f1b606b60191937", + "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/7ad133ba7c5c932bca671d118aa634cd77ebb39f", + "reference": "7ad133ba7c5c932bca671d118aa634cd77ebb39f", "shasum": "" }, "require": { @@ -5169,7 +4946,7 @@ ], "description": "Symfony DebugBundle", "homepage": "https://symfony.com", - "time": "2019-04-11T11:58:13+00:00" + "time": "2019-07-19T08:33:10+00:00" }, { "name": "symfony/debug-pack", @@ -5203,16 +4980,16 @@ }, { "name": "symfony/dependency-injection", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "299fab314fd9c785783aa419ddb0e4b1d0ffaa21" + "reference": "39fe71bc481483f255e388a658c8f1104fec037e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/299fab314fd9c785783aa419ddb0e4b1d0ffaa21", - "reference": "299fab314fd9c785783aa419ddb0e4b1d0ffaa21", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/39fe71bc481483f255e388a658c8f1104fec037e", + "reference": "39fe71bc481483f255e388a658c8f1104fec037e", "shasum": "" }, "require": { @@ -5272,20 +5049,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2019-06-13T10:57:15+00:00" + "time": "2019-07-19T12:05:51+00:00" }, { "name": "symfony/doctrine-bridge", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "9367773381a6051017e0105b2376a06f2a871a08" + "reference": "5e8d62453eda38a523a12cc918031cc8f48e4b65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/9367773381a6051017e0105b2376a06f2a871a08", - "reference": "9367773381a6051017e0105b2376a06f2a871a08", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/5e8d62453eda38a523a12cc918031cc8f48e4b65", + "reference": "5e8d62453eda38a523a12cc918031cc8f48e4b65", "shasum": "" }, "require": { @@ -5360,11 +5137,11 @@ ], "description": "Symfony Doctrine Bridge", "homepage": "https://symfony.com", - "time": "2019-06-26T06:46:55+00:00" + "time": "2019-07-27T06:08:43+00:00" }, { "name": "symfony/dotenv", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", @@ -5421,7 +5198,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -5485,7 +5262,7 @@ }, { "name": "symfony/expression-language", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/expression-language.git", @@ -5536,7 +5313,7 @@ }, { "name": "symfony/filesystem", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", @@ -5586,16 +5363,16 @@ }, { "name": "symfony/finder", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "765109d3c9e20ae0f229bb7603ca5ed89f2cae84" + "reference": "cecff7164790b0cd72be2ed20e9591d7140715e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/765109d3c9e20ae0f229bb7603ca5ed89f2cae84", - "reference": "765109d3c9e20ae0f229bb7603ca5ed89f2cae84", + "url": "https://api.github.com/repos/symfony/finder/zipball/cecff7164790b0cd72be2ed20e9591d7140715e0", + "reference": "cecff7164790b0cd72be2ed20e9591d7140715e0", "shasum": "" }, "require": { @@ -5631,7 +5408,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2019-06-13T10:57:15+00:00" + "time": "2019-06-28T12:55:49+00:00" }, { "name": "symfony/flex", @@ -5684,16 +5461,16 @@ }, { "name": "symfony/form", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/form.git", - "reference": "9ceda90f34d7670627c00806380a30973bcc694f" + "reference": "c694ef3befb1e4bba58c33522533ecf1e11fd470" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/form/zipball/9ceda90f34d7670627c00806380a30973bcc694f", - "reference": "9ceda90f34d7670627c00806380a30973bcc694f", + "url": "https://api.github.com/repos/symfony/form/zipball/c694ef3befb1e4bba58c33522533ecf1e11fd470", + "reference": "c694ef3befb1e4bba58c33522533ecf1e11fd470", "shasum": "" }, "require": { @@ -5762,20 +5539,20 @@ ], "description": "Symfony Form Component", "homepage": "https://symfony.com", - "time": "2019-06-26T06:46:55+00:00" + "time": "2019-07-19T16:57:10+00:00" }, { "name": "symfony/framework-bundle", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "043be519a7e90c577f32e57d77c5b4af627f254a" + "reference": "ac12bd9f104bb2dc319b09426e767ecfa95688da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/043be519a7e90c577f32e57d77c5b4af627f254a", - "reference": "043be519a7e90c577f32e57d77c5b4af627f254a", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/ac12bd9f104bb2dc319b09426e767ecfa95688da", + "reference": "ac12bd9f104bb2dc319b09426e767ecfa95688da", "shasum": "" }, "require": { @@ -5784,6 +5561,7 @@ "symfony/cache": "~4.2", "symfony/config": "~4.2", "symfony/contracts": "^1.0.2", + "symfony/debug": "~4.0", "symfony/dependency-injection": "^4.2.5", "symfony/event-dispatcher": "^4.1", "symfony/filesystem": "~3.4|~4.0", @@ -5881,20 +5659,20 @@ ], "description": "Symfony FrameworkBundle", "homepage": "https://symfony.com", - "time": "2019-06-26T06:46:55+00:00" + "time": "2019-07-24T17:13:20+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "f7b5d04bea565a270db5d8158c1093cfa1ec10b2" + "reference": "3f9f40ff0fc507b9994f182c5598e632d0bdaf3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f7b5d04bea565a270db5d8158c1093cfa1ec10b2", - "reference": "f7b5d04bea565a270db5d8158c1093cfa1ec10b2", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/3f9f40ff0fc507b9994f182c5598e632d0bdaf3c", + "reference": "3f9f40ff0fc507b9994f182c5598e632d0bdaf3c", "shasum": "" }, "require": { @@ -5935,20 +5713,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2019-06-26T09:24:49+00:00" + "time": "2019-07-23T09:50:15+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "fd6c193e8d613c53f6b05eb8e4009cc4c438fc46" + "reference": "4315ef021fa1daf271eabc4ec0b6644dcbdbba7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fd6c193e8d613c53f6b05eb8e4009cc4c438fc46", - "reference": "fd6c193e8d613c53f6b05eb8e4009cc4c438fc46", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4315ef021fa1daf271eabc4ec0b6644dcbdbba7b", + "reference": "4315ef021fa1daf271eabc4ec0b6644dcbdbba7b", "shasum": "" }, "require": { @@ -6024,11 +5802,11 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2019-06-26T14:19:57+00:00" + "time": "2019-07-28T07:05:06+00:00" }, { "name": "symfony/inflector", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/inflector.git", @@ -6086,16 +5864,16 @@ }, { "name": "symfony/intl", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/intl.git", - "reference": "b16ad9aa3392f6360815c990b4c635db19ec533c" + "reference": "94aed330eda5cfe171bbd596d898c065e94c132f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/intl/zipball/b16ad9aa3392f6360815c990b4c635db19ec533c", - "reference": "b16ad9aa3392f6360815c990b4c635db19ec533c", + "url": "https://api.github.com/repos/symfony/intl/zipball/94aed330eda5cfe171bbd596d898c065e94c132f", + "reference": "94aed330eda5cfe171bbd596d898c065e94c132f", "shasum": "" }, "require": { @@ -6157,79 +5935,11 @@ "l10n", "localization" ], - "time": "2019-06-17T17:15:38+00:00" - }, - { - "name": "symfony/maker-bundle", - "version": "v1.12.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/maker-bundle.git", - "reference": "201d0e050dca336c44f93657ce1f34f3b3868432" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/201d0e050dca336c44f93657ce1f34f3b3868432", - "reference": "201d0e050dca336c44f93657ce1f34f3b3868432", - "shasum": "" - }, - "require": { - "doctrine/inflector": "^1.2", - "nikic/php-parser": "^4.0", - "php": "^7.0.8", - "symfony/config": "^3.4|^4.0", - "symfony/console": "^3.4|^4.0", - "symfony/dependency-injection": "^3.4|^4.0", - "symfony/filesystem": "^3.4|^4.0", - "symfony/finder": "^3.4|^4.0", - "symfony/framework-bundle": "^3.4|^4.0", - "symfony/http-kernel": "^3.4|^4.0" - }, - "require-dev": { - "doctrine/doctrine-bundle": "^1.8", - "doctrine/orm": "^2.3", - "friendsofphp/php-cs-fixer": "^2.8", - "friendsoftwig/twigcs": "^3.1.2", - "symfony/http-client": "^4.3", - "symfony/phpunit-bridge": "^3.4.19|^4.0", - "symfony/process": "^3.4|^4.0", - "symfony/security-core": "^3.4|^4.0", - "symfony/yaml": "^3.4|^4.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Bundle\\MakerBundle\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Maker helps you create empty commands, controllers, form classes, tests and more so you can forget about writing boilerplate code.", - "homepage": "https://symfony.com/doc/current/bundles/SymfonyMakerBundle/index.html", - "keywords": [ - "code generator", - "generator", - "scaffold", - "scaffolding" - ], - "time": "2019-07-09T22:19:18+00:00" + "time": "2019-07-24T14:47:26+00:00" }, { "name": "symfony/monolog-bridge", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bridge.git", @@ -6360,7 +6070,7 @@ }, { "name": "symfony/options-resolver", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", @@ -6732,55 +6442,6 @@ ], "time": "2019-02-06T07:57:58+00:00" }, - { - "name": "symfony/process", - "version": "v4.2.10", - "source": { - "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2", - "reference": "808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2", - "shasum": "" - }, - "require": { - "php": "^7.1.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Process\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Process Component", - "homepage": "https://symfony.com", - "time": "2019-05-30T16:06:08+00:00" - }, { "name": "symfony/profiler-pack", "version": "v1.0.4", @@ -6811,16 +6472,16 @@ }, { "name": "symfony/property-access", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "f4a3d1bac7e2bf5e3bdced07440ea8bcb125dc79" + "reference": "c3532a4bdb785446970148da68e03dc11514e256" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/f4a3d1bac7e2bf5e3bdced07440ea8bcb125dc79", - "reference": "f4a3d1bac7e2bf5e3bdced07440ea8bcb125dc79", + "url": "https://api.github.com/repos/symfony/property-access/zipball/c3532a4bdb785446970148da68e03dc11514e256", + "reference": "c3532a4bdb785446970148da68e03dc11514e256", "shasum": "" }, "require": { @@ -6874,20 +6535,20 @@ "property path", "reflection" ], - "time": "2019-06-06T10:03:46+00:00" + "time": "2019-07-24T14:47:26+00:00" }, { "name": "symfony/property-info", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "2d9a4c11bb759e6a9827e2fc7be6c790d6ba0ea1" + "reference": "c5d4e006eb3fb386c5b68cd3b1dbb3f0cc6516df" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/2d9a4c11bb759e6a9827e2fc7be6c790d6ba0ea1", - "reference": "2d9a4c11bb759e6a9827e2fc7be6c790d6ba0ea1", + "url": "https://api.github.com/repos/symfony/property-info/zipball/c5d4e006eb3fb386c5b68cd3b1dbb3f0cc6516df", + "reference": "c5d4e006eb3fb386c5b68cd3b1dbb3f0cc6516df", "shasum": "" }, "require": { @@ -6950,11 +6611,11 @@ "type", "validator" ], - "time": "2019-05-20T16:15:26+00:00" + "time": "2019-07-21T17:35:01+00:00" }, { "name": "symfony/routing", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", @@ -7112,16 +6773,16 @@ }, { "name": "symfony/security-bundle", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/security-bundle.git", - "reference": "05034e041d0a2195d53be455d46c540d0b81de2d" + "reference": "48078d9ed0d88b1b902554dc870e78f3c20d53e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-bundle/zipball/05034e041d0a2195d53be455d46c540d0b81de2d", - "reference": "05034e041d0a2195d53be455d46c540d0b81de2d", + "url": "https://api.github.com/repos/symfony/security-bundle/zipball/48078d9ed0d88b1b902554dc870e78f3c20d53e8", + "reference": "48078d9ed0d88b1b902554dc870e78f3c20d53e8", "shasum": "" }, "require": { @@ -7194,20 +6855,20 @@ ], "description": "Symfony SecurityBundle", "homepage": "https://symfony.com", - "time": "2019-05-30T16:06:08+00:00" + "time": "2019-07-27T05:24:50+00:00" }, { "name": "symfony/serializer", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/serializer.git", - "reference": "a6998984139d40d347a857abc6bb3e9a8319ae29" + "reference": "8a2974c10e8eb8eb2d36a28c1bd68eb0b411cc60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/serializer/zipball/a6998984139d40d347a857abc6bb3e9a8319ae29", - "reference": "a6998984139d40d347a857abc6bb3e9a8319ae29", + "url": "https://api.github.com/repos/symfony/serializer/zipball/8a2974c10e8eb8eb2d36a28c1bd68eb0b411cc60", + "reference": "8a2974c10e8eb8eb2d36a28c1bd68eb0b411cc60", "shasum": "" }, "require": { @@ -7274,11 +6935,11 @@ ], "description": "Symfony Serializer Component", "homepage": "https://symfony.com", - "time": "2019-06-17T17:15:38+00:00" + "time": "2019-07-19T12:05:51+00:00" }, { "name": "symfony/stopwatch", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", @@ -7393,7 +7054,7 @@ }, { "name": "symfony/templating", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/templating.git", @@ -7449,16 +7110,16 @@ }, { "name": "symfony/translation", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "9b7a706c4cb0cd52063374fb63d133166e50aaa6" + "reference": "4b84015894d980745b510ba90492722cafe2f90f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/9b7a706c4cb0cd52063374fb63d133166e50aaa6", - "reference": "9b7a706c4cb0cd52063374fb63d133166e50aaa6", + "url": "https://api.github.com/repos/symfony/translation/zipball/4b84015894d980745b510ba90492722cafe2f90f", + "reference": "4b84015894d980745b510ba90492722cafe2f90f", "shasum": "" }, "require": { @@ -7520,20 +7181,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-06-13T10:57:15+00:00" + "time": "2019-07-18T10:29:22+00:00" }, { "name": "symfony/twig-bridge", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "234bd51d116f28379d90fdbc22b25a7356b201eb" + "reference": "708a993aaf3b979738d6e0a12bf157f02fc94998" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/234bd51d116f28379d90fdbc22b25a7356b201eb", - "reference": "234bd51d116f28379d90fdbc22b25a7356b201eb", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/708a993aaf3b979738d6e0a12bf157f02fc94998", + "reference": "708a993aaf3b979738d6e0a12bf157f02fc94998", "shasum": "" }, "require": { @@ -7612,25 +7273,26 @@ ], "description": "Symfony Twig Bridge", "homepage": "https://symfony.com", - "time": "2019-06-26T07:37:26+00:00" + "time": "2019-07-24T19:56:58+00:00" }, { "name": "symfony/twig-bundle", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/twig-bundle.git", - "reference": "648472323d703908dc8c7698b867c4970724b4cf" + "reference": "db06490aeabba37dfc55a53fbf901c75e0d4f7b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/648472323d703908dc8c7698b867c4970724b4cf", - "reference": "648472323d703908dc8c7698b867c4970724b4cf", + "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/db06490aeabba37dfc55a53fbf901c75e0d4f7b0", + "reference": "db06490aeabba37dfc55a53fbf901c75e0d4f7b0", "shasum": "" }, "require": { "php": "^7.1.3", "symfony/config": "~4.2", + "symfony/debug": "~4.0", "symfony/http-foundation": "~4.1", "symfony/http-kernel": "~4.1", "symfony/polyfill-ctype": "~1.8", @@ -7688,20 +7350,20 @@ ], "description": "Symfony TwigBundle", "homepage": "https://symfony.com", - "time": "2019-05-30T16:06:08+00:00" + "time": "2019-07-19T08:33:10+00:00" }, { "name": "symfony/validator", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "7c392e35f6c57e23f72b5a5fde4366e13a9e6fa0" + "reference": "7b4485db55b7ea1a0d13d126c2781313017f815f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/7c392e35f6c57e23f72b5a5fde4366e13a9e6fa0", - "reference": "7c392e35f6c57e23f72b5a5fde4366e13a9e6fa0", + "url": "https://api.github.com/repos/symfony/validator/zipball/7b4485db55b7ea1a0d13d126c2781313017f815f", + "reference": "7b4485db55b7ea1a0d13d126c2781313017f815f", "shasum": "" }, "require": { @@ -7777,20 +7439,20 @@ ], "description": "Symfony Validator Component", "homepage": "https://symfony.com", - "time": "2019-06-22T08:13:40+00:00" + "time": "2019-07-19T12:05:51+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "4ccbf78563f30ea9a05f1a802bdc3c1826ea592a" + "reference": "4e18e041a477edbb8c54e053f179672f9413816c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4ccbf78563f30ea9a05f1a802bdc3c1826ea592a", - "reference": "4ccbf78563f30ea9a05f1a802bdc3c1826ea592a", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4e18e041a477edbb8c54e053f179672f9413816c", + "reference": "4e18e041a477edbb8c54e053f179672f9413816c", "shasum": "" }, "require": { @@ -7853,11 +7515,11 @@ "debug", "dump" ], - "time": "2019-06-17T17:15:38+00:00" + "time": "2019-07-27T06:42:33+00:00" }, { "name": "symfony/var-exporter", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", @@ -7917,16 +7579,16 @@ }, { "name": "symfony/web-profiler-bundle", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "a0e8afe6bd6295483c56266b345ca532d9f687eb" + "reference": "e7b916235f8a1d33010ab707fb08943cf8573c1e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/a0e8afe6bd6295483c56266b345ca532d9f687eb", - "reference": "a0e8afe6bd6295483c56266b345ca532d9f687eb", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/e7b916235f8a1d33010ab707fb08943cf8573c1e", + "reference": "e7b916235f8a1d33010ab707fb08943cf8573c1e", "shasum": "" }, "require": { @@ -7979,66 +7641,7 @@ ], "description": "Symfony WebProfilerBundle", "homepage": "https://symfony.com", - "time": "2019-05-30T16:06:08+00:00" - }, - { - "name": "symfony/web-server-bundle", - "version": "v4.2.10", - "source": { - "type": "git", - "url": "https://github.com/symfony/web-server-bundle.git", - "reference": "91945ba7f59f2a4b4194f018da9d7aaedaf88418" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/web-server-bundle/zipball/91945ba7f59f2a4b4194f018da9d7aaedaf88418", - "reference": "91945ba7f59f2a4b4194f018da9d7aaedaf88418", - "shasum": "" - }, - "require": { - "php": "^7.1.3", - "symfony/config": "~3.4|~4.0", - "symfony/console": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/http-kernel": "~3.4|~4.0", - "symfony/polyfill-ctype": "~1.8", - "symfony/process": "^3.4.2|^4.0.2" - }, - "suggest": { - "symfony/expression-language": "For using the filter option of the log server.", - "symfony/monolog-bridge": "For using the log server." - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "4.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Bundle\\WebServerBundle\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony WebServerBundle", - "homepage": "https://symfony.com", - "time": "2019-03-04T10:37:56+00:00" + "time": "2019-07-24T14:47:26+00:00" }, { "name": "symfony/webpack-encore-bundle", @@ -8098,16 +7701,16 @@ }, { "name": "symfony/yaml", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "6712daf03ee25b53abb14e7e8e0ede1a770efdb1" + "reference": "9468fef6f1c740b96935e9578560a9e9189ca154" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/6712daf03ee25b53abb14e7e8e0ede1a770efdb1", - "reference": "6712daf03ee25b53abb14e7e8e0ede1a770efdb1", + "url": "https://api.github.com/repos/symfony/yaml/zipball/9468fef6f1c740b96935e9578560a9e9189ca154", + "reference": "9468fef6f1c740b96935e9578560a9e9189ca154", "shasum": "" }, "require": { @@ -8153,7 +7756,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-03-30T15:58:42+00:00" + "time": "2019-07-24T14:47:26+00:00" }, { "name": "twig/extensions", @@ -8859,6 +8462,130 @@ ], "time": "2019-03-22T10:34:17+00:00" }, + { + "name": "doctrine/data-fixtures", + "version": "v1.3.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/data-fixtures.git", + "reference": "09b16943b27f3d80d63988d100ff256148c2f78b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/data-fixtures/zipball/09b16943b27f3d80d63988d100ff256148c2f78b", + "reference": "09b16943b27f3d80d63988d100ff256148c2f78b", + "shasum": "" + }, + "require": { + "doctrine/common": "~2.2", + "php": "^7.1" + }, + "conflict": { + "doctrine/phpcr-odm": "<1.3.0" + }, + "require-dev": { + "doctrine/dbal": "^2.5.4", + "doctrine/orm": "^2.5.4", + "phpunit/phpunit": "^7.0" + }, + "suggest": { + "alcaeus/mongo-php-adapter": "For using MongoDB ODM with PHP 7", + "doctrine/mongodb-odm": "For loading MongoDB ODM fixtures", + "doctrine/orm": "For loading ORM fixtures", + "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Common\\DataFixtures\\": "lib/Doctrine/Common/DataFixtures" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } + ], + "description": "Data Fixtures for all Doctrine Object Managers", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "database" + ], + "time": "2019-07-10T18:30:35+00:00" + }, + { + "name": "doctrine/doctrine-fixtures-bundle", + "version": "3.2.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", + "reference": "90e4a4f968b2dae40e290a6ee516957af043f16c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/90e4a4f968b2dae40e290a6ee516957af043f16c", + "reference": "90e4a4f968b2dae40e290a6ee516957af043f16c", + "shasum": "" + }, + "require": { + "doctrine/data-fixtures": "^1.3", + "doctrine/doctrine-bundle": "^1.6", + "doctrine/orm": "^2.6.0", + "php": "^7.1", + "symfony/doctrine-bridge": "~3.4|^4.1", + "symfony/framework-bundle": "^3.4|^4.1" + }, + "require-dev": { + "doctrine/coding-standard": "^6.0", + "phpunit/phpunit": "^7.4", + "symfony/phpunit-bridge": "^4.1" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "3.2.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Bundle\\FixturesBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "http://symfony.com/contributors" + }, + { + "name": "Doctrine Project", + "homepage": "http://www.doctrine-project.org" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Symfony DoctrineFixturesBundle", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "Fixture", + "persistence" + ], + "time": "2019-06-12T12:03:37+00:00" + }, { "name": "friendsofphp/php-cs-fixer", "version": "v2.15.1", @@ -8947,6 +8674,56 @@ "description": "A tool to automatically fix PHP code style", "time": "2019-06-01T10:32:12+00:00" }, + { + "name": "fzaninotto/faker", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/fzaninotto/Faker.git", + "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/f72816b43e74063c8b10357394b6bba8cb1c10de", + "reference": "f72816b43e74063c8b10357394b6bba8cb1c10de", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "require-dev": { + "ext-intl": "*", + "phpunit/phpunit": "^4.8.35 || ^5.7", + "squizlabs/php_codesniffer": "^1.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Faker\\": "src/Faker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Zaninotto" + } + ], + "description": "Faker is a PHP library that generates fake data for you.", + "keywords": [ + "data", + "faker", + "fixtures" + ], + "time": "2018-07-12T10:23:15+00:00" + }, { "name": "jean85/pretty-package-versions", "version": "1.2", @@ -9521,6 +9298,57 @@ ], "time": "2019-03-22T01:00:30+00:00" }, + { + "name": "nikic/php-parser", + "version": "v4.2.2", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420", + "reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.5 || ^7.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "time": "2019-05-25T20:07:01+00:00" + }, { "name": "phar-io/manifest", "version": "1.0.3", @@ -10254,16 +10082,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c" + "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c", - "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e899757bb3df5ff6e95089132f32cd59aac2220a", + "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a", "shasum": "" }, "require": { @@ -10276,7 +10104,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -10299,7 +10127,7 @@ "keywords": [ "tokenizer" ], - "time": "2019-07-08T05:24:54+00:00" + "time": "2019-07-25T05:29:42+00:00" }, { "name": "phpunit/phpunit", @@ -10953,7 +10781,7 @@ }, { "name": "symfony/browser-kit", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", @@ -11010,7 +10838,7 @@ }, { "name": "symfony/css-selector", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -11044,14 +10872,14 @@ "MIT" ], "authors": [ - { - "name": "Jean-François Simon", - "email": "jeanfrancois.simon@sensiolabs.com" - }, { "name": "Fabien Potencier", "email": "fabien@symfony.com" }, + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" @@ -11063,7 +10891,7 @@ }, { "name": "symfony/dom-crawler", - "version": "v4.2.10", + "version": "v4.2.11", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", @@ -11119,17 +10947,85 @@ "time": "2019-06-13T10:57:15+00:00" }, { - "name": "symfony/phpunit-bridge", - "version": "v4.3.2", + "name": "symfony/maker-bundle", + "version": "v1.12.0", "source": { "type": "git", - "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "573b5c4a36a171b94cf031d8dc6cc568082190f1" + "url": "https://github.com/symfony/maker-bundle.git", + "reference": "201d0e050dca336c44f93657ce1f34f3b3868432" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/573b5c4a36a171b94cf031d8dc6cc568082190f1", - "reference": "573b5c4a36a171b94cf031d8dc6cc568082190f1", + "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/201d0e050dca336c44f93657ce1f34f3b3868432", + "reference": "201d0e050dca336c44f93657ce1f34f3b3868432", + "shasum": "" + }, + "require": { + "doctrine/inflector": "^1.2", + "nikic/php-parser": "^4.0", + "php": "^7.0.8", + "symfony/config": "^3.4|^4.0", + "symfony/console": "^3.4|^4.0", + "symfony/dependency-injection": "^3.4|^4.0", + "symfony/filesystem": "^3.4|^4.0", + "symfony/finder": "^3.4|^4.0", + "symfony/framework-bundle": "^3.4|^4.0", + "symfony/http-kernel": "^3.4|^4.0" + }, + "require-dev": { + "doctrine/doctrine-bundle": "^1.8", + "doctrine/orm": "^2.3", + "friendsofphp/php-cs-fixer": "^2.8", + "friendsoftwig/twigcs": "^3.1.2", + "symfony/http-client": "^4.3", + "symfony/phpunit-bridge": "^3.4.19|^4.0", + "symfony/process": "^3.4|^4.0", + "symfony/security-core": "^3.4|^4.0", + "symfony/yaml": "^3.4|^4.0" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bundle\\MakerBundle\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Maker helps you create empty commands, controllers, form classes, tests and more so you can forget about writing boilerplate code.", + "homepage": "https://symfony.com/doc/current/bundles/SymfonyMakerBundle/index.html", + "keywords": [ + "code generator", + "generator", + "scaffold", + "scaffolding" + ], + "time": "2019-07-09T22:19:18+00:00" + }, + { + "name": "symfony/phpunit-bridge", + "version": "v4.3.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/phpunit-bridge.git", + "reference": "5a7b67f3c407ad8199cedb10f71a36ab5ccd44ac" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/5a7b67f3c407ad8199cedb10f71a36ab5ccd44ac", + "reference": "5a7b67f3c407ad8199cedb10f71a36ab5ccd44ac", "shasum": "" }, "require": { @@ -11181,7 +11077,56 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2019-06-26T12:14:14+00:00" + "time": "2019-07-18T13:23:37+00:00" + }, + { + "name": "symfony/process", + "version": "v4.2.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2", + "reference": "808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Process\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Process Component", + "homepage": "https://symfony.com", + "time": "2019-05-30T16:06:08+00:00" }, { "name": "symfony/thanks", @@ -11226,6 +11171,65 @@ "description": "Give thanks (in the form of a GitHub ⭐) to your fellow PHP package maintainers (not limited to Symfony components)!", "time": "2018-08-24T14:08:13+00:00" }, + { + "name": "symfony/web-server-bundle", + "version": "v4.2.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/web-server-bundle.git", + "reference": "91945ba7f59f2a4b4194f018da9d7aaedaf88418" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/web-server-bundle/zipball/91945ba7f59f2a4b4194f018da9d7aaedaf88418", + "reference": "91945ba7f59f2a4b4194f018da9d7aaedaf88418", + "shasum": "" + }, + "require": { + "php": "^7.1.3", + "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", + "symfony/dependency-injection": "~3.4|~4.0", + "symfony/http-kernel": "~3.4|~4.0", + "symfony/polyfill-ctype": "~1.8", + "symfony/process": "^3.4.2|^4.0.2" + }, + "suggest": { + "symfony/expression-language": "For using the filter option of the log server.", + "symfony/monolog-bridge": "For using the log server." + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bundle\\WebServerBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony WebServerBundle", + "homepage": "https://symfony.com", + "time": "2019-03-04T10:37:56+00:00" + }, { "name": "theseer/tokenizer", "version": "1.1.3", diff --git a/src/Command/ConvertTimezoneCommand.php b/src/Command/ConvertTimezoneCommand.php deleted file mode 100644 index fe019db9..00000000 --- a/src/Command/ConvertTimezoneCommand.php +++ /dev/null @@ -1,151 +0,0 @@ -repository = $repository; - - parent::__construct(); - } - - /** - * {@inheritdoc} - */ - protected function configure() - { - $this - ->setName('kimai:convert-timezone') - ->setDescription('Convert timesheet dates between timezones, only made for updates from 0.7 to 0.8') - ->setHelp('This command should only be required if you imported data from Kimai v1') - ->addOption('first-id', 'f', InputArgument::OPTIONAL, 'The database ID which should be converted first') - ->addOption('last-id', 'l', InputArgument::OPTIONAL, 'The database ID which should be converted last') - ; - } - - /** - * @param null|string $start - * @param null|string $end - * @return Timesheet[] - */ - protected function getTimesheets($start = null, $end = null) - { - $qb = $this->repository->createQueryBuilder('t'); - - $qb->select('t'); - if (!empty($start)) { - $qb->andWhere($qb->expr()->gte('t.id', $start)); - } - if (!empty($end)) { - $qb->andWhere($qb->expr()->lte('t.id', $end)); - } - - return $qb->getQuery()->getResult(); - } - - /** - * @param Timesheet $timesheet - * @param \DateTimeZone $timeZone - * @return Timesheet - */ - protected function convertTimesheet(Timesheet $timesheet, \DateTimeZone $timeZone): Timesheet - { - $oldTimezone = $timesheet->getTimezone(); - - if (null !== $timesheet->getBegin()) { - $beginDate = clone $timesheet->getBegin(); - $beginDate->setTimezone($timeZone); - $timesheet->setBegin($beginDate); - } - - if (null !== $timesheet->getEnd()) { - $endDate = clone $timesheet->getEnd(); - $endDate->setTimezone($timeZone); - $timesheet->setEnd($endDate); - } - - $timesheet->setTimezone($oldTimezone); - - return $timesheet; - } - - /** - * {@inheritdoc} - */ - protected function execute(InputInterface $input, OutputInterface $output) - { - Type::overrideType(Type::DATETIME, DateTimeType::class); - - $io = new SymfonyStyle($input, $output); - - $start = $input->getOption('first-id'); - $end = $input->getOption('last-id'); - - $result = $this->getTimesheets($start, $end); - $amount = count($result); - - $answer = $io->ask(sprintf('This will update %s timesheet records, continue (y/n) ? ', $amount), 'y'); - - if ('y' !== $answer) { - $io->text('Aborting.'); - - return 1; - } - - $utc = new \DateTimeZone('UTC'); - $i = 0; - - /** @var Timesheet $timesheet */ - foreach ($result as $timesheet) { - $timesheet = $this->convertTimesheet($timesheet, $utc); - $this->repository->save($timesheet); - - if (++$i % 80 === 0) { - $io->writeln('. (' . $i . '/' . $amount . ')'); - } else { - $io->write('.'); - } - } - - $io->writeln('. (' . $i . '/' . $amount . ')'); - $io->writeln(''); - - return 0; - } -} diff --git a/src/Command/CreateReleaseCommand.php b/src/Command/CreateReleaseCommand.php index c6f3684c..f3be59d1 100644 --- a/src/Command/CreateReleaseCommand.php +++ b/src/Command/CreateReleaseCommand.php @@ -51,6 +51,14 @@ class CreateReleaseCommand extends Command ->addOption('directory', null, InputOption::VALUE_OPTIONAL, 'Directory where the release package will be stored', 'var/data/') ->addOption('release', null, InputOption::VALUE_OPTIONAL, 'The version that should be zipped', Constants::VERSION) ; + + /* + * Hide this command in production. + * Maybe it should be de-activated completely?! + */ + if (getenv('APP_ENV') === 'prod') { + $this->setHidden(true); + } } /** diff --git a/src/Command/ResetCommand.php b/src/Command/ResetCommand.php index ab002a9d..6f742dcc 100644 --- a/src/Command/ResetCommand.php +++ b/src/Command/ResetCommand.php @@ -9,6 +9,7 @@ namespace App\Command; +use Exception; use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\ArrayInput; @@ -46,6 +47,17 @@ EOT ; } + /** + * Make sure that this command CANNOT be executed in production. + * It can't work, as the fixtures bundle is not available in production. + * + * @return bool + */ + public function isEnabled() + { + return getenv('APP_ENV') !== 'prod'; + } + /** * @param InputInterface $input * @param OutputInterface $output @@ -55,17 +67,11 @@ EOT { $io = new SymfonyStyle($input, $output); - if (getenv('APP_ENV') === 'prod') { - $io->error('kimai:reset-dev is not allowed in production'); - - return -1; - } - if ($this->askConfirmation($input, $output, 'Do you want to create the database y/N ?')) { try { $command = $this->getApplication()->find('doctrine:database:create'); $command->run(new ArrayInput([]), $output); - } catch (\Exception $ex) { + } catch (Exception $ex) { $io->error('Failed to create database: ' . $ex->getMessage()); return 1; @@ -76,7 +82,7 @@ EOT try { $command = $this->getApplication()->find('doctrine:schema:drop'); $command->run(new ArrayInput(['--force' => true]), $output); - } catch (\Exception $ex) { + } catch (Exception $ex) { $io->error('Failed to drop database schema: ' . $ex->getMessage()); return 2; @@ -85,7 +91,7 @@ EOT try { $command = $this->getApplication()->find('doctrine:schema:create'); $command->run(new ArrayInput([]), $output); - } catch (\Exception $ex) { + } catch (Exception $ex) { $io->error('Failed to create database schema: ' . $ex->getMessage()); return 3; @@ -97,7 +103,7 @@ EOT $cmdInput = new ArrayInput([]); $cmdInput->setInteractive(false); $command->run($cmdInput, $output); - } catch (\Exception $ex) { + } catch (Exception $ex) { $io->error('Failed to import fixtures: ' . $ex->getMessage()); return 4; @@ -108,7 +114,7 @@ EOT $cmdInput = new ArrayInput(['--add' => true, '--all' => true]); $cmdInput->setInteractive(false); $command->run($cmdInput, $output); - } catch (\Exception $ex) { + } catch (Exception $ex) { $io->error('Failed to set migration status: ' . $ex->getMessage()); return 5; @@ -118,7 +124,7 @@ EOT $command = $this->getApplication()->find('cache:clear'); try { $command->run(new ArrayInput([]), $output); - } catch (\Exception $ex) { + } catch (Exception $ex) { $io->error('Failed to clear cache: ' . $ex->getMessage()); return 6; diff --git a/src/Entity/Timesheet.php b/src/Entity/Timesheet.php index b945818d..d69fecca 100644 --- a/src/Entity/Timesheet.php +++ b/src/Entity/Timesheet.php @@ -9,6 +9,8 @@ namespace App\Entity; +use DateTime; +use DateTimeZone; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; @@ -48,7 +50,7 @@ class Timesheet implements EntityWithMetaFields private $id; /** - * @var \DateTime + * @var DateTime * * @ORM\Column(name="start_time", type="datetime", nullable=false) * @Assert\NotNull() @@ -56,7 +58,7 @@ class Timesheet implements EntityWithMetaFields private $begin; /** - * @var \DateTime + * @var DateTime * * @ORM\Column(name="end_time", type="datetime", nullable=true) */ @@ -188,17 +190,17 @@ class Timesheet implements EntityWithMetaFields } if (null !== $this->begin) { - $this->begin->setTimeZone(new \DateTimeZone($this->timezone)); + $this->begin->setTimeZone(new DateTimeZone($this->timezone)); } if (null !== $this->end) { - $this->end->setTimeZone(new \DateTimeZone($this->timezone)); + $this->end->setTimeZone(new DateTimeZone($this->timezone)); } $this->localized = true; } - public function getBegin(): ?\DateTime + public function getBegin(): ?DateTime { $this->localizeDates(); @@ -206,10 +208,10 @@ class Timesheet implements EntityWithMetaFields } /** - * @param \DateTime $begin + * @param DateTime $begin * @return Timesheet */ - public function setBegin(\DateTime $begin): Timesheet + public function setBegin(DateTime $begin): Timesheet { $this->begin = $begin; $this->timezone = $begin->getTimezone()->getName(); @@ -217,7 +219,7 @@ class Timesheet implements EntityWithMetaFields return $this; } - public function getEnd(): ?\DateTime + public function getEnd(): ?DateTime { $this->localizeDates(); @@ -225,10 +227,10 @@ class Timesheet implements EntityWithMetaFields } /** - * @param \DateTime $end + * @param DateTime $end * @return Timesheet */ - public function setEnd(?\DateTime $end): Timesheet + public function setEnd(?DateTime $end): Timesheet { $this->end = $end; @@ -422,10 +424,10 @@ class Timesheet implements EntityWithMetaFields } /** - * BE WARNED: this method should NOT be used programmatically, there is very likely no reason for it! + * BE WARNED: this method should NOT be used. + * It was ONLY introduced for the command "kimai:import-v1". * * @internal - * @deprecated since it was introduced, only meant for the initial migration. Will be removed with 1.0. * @param string $timezone * @return Timesheet */