From 25e96782f50ee0880811a8d08c56f263e28c7e14 Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Thu, 16 Nov 2017 15:45:18 +0200
Subject: [PATCH] Moving some params

---
 doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml | 6 +-----
 doctrine/doctrine-bundle/1.6/manifest.json                 | 4 ++++
 doctrine/doctrine-bundle/1.6/post-install.txt              | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml b/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml
index 1509b5b4..ee7be0e3 100644
--- a/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml
+++ b/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml
@@ -1,13 +1,9 @@
 parameters:
-    # update these for your app
-    doctrine.database_server: mysql
-    doctrine.server_version: 5.7
-
     # adds a fallback URL if the env var is not set
     # this is useful to allow you to run cache:warmup
     # even when your environment variables don't yet exist
     # you should not need to change this value
-    DATABASE_URL: '%doctrine.database_server%://'
+    env(DATABASE_URL): '%doctrine.database_server%://'
 
 doctrine:
     dbal:
diff --git a/doctrine/doctrine-bundle/1.6/manifest.json b/doctrine/doctrine-bundle/1.6/manifest.json
index bc8451ee..18cdf4ee 100644
--- a/doctrine/doctrine-bundle/1.6/manifest.json
+++ b/doctrine/doctrine-bundle/1.6/manifest.json
@@ -11,5 +11,9 @@
         "#2": "For an SQLite database, use: \"sqlite:///%kernel.project_dir%/var/data.db\"",
         "#3": "Set \"serverVersion\" to your server version to avoid edge-case exceptions and extra database calls",
         "DATABASE_URL": "mysql://db_user:db_password@127.0.0.1:3306/db_name?charset=utf8mb4"
+    },
+    "container": {
+        "doctrine.database_server": "mysql",
+        "doctrine.server_version": "5.7"
     }
 }
diff --git a/doctrine/doctrine-bundle/1.6/post-install.txt b/doctrine/doctrine-bundle/1.6/post-install.txt
index e97f842f..684cd186 100644
--- a/doctrine/doctrine-bundle/1.6/post-install.txt
+++ b/doctrine/doctrine-bundle/1.6/post-install.txt
@@ -5,4 +5,4 @@
   * Modify your DATABASE_URL config in <fg=green>.env</>
 
   * Configure the <fg=green>database_server</> (mysql) and
-    <fg=green>server_version</fg> (5.7) in <fg=green>config/packages/doctrine.yaml</>
+    <fg=green>server_version</fg> (5.7) in <fg=green>config/services.yaml</>