Merge remote-tracking branch 'origin/develop' into ts-838

This commit is contained in:
Vincent BRIDIER 2023-07-12 15:29:45 +02:00
commit 0e8723c586
3 changed files with 19 additions and 15 deletions

View file

@ -29,14 +29,19 @@ MAIL_PASSERELLE=
GOOGLE_RECAPTCHA_PUBLIC=
GOOGLE_RECAPTCHA_PRIVATE=
# Matomo
MATOMO_SITE_ID=
# CRM
CRM_ENDPOINT=
CRM_TOKEN=
CRM_PASSWORD=
#LDC WEB
PROJECT_UUID=
LDCWEB_API_TOKEN=
MAIL_LIST_SERVICEWEB=
#MESBR
MESBR_REF_CAMP=
MESBR_ENDPOINT=

View file

@ -3,8 +3,8 @@
"vlucas/phpdotenv": "^5.3",
"respect/validation": "^2.2",
"ext-json": "*",
"ldc/ldc-web-status-checker-wp": "^1.1",
"ldc/ldccrmv2client": "3.0.5"
"ldc/ldccrmv2client": "^3.0",
"ldc/ldc-web-status-checker-wp": "^1.0"
},
"minimum-stability": "stable",
"repositories": {
@ -16,7 +16,6 @@
"require-all": true,
"autoload": {
"psr-4": {
"LDCCRM\\": "LDCCRM/",
"LDCWEB\\": "LDCWEB/"
}
},
@ -36,4 +35,4 @@
"lab.s-web.fr"
]
}
}
}

22
composer.lock generated
View file

@ -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": "cfb388122b1310c5c023c8793b191e20",
"content-hash": "19c061c14b104adb45db331af72f81c8",
"packages": [
{
"name": "graham-campbell/result-type",
@ -491,16 +491,16 @@
},
{
"name": "ldc/ldccrmv2client",
"version": "3.0.5",
"version": "3.0.6",
"source": {
"type": "git",
"url": "https://lab.s-web.fr/ldc-web/projets/crm-client.git",
"reference": "d5dc2c68650bbe556a28b04d8f96f9d7e4668f35"
"reference": "b08177cbd4f1142e6878dc0b1a4bb445e332849f"
},
"dist": {
"type": "zip",
"url": "https://lab.s-web.fr/api/v4/projects/26/packages/composer/archives/ldc/ldccrmv2client.zip?sha=d5dc2c68650bbe556a28b04d8f96f9d7e4668f35",
"reference": "d5dc2c68650bbe556a28b04d8f96f9d7e4668f35",
"url": "https://lab.s-web.fr/api/v4/projects/26/packages/composer/archives/ldc/ldccrmv2client.zip?sha=b08177cbd4f1142e6878dc0b1a4bb445e332849f",
"reference": "b08177cbd4f1142e6878dc0b1a4bb445e332849f",
"shasum": ""
},
"require": {
@ -1698,16 +1698,16 @@
},
{
"name": "phpstan/phpdoc-parser",
"version": "1.22.0",
"version": "1.22.1",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
"reference": "ec58baf7b3c7f1c81b3b00617c953249fb8cf30c"
"reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/ec58baf7b3c7f1c81b3b00617c953249fb8cf30c",
"reference": "ec58baf7b3c7f1c81b3b00617c953249fb8cf30c",
"url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/65c39594fbd8c67abfc68bb323f86447bab79cc0",
"reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0",
"shasum": ""
},
"require": {
@ -1739,9 +1739,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.0"
"source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.1"
},
"time": "2023-06-01T12:35:21+00:00"
"time": "2023-06-29T20:46:06+00:00"
},
{
"name": "sirbrillig/phpcs-variable-analysis",