Merge pull request symfony#258

doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml

@@ -1,5 +1,17 @@
+parameters:
+    # Adds a fallback DATABASE_URL if the env var is not set.
+    # This allows you to run cache:warmup even if your
+    # environment variables are not available yet.
+    # You should not need to change this value.
+    env(DATABASE_URL): ''
+
 doctrine:
     dbal:
+        # configure these for your database server
+        driver: 'pdo_mysql'
+        server_version: '5.7'
+        charset: utf8mb4
+
         # With Symfony 3.3, remove the `resolve:` prefix
         url: '%env(resolve:DATABASE_URL)%'
     orm:

doctrine/doctrine-bundle/1.6/manifest.json

@@ -9,7 +9,7 @@
     "env": {
         "#1": "Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url",
         "#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:[email protected]:3306/db_name?charset=utf8mb4&serverVersion=5.7"
+        "#3": "Configure your db driver and server_version in config/packages/doctrine.yaml",
+        "DATABASE_URL": "mysql://db_user:[email protected]:3306/db_name"
     }
 }

doctrine/doctrine-bundle/1.6/post-install.txt

@@ -0,0 +1,8 @@
+<bg=blue;fg=white>                     </>
+<bg=blue;fg=white> Next: Configuration </>
+<bg=blue;fg=white>                     </>
+
+  * Modify your DATABASE_URL config in <fg=green>.env</>
+
+  * Configure the <fg=green>driver</> (mysql) and
+    <fg=green>server_version</fg> (5.7) in <fg=green>config/packages/doctrine.yaml</>