From ce364eb98045a33c40103c815d2460f9d9674c25 Mon Sep 17 00:00:00 2001 From: Ruslan Baidan Date: Wed, 30 Mar 2022 14:47:34 +0200 Subject: [PATCH] Updated the frontoffice dependency with the import fix. --- composer.lock | 114 +++++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 52 deletions(-) diff --git a/composer.lock b/composer.lock index eddeb2a..1e584ea 100644 --- a/composer.lock +++ b/composer.lock @@ -855,16 +855,16 @@ }, { "name": "doctrine/dbal", - "version": "3.3.3", + "version": "3.3.4", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "82331b861727c15b1f457ef05a8729e508e7ead5" + "reference": "83f779beaea1893c0bece093ab2104c6d15a7f26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/82331b861727c15b1f457ef05a8729e508e7ead5", - "reference": "82331b861727c15b1f457ef05a8729e508e7ead5", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/83f779beaea1893c0bece093ab2104c6d15a7f26", + "reference": "83f779beaea1893c0bece093ab2104c6d15a7f26", "shasum": "" }, "require": { @@ -946,7 +946,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.3.3" + "source": "https://github.com/doctrine/dbal/tree/3.3.4" }, "funding": [ { @@ -962,7 +962,7 @@ "type": "tidelift" } ], - "time": "2022-03-09T15:39:50+00:00" + "time": "2022-03-20T18:37:29+00:00" }, { "name": "doctrine/deprecations", @@ -1762,16 +1762,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": { @@ -1844,9 +1844,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": "guzzlehttp/guzzle", @@ -2191,16 +2191,16 @@ }, { "name": "laminas/laminas-cache", - "version": "3.1.2", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/laminas/laminas-cache.git", - "reference": "e43a04ad7b04683e372615f729312e3c57d68c8f" + "reference": "dfd5a66f6ea4b1979231560eb75b615c7aafe0e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/e43a04ad7b04683e372615f729312e3c57d68c8f", - "reference": "e43a04ad7b04683e372615f729312e3c57d68c8f", + "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/dfd5a66f6ea4b1979231560eb75b615c7aafe0e6", + "reference": "dfd5a66f6ea4b1979231560eb75b615c7aafe0e6", "shasum": "" }, "require": { @@ -2221,11 +2221,11 @@ "psr/simple-cache-implementation": "1.0" }, "require-dev": { - "laminas/laminas-cache-storage-adapter-apcu": "2.0.x-dev", - "laminas/laminas-cache-storage-adapter-blackhole": "2.0.x-dev", - "laminas/laminas-cache-storage-adapter-filesystem": "2.0.x-dev", - "laminas/laminas-cache-storage-adapter-memory": "2.0.x-dev", - "laminas/laminas-cache-storage-adapter-test": "2.0.x-dev", + "laminas/laminas-cache-storage-adapter-apcu": "^2.0", + "laminas/laminas-cache-storage-adapter-blackhole": "^2.0", + "laminas/laminas-cache-storage-adapter-filesystem": "^2.0", + "laminas/laminas-cache-storage-adapter-memory": "^2.0", + "laminas/laminas-cache-storage-adapter-test": "^2.0", "laminas/laminas-cli": "^1.0", "laminas/laminas-coding-standard": "~2.2.0", "laminas/laminas-config-aggregator": "^1.5", @@ -2286,7 +2286,7 @@ "type": "community_bridge" } ], - "time": "2021-11-18T16:54:49+00:00" + "time": "2022-03-24T09:32:54+00:00" }, { "name": "laminas/laminas-code", @@ -4375,24 +4375,30 @@ }, { "name": "laminas/laminas-view", - "version": "2.19.1", + "version": "2.20.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-view.git", - "reference": "5f2ed1af896543e986090afb6433e32409c99d4d" + "reference": "2cd6973a3e042be3d244260fe93f435668f5c2b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-view/zipball/5f2ed1af896543e986090afb6433e32409c99d4d", - "reference": "5f2ed1af896543e986090afb6433e32409c99d4d", + "url": "https://api.github.com/repos/laminas/laminas-view/zipball/2cd6973a3e042be3d244260fe93f435668f5c2b4", + "reference": "2cd6973a3e042be3d244260fe93f435668f5c2b4", "shasum": "" }, "require": { + "container-interop/container-interop": "^1.2", + "ext-dom": "*", + "ext-filter": "*", "ext-json": "*", + "laminas/laminas-escaper": "^2.5", "laminas/laminas-eventmanager": "^3.4", "laminas/laminas-json": "^3.3", + "laminas/laminas-servicemanager": "^3.10", "laminas/laminas-stdlib": "^3.6", - "php": "^7.4 || ~8.0.0 || ~8.1.0" + "php": "^7.4 || ~8.0.0 || ~8.1.0", + "psr/container": "^1 || ^2" }, "conflict": { "container-interop/container-interop": "<1.2", @@ -4402,11 +4408,9 @@ "zendframework/zend-view": "*" }, "require-dev": { - "ext-dom": "*", "laminas/laminas-authentication": "^2.5", "laminas/laminas-coding-standard": "~2.3.0", "laminas/laminas-console": "^2.6", - "laminas/laminas-escaper": "^2.5", "laminas/laminas-feed": "^2.15", "laminas/laminas-filter": "^2.13.0", "laminas/laminas-http": "^2.15", @@ -4419,7 +4423,6 @@ "laminas/laminas-paginator": "^2.11.0", "laminas/laminas-permissions-acl": "^2.6", "laminas/laminas-router": "^3.0.1", - "laminas/laminas-servicemanager": "^3.4", "laminas/laminas-uri": "^2.5", "phpspec/prophecy": "^1.12", "phpspec/prophecy-phpunit": "^2.0", @@ -4475,7 +4478,7 @@ "type": "community_bridge" } ], - "time": "2022-01-12T16:20:05+00:00" + "time": "2022-02-22T13:52:44+00:00" }, { "name": "laminas/laminas-zendframework-bridge", @@ -4632,16 +4635,16 @@ }, { "name": "monarc/frontoffice", - "version": "v2.11.1-p12", + "version": "v2.11.1-p13", "source": { "type": "git", "url": "https://github.com/monarc-project/zm-client.git", - "reference": "098f41497907d38e8246b13184e6b9c812a38825" + "reference": "36160e98760295e8be9f3a5e09f1a1b468514a56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/098f41497907d38e8246b13184e6b9c812a38825", - "reference": "098f41497907d38e8246b13184e6b9c812a38825", + "url": "https://api.github.com/repos/monarc-project/zm-client/zipball/36160e98760295e8be9f3a5e09f1a1b468514a56", + "reference": "36160e98760295e8be9f3a5e09f1a1b468514a56", "shasum": "" }, "require": { @@ -4722,9 +4725,9 @@ "description": "Frontoffice for monarc/monarc application", "support": { "issues": "https://github.com/monarc-project/zm-client/issues", - "source": "https://github.com/monarc-project/zm-client/tree/v2.11.1-p12" + "source": "https://github.com/monarc-project/zm-client/tree/v2.11.1-p13" }, - "time": "2022-03-22T11:35:17+00:00" + "time": "2022-03-30T12:06:23+00:00" }, { "name": "nikic/php-parser", @@ -7376,16 +7379,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": { @@ -7420,9 +7423,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": "phpspec/prophecy", @@ -7891,16 +7894,17 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "16e67a9ace8f73d35c66827467d4032bd8571cee" + "reference": "4b07ae1c8cf8264073a0e561b9e833fc2a3759ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/16e67a9ace8f73d35c66827467d4032bd8571cee", - "reference": "16e67a9ace8f73d35c66827467d4032bd8571cee", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4b07ae1c8cf8264073a0e561b9e833fc2a3759ea", + "reference": "4b07ae1c8cf8264073a0e561b9e833fc2a3759ea", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", + "admidio/admidio": "<4.1.9", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "akaunting/akaunting": "<2.1.13", "alextselegidis/easyappointments": "<1.4.3", @@ -7919,9 +7923,11 @@ "bagisto/bagisto": "<0.1.5", "barrelstrength/sprout-base-email": "<1.2.7", "barrelstrength/sprout-forms": "<3.9", + "barryvdh/laravel-translation-manager": "<0.6.2", "baserproject/basercms": "<4.5.4", "billz/raspap-webgui": "<=2.6.6", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", + "bmarshall511/wordpress_zero_spam": "<5.2.13", "bolt/bolt": "<3.7.2", "bolt/core": "<4.1.13", "bottelet/flarepoint": "<2.2.1", @@ -7948,6 +7954,7 @@ "contao/core": ">=2,<3.5.39", "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", + "contao/managed-edition": "<=1.5", "craftcms/cms": "<3.7.14", "croogo/croogo": "<3.0.7", "datadog/dd-trace": ">=0.30,<0.30.2", @@ -8000,7 +8007,7 @@ "flarum/tags": "<=0.1-beta.13", "fluidtypo3/vhs": "<5.1.1", "fooman/tcpdf": "<6.2.22", - "forkcms/forkcms": "<=5.9.2", + "forkcms/forkcms": "<5.11.1", "fossar/tcpdf-parser": "<6.2.22", "francoisjacquet/rosariosis": "<8.1.1", "friendsofsymfony/oauth2-php": "<1.3", @@ -8041,7 +8048,10 @@ "ivankristianto/phpwhois": "<=4.3", "jackalope/jackalope-doctrine-dbal": "<1.7.4", "james-heinrich/getid3": "<1.9.21", - "joomla/archive": "<1.1.10", + "joomla/archive": "<1.1.12|>=2,<2.0.1", + "joomla/filesystem": "<1.6.2|>=2,<2.0.1", + "joomla/filter": "<1.4.4|>=2,<2.0.1", + "joomla/input": ">=2,<2.0.2", "joomla/session": "<1.3.1", "jsdecena/laracom": "<2.0.9", "jsmitty12/phpwhois": "<5.1", @@ -8128,11 +8138,11 @@ "phpoffice/phpspreadsheet": "<1.16", "phpseclib/phpseclib": "<2.0.31|>=3,<3.0.7", "phpservermon/phpservermon": "<=3.5.2", - "phpunit/phpunit": ">=4.8.19,<4.8.28|>=5.0.10,<5.6.3", + "phpunit/phpunit": "<4.8.28|>=5,<5.6.3", "phpwhois/phpwhois": "<=4.2.5", "phpxmlrpc/extras": "<0.6.1", - "pimcore/pimcore": "<=10.3.2", - "pocketmine/pocketmine-mp": "<4.0.7", + "pimcore/pimcore": "<10.4", + "pocketmine/pocketmine-mp": "<4.2.4", "pressbooks/pressbooks": "<5.18", "prestashop/autoupgrade": ">=4,<4.10.1", "prestashop/contactform": ">1.0.1,<4.3", @@ -8346,7 +8356,7 @@ "type": "tidelift" } ], - "time": "2022-03-21T21:04:03+00:00" + "time": "2022-03-29T22:04:06+00:00" }, { "name": "sebastian/code-unit-reverse-lookup",