diff --git a/composer.json b/composer.json index b64b8989e22df0b2b9f9cdd0eaa97b58630df332..aabd8e79d5765e1565c57842f41b3c08ea7fd56c 100644 --- a/composer.json +++ b/composer.json @@ -71,8 +71,7 @@ "typo3/cms-cli": "^2.0", "typo3/cms-composer-installers": "^2.0", "typo3/phar-stream-wrapper": "^3.1.3", - "typo3fluid/fluid": "^2.6.8", - "webmozart/assert": "^1.0" + "typo3fluid/fluid": "^2.6.8" }, "require-dev": { "codeception/codeception": "^2.5.4 || ^3", diff --git a/composer.lock b/composer.lock index c59be730ef490135477cee47fd44e7ce55f350e1..9f7280966066ada08795aa34d59770357d1cd276 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": "10987d4662e6f2d243f37617c6761d8e", + "content-hash": "a1bf7ee0d439e8f2928c9abb5ec33f8b", "packages": [ { "name": "cogpowered/finediff", @@ -3300,31 +3300,29 @@ }, { "name": "webmozart/assert", - "version": "1.5.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4" + "reference": "573381c0a64f155a0d9a23f4b0c797194805b925" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4", - "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4", + "url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925", + "reference": "573381c0a64f155a0d9a23f4b0c797194805b925", "shasum": "" }, "require": { "php": "^5.3.3 || ^7.0", "symfony/polyfill-ctype": "^1.8" }, + "conflict": { + "vimeo/psalm": "<3.6.0" + }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^7.5.13" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, "autoload": { "psr-4": { "Webmozart\\Assert\\": "src/" @@ -3346,7 +3344,7 @@ "check", "validate" ], - "time": "2019-08-24T08:43:50+00:00" + "time": "2019-11-24T13:36:37+00:00" } ], "packages-dev": [ diff --git a/typo3/sysext/extbase/composer.json b/typo3/sysext/extbase/composer.json index 74dcabd1a359d349eaeae45890b40e196f8e92f5..a696d0cb94fe0f8c8ab97b6586936ef7b0415f88 100644 --- a/typo3/sysext/extbase/composer.json +++ b/typo3/sysext/extbase/composer.json @@ -18,8 +18,7 @@ "symfony/dependency-injection": "^4.4 || ^5.0", "symfony/property-access": "^4.4 || ^5.0", "symfony/property-info": "^4.4 || ^5.0", - "typo3/cms-core": "10.3.*@dev", - "webmozart/assert": "^1.0" + "typo3/cms-core": "10.3.*@dev" }, "suggest": { "typo3/cms-scheduler": "Additional scheduler tasks"