Merge pull request #24 from Recras/database-connection-charset-environment

timmipetit · web-flow · commit 281706323d3a · 2018-09-20T11:11:52.000+02:00
Accept DOCTRINE_CONNECTION_CHARSET environment variable
diff --git a/lib/database/sfDatabaseManager.class.php b/lib/database/sfDatabaseManager.class.php
@@ -67,10 +67,14 @@ public function loadConfiguration()
   {
     if (!empty($_SERVER['DOCTRINE_DSN']))
     {
-      $databases = array('doctrine' => new sfDoctrineDatabase(array(
+      $parameters = array(
         'name' => 'doctrine',
         'dsn' => $_SERVER['DOCTRINE_DSN'],
-      )));
+      );
+      if (isset($this->configuration->doctrineConnectionCharset)) {
+        $parameters['encoding'] = $this->configuration->doctrineConnectionCharset;
+      }
+      $databases = array('doctrine' => new sfDoctrineDatabase($parameters));
     }
     elseif ($this->configuration instanceof sfApplicationConfiguration)
     {

Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,14 @@ public function loadConfiguration()`
`67`	`67`	`{`
`68`	`68`	`if (!empty($_SERVER['DOCTRINE_DSN']))`
`69`	`69`	`{`
`70`		`- $databases = array('doctrine' => new sfDoctrineDatabase(array(`
	`70`	`+ $parameters = array(`
`71`	`71`	`'name' => 'doctrine',`
`72`	`72`	`'dsn' => $_SERVER['DOCTRINE_DSN'],`
`73`		`- )));`
	`73`	`+ );`
	`74`	`+ if (isset($this->configuration->doctrineConnectionCharset)) {`
	`75`	`+ $parameters['encoding'] = $this->configuration->doctrineConnectionCharset;`
	`76`	`+ }`
	`77`	`+ $databases = array('doctrine' => new sfDoctrineDatabase($parameters));`
`74`	`78`	`}`
`75`	`79`	`elseif ($this->configuration instanceof sfApplicationConfiguration)`
`76`	`80`	`{`