Updated the core package with the import fix when multiple thems with the same label.

pull/475/head v2.12.4-p2
Ruslan Baidan 2022-11-24 16:42:46 +01:00
parent b4438ac52c
commit 279f074aa3
No known key found for this signature in database
GPG Key ID: 4B7724C136BF1D89
1 changed files with 53 additions and 52 deletions

105
composer.lock generated
View File

@ -1083,16 +1083,16 @@
},
{
"name": "doctrine/doctrine-laminas-hydrator",
"version": "3.1.0",
"version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine-laminas-hydrator.git",
"reference": "e01bf39537f9559c9f79c6b12f9bd16452278d6c"
"reference": "b76cfa71d5e494a8a71ada4e8ea6454fc0fc56ba"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/doctrine-laminas-hydrator/zipball/e01bf39537f9559c9f79c6b12f9bd16452278d6c",
"reference": "e01bf39537f9559c9f79c6b12f9bd16452278d6c",
"url": "https://api.github.com/repos/doctrine/doctrine-laminas-hydrator/zipball/b76cfa71d5e494a8a71ada4e8ea6454fc0fc56ba",
"reference": "b76cfa71d5e494a8a71ada4e8ea6454fc0fc56ba",
"shasum": ""
},
"require": {
@ -1102,15 +1102,13 @@
"ext-ctype": "*",
"laminas/laminas-hydrator": "^4.3.1",
"laminas/laminas-stdlib": "^3.6.1",
"php": "^7.4 || ~8.0.0 || ~8.1.0"
"php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0"
},
"require-dev": {
"doctrine/coding-standard": "^9.0.0",
"jangregor/phpstan-prophecy": "^1.0.0",
"phpspec/prophecy-phpunit": "^2.0.1",
"phpstan/phpstan": "^1.1.2",
"phpunit/phpunit": "^9.5.10",
"vimeo/psalm": "^4.15.0"
"doctrine/coding-standard": "^9.0.2",
"phpstan/phpstan": "^1.9.2",
"phpunit/phpunit": "^9.5.26",
"vimeo/psalm": "^4.30"
},
"type": "library",
"autoload": {
@ -1147,7 +1145,7 @@
"type": "tidelift"
}
],
"time": "2022-06-11T13:12:45+00:00"
"time": "2022-11-18T09:49:57+00:00"
},
{
"name": "doctrine/doctrine-module",
@ -1740,16 +1738,16 @@
},
{
"name": "doctrine/orm",
"version": "2.13.3",
"version": "2.13.4",
"source": {
"type": "git",
"url": "https://github.com/doctrine/orm.git",
"reference": "e750360bd52b080c4cbaaee1b48b80f7dc873b36"
"reference": "a5a6cc6630ce497290396d5f206887227820a634"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/orm/zipball/e750360bd52b080c4cbaaee1b48b80f7dc873b36",
"reference": "e750360bd52b080c4cbaaee1b48b80f7dc873b36",
"url": "https://api.github.com/repos/doctrine/orm/zipball/a5a6cc6630ce497290396d5f206887227820a634",
"reference": "a5a6cc6630ce497290396d5f206887227820a634",
"shasum": ""
},
"require": {
@ -1778,13 +1776,13 @@
"doctrine/annotations": "^1.13",
"doctrine/coding-standard": "^9.0.2 || ^10.0",
"phpbench/phpbench": "^0.16.10 || ^1.0",
"phpstan/phpstan": "~1.4.10 || 1.8.5",
"phpstan/phpstan": "~1.4.10 || 1.9.2",
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
"psr/log": "^1 || ^2 || ^3",
"squizlabs/php_codesniffer": "3.7.1",
"symfony/cache": "^4.4 || ^5.4 || ^6.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"vimeo/psalm": "4.27.0"
"vimeo/psalm": "4.30.0"
},
"suggest": {
"ext-dom": "Provides support for XSD validation for XML mapping files",
@ -1834,22 +1832,22 @@
],
"support": {
"issues": "https://github.com/doctrine/orm/issues",
"source": "https://github.com/doctrine/orm/tree/2.13.3"
"source": "https://github.com/doctrine/orm/tree/2.13.4"
},
"time": "2022-10-07T06:37:17+00:00"
"time": "2022-11-20T18:53:31+00:00"
},
{
"name": "doctrine/persistence",
"version": "3.0.4",
"version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/persistence.git",
"reference": "05612da375f8a3931161f435f91d6704926e6ec5"
"reference": "2a9c70a5e21f8968c5a46b79f819ea52f322080b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/persistence/zipball/05612da375f8a3931161f435f91d6704926e6ec5",
"reference": "05612da375f8a3931161f435f91d6704926e6ec5",
"url": "https://api.github.com/repos/doctrine/persistence/zipball/2a9c70a5e21f8968c5a46b79f819ea52f322080b",
"reference": "2a9c70a5e21f8968c5a46b79f819ea52f322080b",
"shasum": ""
},
"require": {
@ -1920,7 +1918,7 @@
],
"support": {
"issues": "https://github.com/doctrine/persistence/issues",
"source": "https://github.com/doctrine/persistence/tree/3.0.4"
"source": "https://github.com/doctrine/persistence/tree/3.1.0"
},
"funding": [
{
@ -1936,7 +1934,7 @@
"type": "tidelift"
}
],
"time": "2022-10-13T07:34:14+00:00"
"time": "2022-11-18T14:10:19+00:00"
},
{
"name": "endroid/qr-code",
@ -2497,16 +2495,16 @@
},
{
"name": "laminas/laminas-code",
"version": "4.7.0",
"version": "4.7.1",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-code.git",
"reference": "0337d9265bc2e6376babad8c511500821620cb30"
"reference": "91aabc066d5620428120800c0eafc0411e441a62"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-code/zipball/0337d9265bc2e6376babad8c511500821620cb30",
"reference": "0337d9265bc2e6376babad8c511500821620cb30",
"url": "https://api.github.com/repos/laminas/laminas-code/zipball/91aabc066d5620428120800c0eafc0411e441a62",
"reference": "91aabc066d5620428120800c0eafc0411e441a62",
"shasum": ""
},
"require": {
@ -2559,7 +2557,7 @@
"type": "community_bridge"
}
],
"time": "2022-09-13T10:33:30+00:00"
"time": "2022-11-21T01:32:31+00:00"
},
{
"name": "laminas/laminas-config",
@ -4757,16 +4755,16 @@
},
{
"name": "monarc/core",
"version": "v2.12.4",
"version": "v2.12.4-p1",
"source": {
"type": "git",
"url": "https://github.com/monarc-project/zm-core.git",
"reference": "14affb0a0d520d168a5aa6a4f0787cf97e3e3d48"
"reference": "1bbd96de5532cdf2f1b289b4cfdcc2b4f2200cf7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/monarc-project/zm-core/zipball/14affb0a0d520d168a5aa6a4f0787cf97e3e3d48",
"reference": "14affb0a0d520d168a5aa6a4f0787cf97e3e3d48",
"url": "https://api.github.com/repos/monarc-project/zm-core/zipball/1bbd96de5532cdf2f1b289b4cfdcc2b4f2200cf7",
"reference": "1bbd96de5532cdf2f1b289b4cfdcc2b4f2200cf7",
"shasum": ""
},
"require": {
@ -4843,9 +4841,9 @@
"description": "Core for monarc/monarc application",
"support": {
"issues": "https://github.com/monarc-project/zm-core/issues",
"source": "https://github.com/monarc-project/zm-core/tree/v2.12.4"
"source": "https://github.com/monarc-project/zm-core/tree/v2.12.4-p1"
},
"time": "2022-11-11T13:13:09+00:00"
"time": "2022-11-24T15:38:45+00:00"
},
{
"name": "monarc/frontoffice",
@ -7998,12 +7996,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "ed33734832e5a87eaa4341be7ce580de54157460"
"reference": "0399700d159e09b16645945758b65b921d3491fe"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/ed33734832e5a87eaa4341be7ce580de54157460",
"reference": "ed33734832e5a87eaa4341be7ce580de54157460",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/0399700d159e09b16645945758b65b921d3491fe",
"reference": "0399700d159e09b16645945758b65b921d3491fe",
"shasum": ""
},
"conflict": {
@ -8027,6 +8025,7 @@
"asymmetricrypt/asymmetricrypt": ">=0,<9.9.99",
"awesome-support/awesome-support": "<=6.0.7",
"aws/aws-sdk-php": ">=3,<3.2.1",
"backdrop/backdrop": "<=1.23",
"badaso/core": "<2.6.1",
"bagisto/bagisto": "<0.1.5",
"barrelstrength/sprout-base-email": "<1.2.7",
@ -8060,7 +8059,7 @@
"codeigniter4/shield": "= 1.0.0-beta",
"codiad/codiad": "<=2.8.4",
"composer/composer": "<1.10.26|>=2-alpha.1,<2.2.12|>=2.3,<2.3.5",
"concrete5/concrete5": ">= 9.0.0RC1, < 9.1.3|<9",
"concrete5/concrete5": "<9.1.3|>= 9.0.0RC1, < 9.1.3",
"concrete5/core": "<8.5.8|>=9,<9.1",
"contao-components/mediaelement": ">=2.14.2,<2.21.1",
"contao/contao": ">=4,<4.4.56|>=4.5,<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3",
@ -8086,7 +8085,7 @@
"doctrine/mongodb-odm": ">=1,<1.0.2",
"doctrine/mongodb-odm-bundle": ">=2,<3.0.1",
"doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1|>=2.8.3,<2.8.4",
"dolibarr/dolibarr": "<16|= 12.0.5|>= 3.3.beta1, < 13.0.2",
"dolibarr/dolibarr": "<16|>=16.0.1,<16.0.3|= 12.0.5|>= 3.3.beta1, < 13.0.2",
"dompdf/dompdf": "<2.0.1",
"drupal/core": ">=7,<7.91|>=8,<9.3.19|>=9.4,<9.4.3",
"drupal/drupal": ">=7,<7.80|>=8,<8.9.16|>=9,<9.1.12|>=9.2,<9.2.4",
@ -8125,7 +8124,7 @@
"fenom/fenom": "<=2.12.1",
"filegator/filegator": "<7.8",
"firebase/php-jwt": "<2",
"flarum/core": ">=1,<=1.0.1",
"flarum/core": ">=1,<=1.0.1|>=1.5,<1.6.2",
"flarum/sticky": ">=0.1-beta.14,<=0.1-beta.15",
"flarum/tags": "<=0.1-beta.13",
"fluidtypo3/vhs": "<5.1.1",
@ -8181,6 +8180,7 @@
"ivankristianto/phpwhois": "<=4.3",
"jackalope/jackalope-doctrine-dbal": "<1.7.4",
"james-heinrich/getid3": "<1.9.21",
"jasig/phpcas": "<1.3.3",
"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",
@ -8208,7 +8208,7 @@
"league/commonmark": "<0.18.3",
"league/flysystem": "<1.1.4|>=2,<2.1.1",
"lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3",
"librenms/librenms": "<=22.8",
"librenms/librenms": "<22.10",
"limesurvey/limesurvey": "<3.27.19",
"livehelperchat/livehelperchat": "<=3.91",
"livewire/livewire": ">2.2.4,<2.2.6",
@ -8233,7 +8233,7 @@
"modx/revolution": "<= 2.8.3-pl|<2.8",
"mojo42/jirafeau": "<4.4",
"monolog/monolog": ">=1.8,<1.12",
"moodle/moodle": "<4.0.1",
"moodle/moodle": "<4.0.5",
"mustache/mustache": ">=2,<2.14.1",
"namshi/jose": "<2.2",
"neoan3-apps/template": "<1.1.1",
@ -8333,12 +8333,12 @@
"shopware/storefront": "<=6.4.8.1",
"shopxo/shopxo": "<2.2.6",
"showdoc/showdoc": "<2.10.4",
"silverstripe/admin": ">=1,<1.8.1",
"silverstripe/assets": ">=1,<1.10.1",
"silverstripe/cms": "<4.3.6|>=4.4,<4.4.4",
"silverstripe/admin": ">=1,<1.11.3",
"silverstripe/assets": ">=1,<1.11.1",
"silverstripe/cms": "<4.11.3",
"silverstripe/comments": ">=1.3,<1.9.99|>=2,<2.9.99|>=3,<3.1.1",
"silverstripe/forum": "<=0.6.1|>=0.7,<=0.7.3",
"silverstripe/framework": "<4.10.9",
"silverstripe/framework": "<4.11.14",
"silverstripe/graphql": "<3.5.2|>=4-alpha.1,<4-alpha.2|= 4.0.0-alpha1",
"silverstripe/hybridsessions": ">=1,<2.4.1|>=2.5,<2.5.1",
"silverstripe/registry": ">=2.1,<2.1.2|>=2.2,<2.2.1",
@ -8347,6 +8347,7 @@
"silverstripe/subsites": ">=2,<2.1.1",
"silverstripe/taxonomy": ">=1.3,<1.3.1|>=2,<2.0.1",
"silverstripe/userforms": "<3",
"silverstripe/versioned-admin": ">=1,<1.11.1",
"simple-updates/phpwhois": "<=1",
"simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4",
"simplesamlphp/simplesamlphp": "<1.18.6",
@ -8421,7 +8422,7 @@
"topthink/framework": "<=6.0.13",
"topthink/think": "<=6.0.9",
"topthink/thinkphp": "<=3.2.3",
"tribalsystems/zenario": "<9.2.55826",
"tribalsystems/zenario": "<=9.3.57186",
"truckersmp/phpwhois": "<=4.3.1",
"twig/twig": "<1.44.7|>=2,<2.15.3|>=3,<3.4.3",
"typo3/cms": ">=6.2,<6.2.30|>=7,<7.6.32|>=8,<8.7.38|>=9,<9.5.29|>=10,<10.4.32|>=11,<11.5.16",
@ -8457,7 +8458,7 @@
"yetiforce/yetiforce-crm": "<=6.4",
"yidashi/yii2cmf": "<=2",
"yii2mod/yii2-cms": "<1.9.2",
"yiisoft/yii": ">=1.1.14,<1.1.15",
"yiisoft/yii": "<1.1.27",
"yiisoft/yii2": "<2.0.38",
"yiisoft/yii2-bootstrap": "<2.0.4",
"yiisoft/yii2-dev": "<2.0.43",
@ -8528,7 +8529,7 @@
"type": "tidelift"
}
],
"time": "2022-11-16T22:04:17+00:00"
"time": "2022-11-23T23:04:03+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",