From 91e1524ce7a6836fd678ab8d257fb647f0dde13c Mon Sep 17 00:00:00 2001 From: Ruslan Baidan Date: Wed, 26 May 2021 19:11:47 +0200 Subject: [PATCH] Updated the core and client dependencies with the import/export fixes. --- composer.json | 2 +- composer.lock | 144 +++++++++++++++++++++++++++----------------------- 2 files changed, 78 insertions(+), 68 deletions(-) diff --git a/composer.json b/composer.json index e325b1b..fc7a659 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ } ], "require": { - "php": "^7.2", + "php": "^7.4", "ext-json": "*", "ext-pdo": "*", "ext-bcmath": "*", diff --git a/composer.lock b/composer.lock index 4f32ef8..9ce66a9 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": "0f095b4d49edece1c2975125df572863", + "content-hash": "3d6d241a9d4b1a683900cf5c4a61093f", "packages": [ { "name": "brick/math", @@ -485,16 +485,16 @@ }, { "name": "composer/package-versions-deprecated", - "version": "1.11.99.1", + "version": "1.11.99.2", "source": { "type": "git", "url": "https://github.com/composer/package-versions-deprecated.git", - "reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6" + "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/7413f0b55a051e89485c5cb9f765fe24bb02a7b6", - "reference": "7413f0b55a051e89485c5cb9f765fe24bb02a7b6", + "url": "https://api.github.com/repos/composer/package-versions-deprecated/zipball/c6522afe5540d5fc46675043d3ed5a45a740b27c", + "reference": "c6522afe5540d5fc46675043d3ed5a45a740b27c", "shasum": "" }, "require": { @@ -538,7 +538,7 @@ "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)", "support": { "issues": "https://github.com/composer/package-versions-deprecated/issues", - "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.1" + "source": "https://github.com/composer/package-versions-deprecated/tree/1.11.99.2" }, "funding": [ { @@ -554,7 +554,7 @@ "type": "tidelift" } ], - "time": "2020-11-11T10:22:58+00:00" + "time": "2021-05-24T07:46:03+00:00" }, { "name": "container-interop/container-interop", @@ -666,16 +666,16 @@ }, { "name": "doctrine/cache", - "version": "1.11.0", + "version": "1.11.3", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0" + "reference": "3bb5588cec00a0268829cc4a518490df6741af9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0", - "reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0", + "url": "https://api.github.com/repos/doctrine/cache/zipball/3bb5588cec00a0268829cc4a518490df6741af9d", + "reference": "3bb5588cec00a0268829cc4a518490df6741af9d", "shasum": "" }, "require": { @@ -745,7 +745,7 @@ ], "support": { "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/1.11.0" + "source": "https://github.com/doctrine/cache/tree/1.11.3" }, "funding": [ { @@ -761,7 +761,7 @@ "type": "tidelift" } ], - "time": "2021-04-13T14:46:17+00:00" + "time": "2021-05-25T09:01:55+00:00" }, { "name": "doctrine/collections", @@ -2739,16 +2739,16 @@ }, { "name": "laminas/laminas-filter", - "version": "2.11.0", + "version": "2.11.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-filter.git", - "reference": "dd295a15f5c13d0c13d69ca0107190b1f2083d91" + "reference": "671724e163aa75c210e94d12b77a0f3f8240d4b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/dd295a15f5c13d0c13d69ca0107190b1f2083d91", - "reference": "dd295a15f5c13d0c13d69ca0107190b1f2083d91", + "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/671724e163aa75c210e94d12b77a0f3f8240d4b2", + "reference": "671724e163aa75c210e94d12b77a0f3f8240d4b2", "shasum": "" }, "require": { @@ -2817,7 +2817,7 @@ "type": "community_bridge" } ], - "time": "2021-03-16T14:37:02+00:00" + "time": "2021-05-24T18:29:02+00:00" }, { "name": "laminas/laminas-form", @@ -3413,16 +3413,16 @@ }, { "name": "laminas/laminas-mail", - "version": "2.14.0", + "version": "2.14.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-mail.git", - "reference": "542686aebf480c6902ad7f08b52498e94818bc0a" + "reference": "180c6c7baa37cba16fe9fd34af0f346e796cf1a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/542686aebf480c6902ad7f08b52498e94818bc0a", - "reference": "542686aebf480c6902ad7f08b52498e94818bc0a", + "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/180c6c7baa37cba16fe9fd34af0f346e796cf1a1", + "reference": "180c6c7baa37cba16fe9fd34af0f346e796cf1a1", "shasum": "" }, "require": { @@ -3444,7 +3444,9 @@ "laminas/laminas-config": "^3.4", "laminas/laminas-crypt": "^2.6 || ^3.0", "laminas/laminas-servicemanager": "^3.2.1", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.3", + "psalm/plugin-phpunit": "^0.15.1", + "vimeo/psalm": "^4.7" }, "suggest": { "laminas/laminas-crypt": "Crammd5 support in SMTP Auth", @@ -3486,7 +3488,7 @@ "type": "community_bridge" } ], - "time": "2021-03-17T12:41:50+00:00" + "time": "2021-05-20T04:00:23+00:00" }, { "name": "laminas/laminas-mime", @@ -4530,12 +4532,12 @@ "source": { "type": "git", "url": "https://github.com/monarc-project/zm-core.git", - "reference": "b0ee0ce2a4f1e5832d0f4103aaf9595a8759b531" + "reference": "4adf232036079146eaa637c1bd4c6f06f0b82a0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/b0ee0ce2a4f1e5832d0f4103aaf9595a8759b531", - "reference": "b0ee0ce2a4f1e5832d0f4103aaf9595a8759b531", + "url": "https://api.github.com/repos/monarc-project/zm-core/zipball/4adf232036079146eaa637c1bd4c6f06f0b82a0e", + "reference": "4adf232036079146eaa637c1bd4c6f06f0b82a0e", "shasum": "" }, "require": { @@ -4553,7 +4555,7 @@ "laminas/laminas-mail": "^2.10", "laminas/laminas-mvc": "^3.1", "ocramius/proxy-manager": "^2.2", - "php": "^7.1", + "php": "^7.4", "ramsey/uuid-doctrine": "^1.5", "robmorgan/phinx": "^0.11.1" }, @@ -4568,7 +4570,7 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "AGPL-3.0" + "AGPL-3.0-or-later" ], "authors": [ { @@ -4613,7 +4615,7 @@ "issues": "https://github.com/monarc-project/zm-core/issues", "source": "https://github.com/monarc-project/zm-core/tree/v2.10.3" }, - "time": "2021-05-17T19:51:23+00:00" + "time": "2021-05-26T17:04:12+00:00" }, { "name": "monarc/frontoffice", @@ -4621,12 +4623,12 @@ "source": { "type": "git", "url": "https://github.com/monarc-project/zm-client.git", - "reference": "c3dfe08ad35a1b299fed87a1f1fb4c21ada9e2df" + "reference": "def70db0d3c08fc58297dbca8fa4144be02b9bb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/c3dfe08ad35a1b299fed87a1f1fb4c21ada9e2df", - "reference": "c3dfe08ad35a1b299fed87a1f1fb4c21ada9e2df", + "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/def70db0d3c08fc58297dbca8fa4144be02b9bb4", + "reference": "def70db0d3c08fc58297dbca8fa4144be02b9bb4", "shasum": "" }, "require": { @@ -4646,7 +4648,7 @@ "laminas/laminas-permissions-rbac": "^3.0", "monarc/core": "^2.9.15", "monarc/phpword": "^1.0", - "php": "^7.2", + "php": "^7.4", "robmorgan/phinx": "^0.11.1", "symfony/console": "^5.0" }, @@ -4663,6 +4665,9 @@ } }, "notification-url": "https://packagist.org/downloads/", + "license": [ + "AGPL-3.0-or-later" + ], "authors": [ { "name": "Cyril Rouyer", @@ -4706,7 +4711,7 @@ "issues": "https://github.com/monarc-project/zm-client/issues", "source": "https://github.com/monarc-project/zm-client/tree/v2.10.3" }, - "time": "2021-05-17T08:43:00+00:00" + "time": "2021-05-26T17:07:36+00:00" }, { "name": "monarc/phpword", @@ -4873,41 +4878,42 @@ }, { "name": "ocramius/proxy-manager", - "version": "2.11.1", + "version": "2.12.0", "source": { "type": "git", "url": "https://github.com/Ocramius/ProxyManager.git", - "reference": "96bb91b7b52324080accf1d0137f491ff378ecf1" + "reference": "6046a5730a8d329d7f3d9c5239bc1c806512a854" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/96bb91b7b52324080accf1d0137f491ff378ecf1", - "reference": "96bb91b7b52324080accf1d0137f491ff378ecf1", + "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/6046a5730a8d329d7f3d9c5239bc1c806512a854", + "reference": "6046a5730a8d329d7f3d9c5239bc1c806512a854", "shasum": "" }, "require": { "composer-runtime-api": "^2.0.0", - "laminas/laminas-code": "^4.0.0", + "laminas/laminas-code": "^4.3.0", "php": "~7.4.1 || ~8.0.0", - "webimpress/safe-writer": "^2.0.1" + "webimpress/safe-writer": "^2.2.0" }, "conflict": { + "composer/composer": "<2.0.14", "doctrine/annotations": "<1.6.1", "laminas/laminas-stdlib": "<3.2.1", "thecodingmachine/safe": "<1.3.3", "zendframework/zend-stdlib": "<3.2.1" }, "require-dev": { - "codelicia/xulieta": "^0.1.5", - "doctrine/coding-standard": "^8.1.0", + "codelicia/xulieta": "^0.1.6", + "doctrine/coding-standard": "^8.2.1", "ext-phar": "*", - "infection/infection": "^0.20.2", - "nikic/php-parser": "^4.6.0", + "infection/infection": "^0.21.5", + "nikic/php-parser": "^4.10.5", "phpbench/phpbench": "^0.17.1 || 1.0.0-alpha2", - "phpunit/phpunit": "^9.4.1", + "phpunit/phpunit": "^9.5.4", "slevomat/coding-standard": "^6.3.10", - "squizlabs/php_codesniffer": "^3.5.5", - "vimeo/psalm": "^4.3.2" + "squizlabs/php_codesniffer": "^3.6.0", + "vimeo/psalm": "^4.4.1" }, "suggest": { "laminas/laminas-json": "To have the JsonRpc adapter (Remote Object feature)", @@ -4948,7 +4954,7 @@ ], "support": { "issues": "https://github.com/Ocramius/ProxyManager/issues", - "source": "https://github.com/Ocramius/ProxyManager/tree/2.11.1" + "source": "https://github.com/Ocramius/ProxyManager/tree/2.12.0" }, "funding": [ { @@ -4960,7 +4966,7 @@ "type": "tidelift" } ], - "time": "2021-01-10T16:12:59+00:00" + "time": "2021-05-25T11:42:44+00:00" }, { "name": "pclzip/pclzip", @@ -6779,16 +6785,16 @@ }, { "name": "symfony/yaml", - "version": "v5.2.7", + "version": "v5.2.9", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "76546cbeddd0a9540b4e4e57eddeec3e9bb444a5" + "reference": "d23115e4a3d50520abddccdbec9514baab1084c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/76546cbeddd0a9540b4e4e57eddeec3e9bb444a5", - "reference": "76546cbeddd0a9540b4e4e57eddeec3e9bb444a5", + "url": "https://api.github.com/repos/symfony/yaml/zipball/d23115e4a3d50520abddccdbec9514baab1084c8", + "reference": "d23115e4a3d50520abddccdbec9514baab1084c8", "shasum": "" }, "require": { @@ -6834,7 +6840,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v5.2.7" + "source": "https://github.com/symfony/yaml/tree/v5.2.9" }, "funding": [ { @@ -6850,7 +6856,7 @@ "type": "tidelift" } ], - "time": "2021-04-29T20:47:09+00:00" + "time": "2021-05-16T13:07:46+00:00" }, { "name": "true/punycode", @@ -7909,12 +7915,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "5ffdb87f627ff16cc392e30515a1fe069cddc3e2" + "reference": "80f32ef3cff7c3b5b650d8aa823437b43d5c5056" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/5ffdb87f627ff16cc392e30515a1fe069cddc3e2", - "reference": "5ffdb87f627ff16cc392e30515a1fe069cddc3e2", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/80f32ef3cff7c3b5b650d8aa823437b43d5c5056", + "reference": "80f32ef3cff7c3b5b650d8aa823437b43d5c5056", "shasum": "" }, "conflict": { @@ -7951,6 +7957,7 @@ "datadog/dd-trace": ">=0.30,<0.30.2", "david-garcia/phpwhois": "<=4.3.1", "derhansen/sf_event_mgt": "<4.3.1|>=5,<5.1.1", + "directmailteam/direct-mail": "<5.2.4", "doctrine/annotations": ">=1,<1.2.7", "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2", "doctrine/common": ">=2,<2.4.3|>=2.5,<2.5.1", @@ -8017,12 +8024,13 @@ "jsmitty12/phpwhois": "<5.1", "kazist/phpwhois": "<=4.2.6", "kitodo/presentation": "<3.1.2", + "klaviyo/magento2-extension": ">=1,<3", "kreait/firebase-php": ">=3.2,<3.8.1", "la-haute-societe/tcpdf": "<6.2.22", "laravel/framework": "<6.20.26|>=7,<8.40", "laravel/socialite": ">=1,<1.0.99|>=2,<2.0.10", "league/commonmark": "<0.18.3", - "lexik/jwt-authentication-bundle": ">=2,<2.10.7|>=2.11,<2.11.3", + "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", "librenms/librenms": "<21.1", "livewire/livewire": ">2.2.4,<2.2.6", "magento/community-edition": ">=2,<2.2.10|>=2.3,<2.3.3", @@ -8098,7 +8106,7 @@ "shopware/core": "<=6.3.5.2", "shopware/platform": "<=6.3.5.2", "shopware/production": "<=6.3.5.2", - "shopware/shopware": "<5.6.9", + "shopware/shopware": "<=5.6.9", "silverstripe/admin": ">=1.0.3,<1.0.4|>=1.1,<1.1.1", "silverstripe/assets": ">=1,<1.4.7|>=1.5,<1.5.2", "silverstripe/cms": "<4.3.6|>=4.4,<4.4.4", @@ -8143,21 +8151,21 @@ "symfony/http-foundation": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8|>=4.4,<4.4.7|>=5,<5.0.7", "symfony/http-kernel": ">=2,<2.8.52|>=3,<3.4.35|>=4,<4.2.12|>=4.3,<4.4.13|>=5,<5.1.5", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", - "symfony/maker-bundle": ">=1.27,<1.31.1", + "symfony/maker-bundle": ">=1.27,<1.29.2|>=1.30,<1.31.1", "symfony/mime": ">=4.3,<4.3.8", "symfony/phpunit-bridge": ">=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/polyfill": ">=1,<1.10", "symfony/polyfill-php55": ">=1,<1.10", "symfony/proxy-manager-bridge": ">=2.7,<2.7.51|>=2.8,<2.8.50|>=3,<3.4.26|>=4,<4.1.12|>=4.2,<4.2.7", "symfony/routing": ">=2,<2.0.19", - "symfony/security": ">=2,<2.7.51|>=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", + "symfony/security": ">=2,<2.7.51|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.8", "symfony/security-bundle": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", - "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", + "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<3.4.49|>=4,<4.4.24|>=5,<5.2.9", "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/security-guard": ">=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.51|>=2.8,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", "symfony/serializer": ">=2,<2.0.11", - "symfony/symfony": ">=2,<3.4.48|>=4,<4.4.23|>=5,<5.2.8", + "symfony/symfony": ">=2,<3.4.49|>=4,<4.4.24|>=5,<5.2.9", "symfony/translation": ">=2,<2.0.17", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/var-exporter": ">=4.2,<4.2.12|>=4.3,<4.3.8", @@ -8187,6 +8195,7 @@ "wallabag/tcpdf": "<6.2.22", "wikimedia/parsoid": "<0.12.2", "willdurand/js-translation-bundle": "<2.1.1", + "wp-cli/wp-cli": "<2.5", "yii2mod/yii2-cms": "<1.9.2", "yiisoft/yii": ">=1.1.14,<1.1.15", "yiisoft/yii2": "<2.0.38", @@ -8196,6 +8205,7 @@ "yiisoft/yii2-gii": "<2.0.4", "yiisoft/yii2-jui": "<2.0.4", "yiisoft/yii2-redis": "<2.0.8", + "yoast-seo-for-typo3/yoast_seo": "<7.2.1", "yourls/yourls": "<1.7.4", "zendesk/zendesk_api_client_php": "<2.2.11", "zendframework/zend-cache": ">=2.4,<2.4.8|>=2.5,<2.5.3", @@ -8257,7 +8267,7 @@ "type": "tidelift" } ], - "time": "2021-05-13T21:03:10+00:00" + "time": "2021-05-26T16:24:26+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -9105,7 +9115,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": "^7.2", + "php": "^7.4", "ext-json": "*", "ext-pdo": "*", "ext-bcmath": "*"