From c556d07172b7dd1e019805bea094b017620a76aa Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Thu, 19 Jul 2018 13:37:46 +0200 Subject: [PATCH 1/2] Updated some config for Symfony 4 practices --- doctrine/multiple_entity_managers.rst | 71 ++++++++++++--------------- 1 file changed, 31 insertions(+), 40 deletions(-) diff --git a/doctrine/multiple_entity_managers.rst b/doctrine/multiple_entity_managers.rst index 933072b7843..300cebea395 100644 --- a/doctrine/multiple_entity_managers.rst +++ b/doctrine/multiple_entity_managers.rst @@ -32,23 +32,22 @@ The following configuration code shows how you can configure two entity managers doctrine: dbal: default_connection: default + + + connections: default: - driver: pdo_mysql - host: '%database_host%' - port: '%database_port%' - dbname: '%database_name%' - user: '%database_user%' - password: '%database_password%' - charset: UTF8 + # configure these for your database server + url: '%env(DATABASE_URL)%' + driver: 'pdo_mysql' + server_version: '5.7' + charset: utf8mb4 customer: - driver: pdo_mysql - host: '%database_host2%' - port: '%database_port2%' - dbname: '%database_name2%' - user: '%database_user2%' - password: '%database_password2%' - charset: UTF8 + # configure these for your database server + url: '%env(DATABASE_CUSTOMER_URL)%' + driver: 'pdo_mysql' + server_version: '5.7' + charset: utf8mb4 orm: default_entity_manager: default @@ -86,24 +85,20 @@ The following configuration code shows how you can configure two entity managers + + @@ -140,23 +135,19 @@ The following configuration code shows how you can configure two entity managers 'dbal' => array( 'default_connection' => 'default', 'connections' => array( + // configure these for your database server 'default' => array( - 'driver' => 'pdo_mysql', - 'host' => '%database_host%', - 'port' => '%database_port%', - 'dbname' => '%database_name%', - 'user' => '%database_user%', - 'password' => '%database_password%', - 'charset' => 'UTF8', + 'url' => '%env(DATABASE_URL)%', + 'driver' => 'pdo_mysql', + 'server_version' => '5.7', + 'charset' => 'utf8mb4', ), + // configure these for your database server 'customer' => array( - 'driver' => 'pdo_mysql', - 'host' => '%database_host2%', - 'port' => '%database_port2%', - 'dbname' => '%database_name2%', - 'user' => '%database_user2%', - 'password' => '%database_password2%', - 'charset' => 'UTF8', + 'url' => '%env(DATABASE_CUSTOMER_URL)%', + 'driver' => 'pdo_mysql', + 'server_version' => '5.7', + 'charset' => 'utf8mb4', ), ), ), From 28bbeecbe905e171c44c5c9b02533f4b2099b066 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Thu, 19 Jul 2018 13:38:57 +0200 Subject: [PATCH 2/2] Remove extra lines --- doctrine/multiple_entity_managers.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/doctrine/multiple_entity_managers.rst b/doctrine/multiple_entity_managers.rst index 300cebea395..ba14d896be1 100644 --- a/doctrine/multiple_entity_managers.rst +++ b/doctrine/multiple_entity_managers.rst @@ -32,9 +32,6 @@ The following configuration code shows how you can configure two entity managers doctrine: dbal: default_connection: default - - - connections: default: # configure these for your database server