Merge branch 'feature/stats' of https://github.com/monarc-project/MonarcAppFO into feature/stats

pull/316/head
Cédric Bonhomme 2020-11-13 14:34:36 +01:00
commit 1dbada2d93
1 changed files with 40 additions and 43 deletions

83
composer.lock generated
View File

@ -1396,36 +1396,31 @@
},
{
"name": "doctrine/instantiator",
"version": "1.3.1",
"version": "1.4.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
"reference": "f350df0268e904597e3bd9c4685c53e0e333feea"
"reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/f350df0268e904597e3bd9c4685c53e0e333feea",
"reference": "f350df0268e904597e3bd9c4685c53e0e333feea",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
"reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
"shasum": ""
},
"require": {
"php": "^7.1 || ^8.0"
},
"require-dev": {
"doctrine/coding-standard": "^6.0",
"doctrine/coding-standard": "^8.0",
"ext-pdo": "*",
"ext-phar": "*",
"phpbench/phpbench": "^0.13",
"phpstan/phpstan-phpunit": "^0.11",
"phpstan/phpstan-shim": "^0.11",
"phpunit/phpunit": "^7.0"
"phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev"
}
},
"autoload": {
"psr-4": {
"Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
@ -1439,7 +1434,7 @@
{
"name": "Marco Pivetta",
"email": "ocramius@gmail.com",
"homepage": "http://ocramius.github.com/"
"homepage": "https://ocramius.github.io/"
}
],
"description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
@ -1450,7 +1445,7 @@
],
"support": {
"issues": "https://github.com/doctrine/instantiator/issues",
"source": "https://github.com/doctrine/instantiator/tree/1.3.x"
"source": "https://github.com/doctrine/instantiator/tree/1.4.0"
},
"funding": [
{
@ -1466,7 +1461,7 @@
"type": "tidelift"
}
],
"time": "2020-05-29T17:27:14+00:00"
"time": "2020-11-10T18:47:58+00:00"
},
{
"name": "doctrine/lexer",
@ -1822,6 +1817,7 @@
"issues": "https://github.com/doctrine/reflection/issues",
"source": "https://github.com/doctrine/reflection/tree/1.2.2"
},
"abandoned": "roave/better-reflection",
"time": "2020-10-27T21:46:55+00:00"
},
{
@ -4505,12 +4501,12 @@
"source": {
"type": "git",
"url": "https://github.com/monarc-project/zm-client.git",
"reference": "418f9cd33ccea6f3996b7c43f2a0a2a8b554d255"
"reference": "d5293d96e0e309780c701dce123f7b28f6c8a3e0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/418f9cd33ccea6f3996b7c43f2a0a2a8b554d255",
"reference": "418f9cd33ccea6f3996b7c43f2a0a2a8b554d255",
"url": "https://api.github.com/repos/monarc-project/zm-client/zipball/d5293d96e0e309780c701dce123f7b28f6c8a3e0",
"reference": "d5293d96e0e309780c701dce123f7b28f6c8a3e0",
"shasum": ""
},
"require": {
@ -4589,7 +4585,7 @@
"issues": "https://github.com/monarc-project/zm-client/issues",
"source": "https://github.com/monarc-project/zm-client/tree/feature/stats"
},
"time": "2020-10-30T11:23:17+00:00"
"time": "2020-11-11T13:50:13+00:00"
},
{
"name": "monarc/phpword",
@ -7580,39 +7576,39 @@
},
{
"name": "phpunit/phpunit",
"version": "8.5.8",
"version": "8.5.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
"reference": "f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
"reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6",
"reference": "f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.2.0",
"doctrine/instantiator": "^1.3.1",
"ext-dom": "*",
"ext-json": "*",
"ext-libxml": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"ext-xmlwriter": "*",
"myclabs/deep-copy": "^1.9.1",
"myclabs/deep-copy": "^1.10.0",
"phar-io/manifest": "^1.0.3",
"phar-io/version": "^2.0.1",
"php": "^7.2",
"phpspec/prophecy": "^1.8.1",
"phpunit/php-code-coverage": "^7.0.7",
"phpspec/prophecy": "^1.10.3",
"phpunit/php-code-coverage": "^7.0.10",
"phpunit/php-file-iterator": "^2.0.2",
"phpunit/php-text-template": "^1.2.1",
"phpunit/php-timer": "^2.1.2",
"sebastian/comparator": "^3.0.2",
"sebastian/diff": "^3.0.2",
"sebastian/environment": "^4.2.2",
"sebastian/exporter": "^3.1.1",
"sebastian/environment": "^4.2.3",
"sebastian/exporter": "^3.1.2",
"sebastian/global-state": "^3.0.0",
"sebastian/object-enumerator": "^3.0.3",
"sebastian/resource-operations": "^2.0.1",
@ -7661,7 +7657,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"source": "https://github.com/sebastianbergmann/phpunit/tree/8.5"
"source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.9"
},
"funding": [
{
@ -7673,7 +7669,7 @@
"type": "github"
}
],
"time": "2020-06-22T07:06:58+00:00"
"time": "2020-11-10T12:51:38+00:00"
},
{
"name": "roave/security-advisories",
@ -7681,12 +7677,12 @@
"source": {
"type": "git",
"url": "https://github.com/Roave/SecurityAdvisories.git",
"reference": "327370943772f9917bc2dc2aa4263db2d572a112"
"reference": "e440567339d5fe93d9525e377c5e686b0b08bcca"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/327370943772f9917bc2dc2aa4263db2d572a112",
"reference": "327370943772f9917bc2dc2aa4263db2d572a112",
"url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e440567339d5fe93d9525e377c5e686b0b08bcca",
"reference": "e440567339d5fe93d9525e377c5e686b0b08bcca",
"shasum": ""
},
"conflict": {
@ -7702,7 +7698,7 @@
"bagisto/bagisto": "<0.1.5",
"barrelstrength/sprout-base-email": "<1.2.7",
"barrelstrength/sprout-forms": "<3.9",
"baserproject/basercms": ">=4,<=4.3.6",
"baserproject/basercms": ">=4,<=4.3.6|>=4.4,<4.4.1",
"bolt/bolt": "<3.7.1",
"brightlocal/phpwhois": "<=4.2.5",
"buddypress/buddypress": "<5.1.2",
@ -7786,7 +7782,7 @@
"magento/magento1ee": ">=1,<1.14.4.3",
"magento/product-community-edition": ">=2,<2.2.10|>=2.3,<2.3.2-p.2",
"marcwillmann/turn": "<0.3.3",
"mediawiki/core": ">=1.31,<1.31.4|>=1.32,<1.32.4|>=1.33,<1.33.1",
"mediawiki/core": ">=1.31,<1.31.9|>=1.32,<1.32.4|>=1.33,<1.33.3|>=1.34,<1.34.3|>=1.34.99,<1.35",
"mittwald/typo3_forum": "<1.2.1",
"monolog/monolog": ">=1.8,<1.12",
"namshi/jose": "<2.2",
@ -7801,7 +7797,8 @@
"onelogin/php-saml": "<2.10.4",
"oneup/uploader-bundle": "<1.9.3|>=2,<2.1.5",
"openid/php-openid": "<2.3",
"openmage/magento-lts": "<19.4.6|>=20,<20.0.2",
"openmage/magento-lts": "<19.4.8|>=20,<20.0.4",
"orchid/platform": ">=9,<9.4.4",
"oro/crm": ">=1.7,<1.7.4",
"oro/platform": ">=1.7,<1.7.4",
"padraic/humbug_get_contents": "<1.1.2",
@ -7836,8 +7833,8 @@
"scheb/two-factor-bundle": ">=0,<3.26|>=4,<4.11",
"sensiolabs/connect": "<4.2.3",
"serluck/phpwhois": "<=4.2.6",
"shopware/core": "<=6.3.1",
"shopware/platform": "<=6.3.1",
"shopware/core": "<=6.3.2",
"shopware/platform": "<=6.3.2",
"shopware/shopware": "<5.3.7",
"silverstripe/admin": ">=1.0.3,<1.0.4|>=1.1,<1.1.1",
"silverstripe/assets": ">=1,<1.4.7|>=1.5,<1.5.2",
@ -7870,7 +7867,7 @@
"sylius/grid": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
"sylius/grid-bundle": ">=1,<1.1.19|>=1.2,<1.2.18|>=1.3,<1.3.13|>=1.4,<1.4.5|>=1.5,<1.5.1",
"sylius/resource-bundle": "<1.3.14|>=1.4,<1.4.7|>=1.5,<1.5.2|>=1.6,<1.6.4",
"sylius/sylius": "<1.3.16|>=1.4,<1.4.12|>=1.5,<1.5.9|>=1.6,<1.6.5",
"sylius/sylius": "<1.6.9|>=1.7,<1.7.9|>=1.8,<1.8.3",
"symbiote/silverstripe-multivaluefield": ">=3,<3.0.99",
"symbiote/silverstripe-versionedfiles": "<=2.0.3",
"symfony/cache": ">=3.1,<3.4.35|>=4,<4.2.12|>=4.3,<4.3.8",
@ -7987,7 +7984,7 @@
"type": "tidelift"
}
],
"time": "2020-10-19T07:02:45+00:00"
"time": "2020-11-07T16:07:08+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",