|
@@ -62,7 +62,23 @@ class Configuration implements ConfigurationInterface
|
|
->ifTrue(function ($v) { return is_array($v) && !array_key_exists('connections', $v) && !array_key_exists('connection', $v); })
|
|
->ifTrue(function ($v) { return is_array($v) && !array_key_exists('connections', $v) && !array_key_exists('connection', $v); })
|
|
->then(function ($v) {
|
|
->then(function ($v) {
|
|
$connection = array();
|
|
$connection = array();
|
|
- foreach (array('dbname', 'host', 'port', 'user', 'password', 'driver', 'driver_class', 'options', 'path', 'memory', 'unix_socket', 'wrapper_class', 'platform_service', 'charset', 'logging') as $key) {
|
|
|
|
|
|
+ foreach (array(
|
|
|
|
+ 'dbname',
|
|
|
|
+ 'host',
|
|
|
|
+ 'port',
|
|
|
|
+ 'user',
|
|
|
|
+ 'password',
|
|
|
|
+ 'driver',
|
|
|
|
+ 'driver_class',
|
|
|
|
+ 'options',
|
|
|
|
+ 'path',
|
|
|
|
+ 'memory',
|
|
|
|
+ 'unix_socket',
|
|
|
|
+ 'wrapper_class', 'wrapper-class', 'wrapperClass',
|
|
|
|
+ 'platform_service', 'platform-service', 'platform-service',
|
|
|
|
+ 'charset',
|
|
|
|
+ 'logging'
|
|
|
|
+ ) as $key) {
|
|
if (array_key_exists($key, $v)) {
|
|
if (array_key_exists($key, $v)) {
|
|
$connection[$key] = $v[$key];
|
|
$connection[$key] = $v[$key];
|
|
unset($v[$key]);
|
|
unset($v[$key]);
|
|
@@ -143,7 +159,13 @@ class Configuration implements ConfigurationInterface
|
|
->ifTrue(function ($v) { return is_array($v) && !array_key_exists('entity_managers', $v) && !array_key_exists('entity_manager', $v); })
|
|
->ifTrue(function ($v) { return is_array($v) && !array_key_exists('entity_managers', $v) && !array_key_exists('entity_manager', $v); })
|
|
->then(function ($v) {
|
|
->then(function ($v) {
|
|
$entityManager = array();
|
|
$entityManager = array();
|
|
- foreach (array('result_cache_driver', 'result-cache-driver', 'metadata_cache_driver', 'metadata-cache-driver', 'query_cache_driver', 'query-cache-driver', 'mappings', 'mapping', 'connection') as $key) {
|
|
|
|
|
|
+ foreach (array(
|
|
|
|
+ 'result_cache_driver', 'result-cache-driver',
|
|
|
|
+ 'metadata_cache_driver', 'metadata-cache-driver',
|
|
|
|
+ 'query_cache_driver', 'query-cache-driver',
|
|
|
|
+ 'mappings', 'mapping',
|
|
|
|
+ 'connection'
|
|
|
|
+ ) as $key) {
|
|
if (array_key_exists($key, $v)) {
|
|
if (array_key_exists($key, $v)) {
|
|
$entityManager[$key] = $v[$key];
|
|
$entityManager[$key] = $v[$key];
|
|
unset($v[$key]);
|
|
unset($v[$key]);
|