From 3ca3404d44a530c70db73ff7ce936e96fc5e2dca Mon Sep 17 00:00:00 2001 From: William DURAND Date: Wed, 26 Jan 2011 21:47:06 +0100 Subject: [PATCH] The database charset is now configurable. First, the 'FIXME:' said more or less to use %kernel.charset% to configure the database charset. But charsets are not database charsets. That's why a new config parameter has appeared : propel.config: charset: "UTF8" This parameter is optional and default is "UTF8". --- DependencyInjection/PropelExtension.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/DependencyInjection/PropelExtension.php b/DependencyInjection/PropelExtension.php index 5c3a093..55c47a0 100644 --- a/DependencyInjection/PropelExtension.php +++ b/DependencyInjection/PropelExtension.php @@ -40,6 +40,13 @@ class PropelExtension extends Extension if (isset($config['phing_path'])) { $container->setParameter('propel.phing_path', $config['phing_path']); } + + if (isset($config['charset'])) { + $charset = $config['charset']; + } else { + $charset = 'UTF8'; + } + $container->setParameter('propel.charset', $charset); } /** @@ -69,8 +76,7 @@ class PropelExtension extends Extension 'classname' => $className, 'options' => array(), 'attributes' => array(), -// FIXME: Mysql wants UTF8, not UTF-8 (%kernel.charset%) - 'settings' => array('charset' => array('value' => 'UTF8')), + 'settings' => array('charset' => array('value' => $container->getParameter('propel.charset'))), ); foreach ($configs as $config) {