Skip to content

Commit

Permalink
Remove charset config for doctrine-bundle v2
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-grekas committed Nov 27, 2019
1 parent 53faf5a commit 4293dc6
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 8 deletions.
5 changes: 2 additions & 3 deletions doctrine/doctrine-bundle/1.12/config/packages/doctrine.yaml
Expand Up @@ -2,12 +2,11 @@ doctrine:
dbal:
url: '%env(resolve:DATABASE_URL)%'

# IMPORTANT: You MUST configure your db driver and server version,
# IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file)
#driver: 'mysql'
#server_version: '5.7'

# Only needed for MySQL (ignored otherwise)
# only needed for MySQL
charset: utf8mb4
default_table_options:
collate: utf8mb4_unicode_ci
Expand Down
5 changes: 2 additions & 3 deletions doctrine/doctrine-bundle/1.6/config/packages/doctrine.yaml
Expand Up @@ -2,12 +2,11 @@ doctrine:
dbal:
url: '%env(resolve:DATABASE_URL)%'

# IMPORTANT: You MUST configure your db driver and server version,
# IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file)
#driver: 'mysql'
#server_version: '5.7'

# Only needed for MySQL (ignored otherwise)
# only needed for MySQL
charset: utf8mb4
default_table_options:
collate: utf8mb4_unicode_ci
Expand Down
4 changes: 2 additions & 2 deletions doctrine/doctrine-bundle/1.6/manifest.json
Expand Up @@ -9,8 +9,8 @@
"env": {
"#1": "Format described at https://www.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": "For a PostgreSQL database, use: \"postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=UTF-8\"",
"#4": "IMPORTANT: You MUST configure your db driver and server version, either here or in config/packages/doctrine.yaml",
"#3": "For a PostgreSQL database, use: \"postgresql://db_user:db_password@127.0.0.1:5432/db_name?serverVersion=11&charset=utf8\"",
"#4": "IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml",
"DATABASE_URL": "mysql://db_user:db_password@127.0.0.1:3306/db_name?serverVersion=5.7"
}
}
18 changes: 18 additions & 0 deletions doctrine/doctrine-bundle/2.0/config/packages/doctrine.yaml
@@ -0,0 +1,18 @@
doctrine:
dbal:
url: '%env(resolve:DATABASE_URL)%'

# IMPORTANT: You MUST configure your server version,
# either here or in the DATABASE_URL env var (see .env file)
#server_version: '5.7'
orm:
auto_generate_proxy_classes: true
naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
auto_mapping: true
mappings:
App:
is_bundle: false
type: annotation
dir: '%kernel.project_dir%/src/Entity'
prefix: 'App\Entity'
alias: App
1 change: 1 addition & 0 deletions doctrine/doctrine-bundle/2.0/manifest.json
1 change: 1 addition & 0 deletions doctrine/doctrine-bundle/2.0/post-install.txt
1 change: 1 addition & 0 deletions doctrine/doctrine-bundle/2.0/src

0 comments on commit 4293dc6

Please sign in to comment.