From b0614ef0e1693178fab9e4a7843f72bbecb7c75c Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Mon, 1 Feb 2010 17:55:40 +0100
Subject: [PATCH] [DependencyInjection] made some more tweak to the Doctrine
 extension

---
 .../Loader/Extension/DoctrineExtension.php                 | 7 ++++++-
 .../Loader/Extension/xml/doctrine/dbal-1.0.xml             | 7 +++++++
 .../Loader/schema/dic/doctrine/doctrine-1.0.xsd            | 3 +++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/DoctrineExtension.php b/src/Symfony/Components/DependencyInjection/Loader/Extension/DoctrineExtension.php
index 4bfe4f58fbdc..5faf6345bf5c 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/DoctrineExtension.php
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/DoctrineExtension.php
@@ -49,7 +49,7 @@ public function dbalLoad($config)
     $loader = new XmlFileLoader(__DIR__.'/xml/doctrine');
     $configuration->merge($loader->load('dbal-1.0.xml'));
 
-    foreach (array('dbname', 'host', 'username', 'password') as $key)
+    foreach (array('dbname', 'host', 'username', 'password', 'path', 'port') as $key)
     {
       if (isset($config[$key]))
       {
@@ -57,6 +57,11 @@ public function dbalLoad($config)
       }
     }
 
+    if (isset($config['options']))
+    {
+      $configuration->setParameter('doctrine.dbal.driver.options', $config['options']);
+    }
+
     if (isset($config['driver']))
     {
       $class = $config['driver'];
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/doctrine/dbal-1.0.xml b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/doctrine/dbal-1.0.xml
index 49da90bbae74..6c001cd3b841 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/doctrine/dbal-1.0.xml
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/doctrine/dbal-1.0.xml
@@ -5,10 +5,14 @@
     xsi:schemaLocation="http://www.symfony-project.org/schema/dic/services http://www.symfony-project.org/schema/dic/services/services-1.0.xsd">
 
   <parameters>
+    <parameter key="doctrine.dbal.dbname">null</parameter>
     <parameter key="doctrine.dbal.user">root</parameter>
     <parameter key="doctrine.dbal.password"></parameter>
     <parameter key="doctrine.dbal.host">localhost</parameter>
+    <parameter key="doctrine.dbal.port">null</parameter>
+    <parameter key="doctrine.dbal.path">null</parameter>
     <parameter key="doctrine.dbal.driver.class">Doctrine\DBAL\Driver\PDOMySql\Driver</parameter>
+    <parameter key="doctrine.dbal.driver.options" type="collection" />
     <parameter key="doctrine.dbal.wrapper.class">Doctrine\DBAL\Connection</parameter>
     <parameter key="doctrine.dbal.configuration.class">Doctrine\DBAL\Configuration</parameter>
     <parameter key="doctrine.dbal.event_manager.class">Doctrine\Common\EventManager</parameter>
@@ -21,7 +25,10 @@
         <argument key="user">%doctrine.dbal.user%</argument>
         <argument key="password">%doctrine.dbal.password%</argument>
         <argument key="host">%doctrine.dbal.host%</argument>
+        <argument key="port">%doctrine.dbal.port%</argument>
+        <argument key="path">%doctrine.dbal.path%</argument>
         <argument key="driverClass">%doctrine.dbal.driver.class%</argument>
+        <argument key="driverOptions">%doctrine.dbal.driver.options%</argument>
         <!--
         <argument key="wrapperClass">%doctrine.dbal.wrapper.class%</argument>
         //-->
diff --git a/src/Symfony/Components/DependencyInjection/Loader/schema/dic/doctrine/doctrine-1.0.xsd b/src/Symfony/Components/DependencyInjection/Loader/schema/dic/doctrine/doctrine-1.0.xsd
index 68aa3345e3f6..69445f5faa6c 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/schema/dic/doctrine/doctrine-1.0.xsd
+++ b/src/Symfony/Components/DependencyInjection/Loader/schema/dic/doctrine/doctrine-1.0.xsd
@@ -10,8 +10,11 @@
   <xsd:complexType name="dbal">
     <xsd:attribute name="dbname" type="xsd:string" />
     <xsd:attribute name="host" type="xsd:string" />
+    <xsd:attribute name="port" type="xsd:integer" />
     <xsd:attribute name="username" type="xsd:string" />
     <xsd:attribute name="password" type="xsd:string" />
     <xsd:attribute name="driver" type="xsd:string" />
+    <xsd:attribute name="options" type="xsd:string" />
+    <xsd:attribute name="path" type="xsd:string" />
   </xsd:complexType>
 </xsd:schema>