Merge branch 'hotfix/v8-3978_fix_dolibarr_url' into develop

.env

@@ -37,7 +37,7 @@ OPENTALENT_CONFIG=/config/opentalent
 ###< opentalent config folder ###
 
 ###> dolibarr client ###
-DOLIBARR_API_BASE_URI=https://prod-erp.2iopenservice.com/api/index.php/
+DOLIBARR_API_BASE_URI=https://dev-erp.2iopenservice.com/api/index.php/
 DOLIBARR_API_TOKEN=Bocc4zC0J186v8J6QCqu7DnoIw4I7mCJ
 ###< dolibarr client ###
 
@@ -100,3 +100,7 @@ TYPO3_BASE_URI=http://docker.sub.opentalent.fr
 ###> nelmio/cors-bundle ###
 CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
 ###< nelmio/cors-bundle ###
+
+###> filename log ###
+LOG_FILE_NAME=undefined
+###< filename log ###

.env.ci

@@ -30,10 +30,10 @@ DATABASE_ADMINASSOS_URL=mysql://root:xxx@preprod:3306/none?serverVersion=5.7
 TYPO3_BASE_URI=http://docker.sub.opentalent.fr
 ###< typo3 client ###
 
-###> dolibarr client ###
-DOLIBARR_API_BASE_URI='https://dev-erp.2iopenservice.com/api/index.php/'
-###< dolibarr client ###
-
 ###> bindfile populate buffer file
 BIND_FILE_BUFFER_FILE=var/subdomain.txt
 ###< bindfile populate buffer file
+
+###> filename log ###
+LOG_FILE_NAME=ci
+###< filename log ###

.env.docker

@@ -33,10 +33,6 @@ DATABASE_AUDIT_URL=mysql://root:mysql660@db:3306/audit?serverVersion=5.7
 TYPO3_BASE_URI=http://docker.sub.opentalent.fr
 ###< typo3 client ###
 
-###> dolibarr client ###
-DOLIBARR_API_BASE_URI=https://dev-erp.2iopenservice.com/api/index.php/
-###< dolibarr client ###
-
 ###> symfony/mercure-bundle ###
 # See https://symfony.com/doc/current/mercure.html#configuration
 # The URL of the Mercure hub, used by the app to publish updates (can be a local URL)
@@ -54,3 +50,7 @@ BIND_FILE_BUFFER_FILE=/var/www/html/var/subdomain.txt
 ###> mailcatcher ###
 MAILER_DSN=smtp://mailcatcher:1025
 ###< symfony/mercure-bundle ###
+
+###> filename log ###
+LOG_FILE_NAME=docker
+###< filename log ###

.env.preprod

@@ -33,10 +33,6 @@ DATABASE_ADMINASSOS_URL=mysql://root:mysql2iopenservice369566@preprod:3306/admin
 DATABASE_AUDIT_URL=mysql://root:mysql2iopenservice369566@preprod:3306/audit?serverVersion=5.7
 ###< Audit configuration ###
 
-###> dolibarr client ###
-DOLIBARR_API_BASE_URI=https://dev-erp.2iopenservice.com/api/index.php/
-###< dolibarr client ###
-
 ###> symfony/mercure-bundle ###
 # See https://symfony.com/doc/current/mercure.html#configuration
 # The URL of the Mercure hub, used by the app to publish updates (can be a local URL)
@@ -55,3 +51,7 @@ BIND_FILE_BUFFER_FILE=var/subdomain.txt
 WKHTMLTOPDF_PATH=/usr/bin/wkhtmltopdf
 WKHTMLTOIMAGE_PATH=/usr/bin/wkhtmltoimage
 ###< knplabs/knp-snappy-bundle ###
+
+###> filename log ###
+LOG_FILE_NAME=preprod
+###< filename log ###

.env.prod

@@ -32,7 +32,7 @@ DATABASE_AUDIT_URL=mysql://root:mysql2iopenservice369566@prod-back:3306/audit?se
 ###< Audit configuration ###
 
 ###> dolibarr client ###
-DOLIBARR_API_BASE_URI=https://dev-erp.2iopenservice.com/api/index.php/
+DOLIBARR_API_BASE_URI=https://prod-erp.2iopenservice.com/api/index.php/
 ###< dolibarr client ###
 
 ###> symfony/mercure-bundle ###
@@ -53,3 +53,7 @@ BIND_FILE_BUFFER_FILE=/env/subdomain.txt
 WKHTMLTOPDF_PATH=/usr/bin/wkhtmltopdf
 WKHTMLTOIMAGE_PATH=/usr/bin/wkhtmltoimage
 ###< knplabs/knp-snappy-bundle ###
