From 8a8f5cb6ce5e8c9f43279104b3537f736c4a147a Mon Sep 17 00:00:00 2001 From: Kevin Papst Date: Sat, 24 Oct 2020 19:33:49 +0200 Subject: [PATCH] Fix Composer 2 compatibility (#2056) --- composer.json | 1 - composer.lock | 89 ++++++------------------ src/Form/Type/DateRangeType.php | 1 - symfony.lock | 3 - tests/DataFixtures/TimesheetFixtures.php | 1 + 5 files changed, 24 insertions(+), 71 deletions(-) diff --git a/composer.json b/composer.json index e8abddd2..70f6e92d 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,6 @@ "jms/metadata": "^2.0", "jms/serializer-bundle": "^3.2", "kevinpapst/adminlte-bundle": "^3.0", - "kimai/kimai2-composer": "^0.1", "kimai/user-bundle": "^1.1", "laravolt/avatar": "^3.0", "league/csv": "^9.4", diff --git a/composer.lock b/composer.lock index b0d21de7..522ce36f 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "f47c3d8af4e41b30f62641f10408fbcb", + "content-hash": "ac12305a3b408d263503ffa2a58461b6", "packages": [ { "name": "beberlei/doctrineextensions", @@ -3156,58 +3156,6 @@ ], "time": "2020-05-20T15:37:54+00:00" }, - { - "name": "kimai/kimai2-composer", - "version": "0.1", - "source": { - "type": "git", - "url": "https://github.com/kimai/kimai2-composer.git", - "reference": "7ff68f4270d2e48920309a3c1530f4d247a24905" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/kimai/kimai2-composer/zipball/7ff68f4270d2e48920309a3c1530f4d247a24905", - "reference": "7ff68f4270d2e48920309a3c1530f4d247a24905", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0" - }, - "require-dev": { - "composer/composer": "^1.0", - "composer/semver": "^1.0", - "friendsofphp/php-cs-fixer": "^2.10" - }, - "type": "composer-plugin", - "extra": { - "class": "Kimai2\\Composer\\Plugin" - }, - "autoload": { - "psr-4": { - "Kimai2\\Composer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Kevin Papst", - "email": "kpapst@gmx.net", - "homepage": "https://github.com/kevinpapst" - } - ], - "description": "An installer for Kimai 2 plugins", - "homepage": "https://github.com/kimai/kimai2-composer", - "keywords": [ - "Kimai", - "installer", - "time-tracker", - "time-tracking" - ], - "time": "2019-03-10T19:34:31+00:00" - }, { "name": "kimai/user-bundle", "version": "1.2.2", @@ -6527,16 +6475,16 @@ }, { "name": "symfony/flex", - "version": "v1.8.4", + "version": "v1.9.10", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "7df5a72c7664baab629ec33de7890e9e3996b51b" + "reference": "7335ec033995aa34133e621627333368f260b626" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/7df5a72c7664baab629ec33de7890e9e3996b51b", - "reference": "7df5a72c7664baab629ec33de7890e9e3996b51b", + "url": "https://api.github.com/repos/symfony/flex/zipball/7335ec033995aa34133e621627333368f260b626", + "reference": "7335ec033995aa34133e621627333368f260b626", "shasum": "" }, "require": { @@ -6552,7 +6500,7 @@ "type": "composer-plugin", "extra": { "branch-alias": { - "dev-master": "1.8-dev" + "dev-main": "1.9-dev" }, "class": "Symfony\\Flex\\Flex" }, @@ -6586,7 +6534,7 @@ "type": "tidelift" } ], - "time": "2020-06-16T23:10:41+00:00" + "time": "2020-10-14T17:41:54+00:00" }, { "name": "symfony/form", @@ -11414,16 +11362,16 @@ }, { "name": "friendsofphp/php-cs-fixer", - "version": "v2.16.1", + "version": "v2.16.4", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", - "reference": "c8afb599858876e95e8ebfcd97812d383fa23f02" + "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/c8afb599858876e95e8ebfcd97812d383fa23f02", - "reference": "c8afb599858876e95e8ebfcd97812d383fa23f02", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1023c3458137ab052f6ff1e09621a721bfdeca13", + "reference": "1023c3458137ab052f6ff1e09621a721bfdeca13", "shasum": "" }, "require": { @@ -11455,11 +11403,12 @@ "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.1", "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.1", "phpunitgoodpractices/traits": "^1.8", - "symfony/phpunit-bridge": "^4.3 || ^5.0", + "symfony/phpunit-bridge": "^5.1", "symfony/yaml": "^3.0 || ^4.0 || ^5.0" }, "suggest": { - "ext-mbstring": "For handling non-UTF8 characters in cache signature.", + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters.", "php-cs-fixer/phpunit-constraint-isidenticalstring": "For IsIdenticalString constraint.", "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "For XmlMatchesXsd constraint.", "symfony/polyfill-mbstring": "When enabling `ext-mbstring` is not possible." @@ -11481,6 +11430,7 @@ "tests/Test/IntegrationCaseFactory.php", "tests/Test/IntegrationCaseFactoryInterface.php", "tests/Test/InternalIntegrationCaseFactory.php", + "tests/Test/IsIdenticalConstraint.php", "tests/TestCase.php" ] }, @@ -11499,7 +11449,13 @@ } ], "description": "A tool to automatically fix PHP code style", - "time": "2019-11-25T22:10:32+00:00" + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2020-06-27T23:57:46+00:00" }, { "name": "fzaninotto/faker", @@ -12317,6 +12273,7 @@ "keywords": [ "tokenizer" ], + "abandoned": true, "time": "2019-09-17T06:23:10+00:00" }, { diff --git a/src/Form/Type/DateRangeType.php b/src/Form/Type/DateRangeType.php index 7c1dc763..c5a11e3a 100644 --- a/src/Form/Type/DateRangeType.php +++ b/src/Form/Type/DateRangeType.php @@ -19,7 +19,6 @@ use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormView; -use Symfony\Component\OptionsResolver\Options; use Symfony\Component\OptionsResolver\OptionsResolver; /** diff --git a/symfony.lock b/symfony.lock index dd52fb4b..0072631e 100644 --- a/symfony.lock +++ b/symfony.lock @@ -210,9 +210,6 @@ "kevinpapst/adminlte-bundle": { "version": "0.3" }, - "kimai/kimai2-composer": { - "version": "0.1" - }, "kimai/user-bundle": { "version": "dev-master" }, diff --git a/tests/DataFixtures/TimesheetFixtures.php b/tests/DataFixtures/TimesheetFixtures.php index 3510fc78..7ae95734 100644 --- a/tests/DataFixtures/TimesheetFixtures.php +++ b/tests/DataFixtures/TimesheetFixtures.php @@ -302,6 +302,7 @@ final class TimesheetFixtures extends Fixture $start = \DateTime::createFromFormat('Y-m-d', $this->startDate); $start->modify("+ $i days"); $start->modify('+ ' . rand(1, 172800) . ' seconds'); // up to 2 days + return $start; }