diff --git a/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml b/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml index f5d651117..ab772e9af 100644 --- a/doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml +++ b/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: diff --git a/doctrine/doctrine-bundle/1.6/manifest.json b/doctrine/doctrine-bundle/1.6/manifest.json index 1427a93bc..3ab621af0 100644 --- a/doctrine/doctrine-bundle/1.6/manifest.json +++ b/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:db_password@127.0.0.1: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:db_password@127.0.0.1:3306/db_name" } } diff --git a/doctrine/doctrine-bundle/1.6/post-install.txt b/doctrine/doctrine-bundle/1.6/post-install.txt new file mode 100644 index 000000000..681815f79 --- /dev/null +++ b/doctrine/doctrine-bundle/1.6/post-install.txt @@ -0,0 +1,8 @@ + + Next: Configuration + + + * Modify your DATABASE_URL config in .env + + * Configure the driver (mysql) and + server_version (5.7) in config/packages/doctrine.yaml