+
+###> filename log ###
+LOG_FILE_NAME=prod
+###< filename log ###

.env.test

@@ -1,24 +1,37 @@
 ###> symfony/framework-bundle ###
-APP_DEBUG=1
+APP_DEBUG=0
 ###< symfony/framework-bundle ###
 
+###> doctrine/doctrine-bundle ###
+DATABASE_URL=mysql://root:mysql2iopenservice369566@localhost:3306/opentalent?serverVersion=5.7
+###< doctrine/doctrine-bundle ###
+
+###> nelmio/cors-bundle ###
+CORS_ALLOW_ORIGIN=^https?://(localhost|127\.0\.0\.1)(:[0-9]+)$
+###< nelmio/cors-bundle ###
+
 ###> api v1 ###
 API_LEG_BASE_URL=https://api.test.opentalent.fr/api
 ###< files management ###
 
-# define your env variables for the test env here
-KERNEL_CLASS='App\Kernel'
-APP_SECRET='$ecretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999
-PANTHER_APP_ENV=panther
-
 ###> typo3 client ###
 TYPO3_BASE_URI=http://test.opentalent.fr/ohcluses
 ###< typo3 client ###
 
-###> dolibarr client ###
-DOLIBARR_API_BASE_URI='https://dev-erp.2iopenservice.com/api/index.php/'
-###< dolibarr client ###
+###> BlackFire configuration ###
+BLACKFIRE_CLIENT_ID=988fcba8-552d-48df-a9c2-035c76535b69
+BLACKFIRE_CLIENT_TOKEN=8cfbeb263d044da9678dc2612531504da3790c308da7448e35724a5da91c136f
+BLACKFIRE_SERVER_ID=1171e53b-459b-41da-a292-80ff68cee8c2
+BLACKFIRE_SERVER_TOKEN=dbd1cfbea015fe83cccfc189a36ca3c16f3a1b43b94f50032a15e41e53548e8b
+###< BlackFire configuration ###
+
+###> AdminAssos configuration ###
+DATABASE_ADMINASSOS_URL=mysql://root:mysql2iopenservice369566@test:3306/adminassos?serverVersion=5.7
+###< AdminAssos configuration ###
+
+###> Audit configuration ###
+DATABASE_AUDIT_URL=mysql://root:mysql2iopenservice369566@test:3306/audit?serverVersion=5.7
+###< Audit configuration ###
 
 ###> symfony/mercure-bundle ###
 # See https://symfony.com/doc/current/mercure.html#configuration
@@ -27,7 +40,7 @@ MERCURE_URL=https://mercure.test.opentalent.fr/.well-known/mercure
 # The public URL of the Mercure hub, used by the browser to connect
 MERCURE_PUBLIC_URL=https://mercure.test.opentalent.fr/.well-known/mercure
 # The secret used to sign the JWTs
-MERCURE_JWT_SECRET=yV9fil5nodzRVrHpYrALGofhqiNO2RN3wjMlZnubgscdJ8yQ1BbATxEx6U6XwbRE
+MERCURE_JWT_SECRET=NQEupdREijrfYvCmF2mnvZQFL9zLKDH9RCYter6tUWzjemPqzicffhc2fSf0yEmM
 ###< symfony/mercure-bundle ###
 
 ###> bindfile populate buffer file
@@ -38,3 +51,7 @@ BIND_FILE_BUFFER_FILE=var/subdomain.txt
 WKHTMLTOPDF_PATH=/usr/bin/wkhtmltopdf
 WKHTMLTOIMAGE_PATH=/usr/bin/wkhtmltoimage
 ###< knplabs/knp-snappy-bundle ###
+
+###> filename log ###
+LOG_FILE_NAME=test
+###< filename log ###

config/packages/docker/monolog.yaml

@@ -34,7 +34,7 @@ monolog:
         # logging fichier
         file_main:
             type: rotating_file
-            path: "%kernel.logs_dir%/%kernel.environment%.main.log"
+            path: "%kernel.logs_dir%/%env(LOG_FILE_NAME)%.main.log"
             level: debug
             max_files: 3
             channels: [php, doctrine, http_client, elastica]

config/packages/prod/monolog.yaml

@@ -34,7 +34,7 @@ monolog:
         # logging fichier
         file_main:
             type: rotating_file
-            path: "%kernel.logs_dir%/%kernel.environment%.main.log"
+            path: "%kernel.logs_dir%/%env(LOG_FILE_NAME)%.main.log"
             level: debug
             max_files: 3
             channels: [php, doctrine, http_client, elastica]