changed all XML attribute names to take - instead of _ (everything should be consistent now)

src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php

@@ -72,7 +72,7 @@ class DoctrineExtension extends Extension
             $loader->load('dbal.xml');
         }
 
-        $defaultConnectionName = isset($config['default_connection']) ? $config['default_connection'] : $container->getParameter('doctrine.dbal.default_connection');
+        $defaultConnectionName = isset($config['default-connection']) ? $config['default-connection'] : (isset($config['default_connection']) ? $config['default_connection'] : $container->getParameter('doctrine.dbal.default_connection'));
         $container->setAlias('database_connection', sprintf('doctrine.dbal.%s_connection', $defaultConnectionName));
         $container->setParameter('doctrine.dbal.default_connection', $defaultConnectionName);
     }
@@ -106,12 +106,12 @@ class DoctrineExtension extends Extension
             $arguments = $driverDef->getArguments();
             $driverOptions = $arguments[0];
         } else {
-            $containerClass = isset($connection['configuration_class']) ? $connection['configuration_class'] : 'Doctrine\DBAL\Configuration';
+            $containerClass = isset($connection['configuration-class']) ? $connection['configuration-class'] : (isset($connection['configuration_class']) ? $connection['configuration_class'] : 'Doctrine\DBAL\Configuration');
             $containerDef = new Definition($containerClass);
             $containerDef->addMethodCall('setSqlLogger', array(new Reference('doctrine.dbal.logger')));
             $container->setDefinition(sprintf('doctrine.dbal.%s_connection.configuration', $connection['name']), $containerDef);
 
-            $eventManagerDef = new Definition($connection['event_manager_class']);
+            $eventManagerDef = new Definition(isset($connection['event-manager-class']) ? $connection['event-manager-class'] : $connection['event_manager_class']);
             $container->setDefinition(sprintf('doctrine.dbal.%s_connection.event_manager', $connection['name']), $eventManagerDef);
 
             $driverOptions = array();
@@ -123,6 +123,9 @@ class DoctrineExtension extends Extension
         if (isset($connection['driver'])) {
             $driverOptions['driverClass'] = sprintf('Doctrine\\DBAL\\Driver\\%s\\Driver', $connection['driver']);
         }
+        if (isset($connection['wrapper-class'])) {
+            $driverOptions['wrapperClass'] = $connection['wrapper-class'];
+        }
         if (isset($connection['wrapper_class'])) {
             $driverOptions['wrapperClass'] = $connection['wrapper_class'];
         }
@@ -133,6 +136,11 @@ class DoctrineExtension extends Extension
             if (isset($connection[$key])) {
                 $driverOptions[$key] = $connection[$key];
             }
+
+            $nKey = str_replace('_', '-', $key);
+            if (isset($connection[$nKey])) {
+                $driverOptions[$key] = $connection[$nKey];
+            }
         }
 
         $driverDef->setArguments(array(
@@ -222,6 +230,11 @@ class DoctrineExtension extends Extension
             if (isset($config[$key])) {
                 $container->setParameter('doctrine.orm.'.$key, $config[$key]);
             }
+
+            $nKey = str_replace('_', '-', $key);
+            if (isset($config[$nKey])) {
+                $container->setParameter('doctrine.orm.'.$key, $config[$nKey]);
+            }
         }
         $container->setParameter('doctrine.orm.metadata_driver.mapping_dirs', $this->findBundleSubpaths('Resources/config/doctrine/metadata/orm', $container));
         $container->setParameter('doctrine.orm.metadata_driver.entity_dirs', $this->findBundleSubpaths('Entity', $container));
@@ -298,8 +311,16 @@ class DoctrineExtension extends Extension
     {
         $defaultEntityManager = $container->getParameter('doctrine.orm.default_entity_manager');
         $entityManagers = array();
+        if (isset($config['entity-managers'])) {
+            $config['entity_managers'] = $config['entity-managers'];
+        }
+
         if (isset($config['entity_managers'])) {
             $configEntityManagers = $config['entity_managers'];
+            if (isset($config['entity_managers']['entity-manager'])) {
+                $config['entity_managers']['entity_manager'] = $config['entity_managers']['entity-manager'];
+            }
+
             if (isset($config['entity_managers']['entity_manager']) && isset($config['entity_managers']['entity_manager'][0])) {
                 // Multiple entity managers
                 $configEntityManagers = $config['entity_managers']['entity_manager'];
@@ -379,7 +400,7 @@ class DoctrineExtension extends Extension
     protected function loadOrmEntityManagerMetadataCacheDriver(array $entityManager, ContainerBuilder $container)
     {
         $cacheDriver = $container->getParameter('doctrine.orm.metadata_cache_driver');
-        $cacheDriver = isset($entityManager['metadata_cache_driver']) ? $entityManager['metadata_cache_driver'] : $cacheDriver;
+        $cacheDriver = isset($entityManager['metadata-cache-driver']) ? $entityManager['metadata-cache-driver'] : (isset($entityManager['metadata_cache_driver']) ? $entityManager['metadata_cache_driver'] : $cacheDriver);
         $cacheDef = $this->getEntityManagerCacheDefinition($entityManager, $cacheDriver, $container);
         $container->setDefinition(sprintf('doctrine.orm.%s_metadata_cache', $entityManager['name']), $cacheDef);
     }
@@ -393,7 +414,7 @@ class DoctrineExtension extends Extension
     protected function loadOrmEntityManagerQueryCacheDriver(array $entityManager, ContainerBuilder $container)
     {
         $cacheDriver = $container->getParameter('doctrine.orm.query_cache_driver');
-        $cacheDriver = isset($entityManager['query_cache_driver']) ? $entityManager['query_cache_driver'] : $cacheDriver;
+        $cacheDriver = isset($entityManager['query-cache-driver']) ? $entityManager['query-cache-driver'] : (isset($entityManager['query_cache_driver']) ? $entityManager['query_cache_driver'] : $cacheDriver);
         $cacheDef = $this->getEntityManagerCacheDefinition($entityManager, $cacheDriver, $container);
         $container->setDefinition(sprintf('doctrine.orm.%s_query_cache', $entityManager['name']), $cacheDef);
     }
@@ -407,7 +428,7 @@ class DoctrineExtension extends Extension
     protected function loadOrmEntityManagerResultCacheDriver(array $entityManager, ContainerBuilder $container)
     {
         $cacheDriver = $container->getParameter('doctrine.orm.result_cache_driver');
-        $cacheDriver = isset($entityManager['result_cache_driver']) ? $entityManager['result_cache_driver'] : $cacheDriver;
+        $cacheDriver = isset($entityManager['result-cache-driver']) ? $entityManager['result-cache-driver'] : (isset($entityManager['result_cache_driver']) ? $entityManager['result_cache_driver'] : $cacheDriver);
         $cacheDef = $this->getEntityManagerCacheDefinition($entityManager, $cacheDriver, $container);
         $container->setDefinition(sprintf('doctrine.orm.%s_result_cache', $entityManager['name']), $cacheDef);
     }
@@ -428,7 +449,7 @@ class DoctrineExtension extends Extension
             $cacheDef = new Definition($memcacheClass);
             $memcacheHost = is_array($cacheDriver) && isset($cacheDriver['host']) ? $cacheDriver['host'] : '%doctrine.orm.cache.memcache_host%';
             $memcachePort = is_array($cacheDriver) && isset($cacheDriver['port']) ? $cacheDriver['port'] : '%doctrine.orm.cache.memcache_port%';
-            $memcacheInstanceClass = is_array($cacheDriver) && isset($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%doctrine.orm.cache.memcache_instance_class%';
+            $memcacheInstanceClass = is_array($cacheDriver) && isset($cacheDriver['instance-class']) ? $cacheDriver['instance-class'] : (is_array($cacheDriver) && isset($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%doctrine.orm.cache.memcache_instance_class%');
             $memcacheInstance = new Definition($memcacheInstanceClass);
             $memcacheInstance->addMethodCall('connect', array($memcacheHost, $memcachePort));
             $container->setDefinition(sprintf('doctrine.orm.%s_memcache_instance', $entityManager['name']), $memcacheInstance);

src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd

@@ -12,7 +12,7 @@
       <xsd:element name="connections" type="connections" minOccurs="0" maxOccurs="1" />
     </xsd:sequence>
 
-    <xsd:attribute name="default_connection" type="xsd:string" />
+    <xsd:attribute name="default-connection" type="xsd:string" />
     <xsd:attribute name="dbname" type="xsd:string" />
     <xsd:attribute name="host" type="xsd:string" />
     <xsd:attribute name="port" type="xsd:integer" />
@@ -21,7 +21,7 @@
     <xsd:attribute name="driver" type="xsd:string" />
     <xsd:attribute name="options" type="xsd:string" />
     <xsd:attribute name="path" type="xsd:string" />
-    <xsd:attribute name="unix_socket" type="xsd:string" />
+    <xsd:attribute name="unix-socket" type="xsd:string" />
     <xsd:attribute name="memory" type="xsd:boolean" />
     <xsd:attribute name="charset" type="xsd:string" />
   </xsd:complexType>
@@ -42,29 +42,29 @@
     <xsd:attribute name="driver" type="xsd:string" />
     <xsd:attribute name="options" type="xsd:string" />
     <xsd:attribute name="path" type="xsd:string" />
-    <xsd:attribute name="unix_socket" type="xsd:string" />
+    <xsd:attribute name="unix-socket" type="xsd:string" />
     <xsd:attribute name="memory" type="xsd:boolean" />
     <xsd:attribute name="charset" type="xsd:string" />
-    <xsd:attribute name="configuration_class" type="xsd:string" />
-    <xsd:attribute name="event_manager_class" type="xsd:string" />
-    <xsd:attribute name="wrapper_class" type="xsd:string" />
+    <xsd:attribute name="configuration-class" type="xsd:string" />
+    <xsd:attribute name="event-manager-class" type="xsd:string" />
+    <xsd:attribute name="wrapper-class" type="xsd:string" />
   </xsd:complexType>
 
   <xsd:element name="orm" type="orm" />
 
   <xsd:complexType name="orm">
     <xsd:sequence>
-      <xsd:element name="entity_managers" type="entity_managers" minOccurs="0" maxOccurs="1" />
+      <xsd:element name="entity-managers" type="entity_managers" minOccurs="0" maxOccurs="1" />
     </xsd:sequence>
 
-    <xsd:attribute name="default_entity_manager" type="xsd:string" />
-    <xsd:attribute name="metadata_driver" type="xsd:string" />
-    <xsd:attribute name="cache_driver" type="xsd:string" />
+    <xsd:attribute name="default-entity-manager" type="xsd:string" />
+    <xsd:attribute name="metadata-driver" type="xsd:string" />
+    <xsd:attribute name="cache-driver" type="xsd:string" />
   </xsd:complexType>
 
   <xsd:complexType name="entity_managers">
     <xsd:sequence>
-      <xsd:element name="entity_manager" type="entity_manager" minOccurs="1" maxOccurs="unbounded" />
+      <xsd:element name="entity-manager" type="entity_manager" minOccurs="1" maxOccurs="unbounded" />
     </xsd:sequence>
   </xsd:complexType>
 

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_multiple_connections.xml

@@ -13,7 +13,7 @@
             dbname="mysql_db"
             user="mysql_user"
             password="mysql_s3cr3t"
-            unix_socket="/path/to/mysqld.sock" /><!--  -->
+            unix-socket="/path/to/mysqld.sock" /><!--  -->
         <doctrine:connection
             id="sqlite"
             driver="PDOSqlite"

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_connection.xml

@@ -13,7 +13,7 @@
             dbname="mysql_db"
             user="mysql_user"
             password="mysql_s3cr3t"
-            unix_socket="/path/to/mysqld.sock" /><!--  -->
+            unix-socket="/path/to/mysqld.sock" /><!--  -->
       </doctrine:connections>
     </doctrine:dbal>
 </container>

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_imports.xml

@@ -12,7 +12,7 @@
     </imports>
 
     <doctrine:orm
-        auto_generate_proxy_classes="true"
+        auto-generate-proxy-classes="true"
     >
     </doctrine:orm>
 </container>

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_imports_import.xml

@@ -8,8 +8,8 @@
                         http://www.symfony-project.org/schema/dic/doctrine/dbal http://www.symfony-project.org/schema/dic/doctrine/dbal/doctrine-1.0.xsd">
 
     <doctrine:orm
-        auto_generate_proxy_classes="false"
-        metadata_cache_driver="apc"
+        auto-generate-proxy-classes="false"
+        metadata-cache-driver="apc"
     >
     </doctrine:orm>
 </container>

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_multiple_entity_managers.xml

@@ -27,15 +27,15 @@
     </doctrine:dbal>
 
     <doctrine:orm
-            metadata_cache_driver="apc"
-            default_entity_manager="dm2"
-            default_connection="conn1"
-            proxy_namespace="Proxies"
-            auto_generate_proxy_classes="true"
+            metadata-cache-driver="apc"
+            default-entity-manager="dm2"
+            default-connection="conn1"
+            proxy-namespace="Proxies"
+            auto-generate-proxy-classes="true"
         >
-        <doctrine:entity_managers>
-            <doctrine:entity_manager id="dm1" metadata_cache_driver="xcache" connection="conn1" />
-            <doctrine:entity_manager id="dm2" connection="conn2" />
-        </doctrine:entity_managers>
+        <doctrine:entity-managers>
+            <doctrine:entity-manager id="dm1" metadata-cache-driver="xcache" connection="conn1" />
+            <doctrine:entity-manager id="dm2" connection="conn2" />
+        </doctrine:entity-managers>
     </doctrine:orm>
 </container>

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_simple_single_entity_manager.xml

@@ -9,11 +9,11 @@
 
     <doctrine:dbal />
     <doctrine:orm>
-        <metadata_cache_driver type="memcache">
+        <metadata-cache-driver type="memcache">
             <class>Doctrine\Common\Cache\MemcacheCache</class>
             <host>localhost</host>
             <port>11211</port>
-            <instance_class>Memcache</instance_class>
-        </metadata_cache_driver>
+            <instance-class>Memcache</instance-class>
+        </metadata-cache-driver>
     </doctrine:orm>
 </container>

src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/Fixtures/config/xml/orm_service_single_entity_manager.xml

@@ -20,21 +20,21 @@
     </doctrine:dbal>
 
     <doctrine:orm
-            metadata_cache_driver="apc"
-            default_entity_manager="dm2"
-            default_connection="conn1"
-            proxy_namespace="Proxies"
-            auto_generate_proxy_classes="true"
+            metadata-cache-driver="apc"
+            default-entity-manager="dm2"
+            default-connection="conn1"
+            proxy-namespace="Proxies"
+            auto-generate-proxy-classes="true"
         >
-        <doctrine:entity_managers>
-            <doctrine:entity_manager id="default" connection="default">
-                <metadata_cache_driver type="memcache">
+        <doctrine:entity-managers>
+            <doctrine:entity-manager id="default" connection="default">
+                <metadata-cache-driver type="memcache">
                     <class>Doctrine\Common\Cache\MemcacheCache</class>
                     <host>localhost</host>
                     <port>11211</port>
-                    <instance_class>Memcache</instance_class>
-                </metadata_cache_driver>
-            </doctrine:entity_manager>
-        </doctrine:entity_managers>
+                    <instance-class>Memcache</instance-class>
+                </metadata-cache-driver>
+            </doctrine:entity-manager>
+        </doctrine:entity-managers>
     </doctrine:orm>
 </container>

src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php

@@ -80,6 +80,11 @@ class DoctrineMongoDBExtension extends Extension
             if (isset($config[$key])) {
                 $container->setParameter('doctrine.odm.mongodb.'.$key, $config[$key]);
             }
+
+            $nKey = str_replace('_', '-', $key);
+            if (isset($config[$nKey])) {
+                $container->setParameter('doctrine.odm.mongodb.'.$key, $config[$nKey]);
+            }
         }
         $container->setParameter('doctrine.odm.mongodb.mapping_dirs', $this->findBundleSubpaths('Resources/config/doctrine/metadata/mongodb', $container));
         $container->setParameter('doctrine.odm.mongodb.document_dirs', $this->findBundleSubpaths('Document', $container));
@@ -182,8 +187,18 @@ class DoctrineMongoDBExtension extends Extension
         $defaultDocumentManager = $container->getParameter('doctrine.odm.mongodb.default_document_manager');
 
         $documentManagers = array();
+
+        if (isset($config['document-managers'])) {
+            $config['document_managers'] = $config['document-managers'];
+        }
+
         if (isset($config['document_managers'])) {
             $configDocumentManagers = $config['document_managers'];
+
+            if (isset($config['document_managers']['document-manager'])) {
+                $config['document_managers']['document_manager'] = $config['document_managers']['document-manager'];
+            }
+
             if (isset($config['document_managers']['document_manager']) && isset($config['document_managers']['document_manager'][0])) {
                 // Multiple document managers
                 $configDocumentManagers = $config['document_managers']['document_manager'];
@@ -250,7 +265,7 @@ class DoctrineMongoDBExtension extends Extension
     protected function loadDocumentManagerMetadataCacheDriver(array $documentManager, ContainerBuilder $container)
     {
         $metadataCacheDriver = $container->getParameter('doctrine.odm.mongodb.metadata_cache_driver');
-        $dmMetadataCacheDriver = isset($documentManager['metadata_cache_driver']) ? $documentManager['metadata_cache_driver'] : $metadataCacheDriver;
+        $dmMetadataCacheDriver = isset($documentManager['metadata-cache-driver']) ? $documentManager['metadata-cache-driver'] : (isset($documentManager['metadata_cache_driver']) ? $documentManager['metadata_cache_driver'] : $metadataCacheDriver);
         $type = is_array($dmMetadataCacheDriver) && isset($dmMetadataCacheDriver['type']) ? $dmMetadataCacheDriver['type'] : $dmMetadataCacheDriver;
 
         if ($type === 'memcache') {
@@ -258,7 +273,7 @@ class DoctrineMongoDBExtension extends Extension
             $cacheDef = new Definition($memcacheClass);
             $memcacheHost = isset($dmMetadataCacheDriver['host']) ? $dmMetadataCacheDriver['host'] : '%doctrine.odm.mongodb.cache.memcache_host%';
             $memcachePort = isset($dmMetadataCacheDriver['port']) ? $dmMetadataCacheDriver['port'] : '%doctrine.odm.mongodb.cache.memcache_port%';
-            $memcacheInstanceClass = isset($dmMetadataCacheDriver['instance_class']) ? $dmMetadataCacheDriver['instance_class'] : '%doctrine.odm.mongodb.cache.memcache_instance_class%';
+            $memcacheInstanceClass = isset($dmMetadataCacheDriver['instance-class']) ? $dmMetadataCacheDriver['instance-class'] : (isset($dmMetadataCacheDriver['instance_class']) ? $dmMetadataCacheDriver['instance_class'] : '%doctrine.odm.mongodb.cache.memcache_instance_class%');
             $memcacheInstance = new Definition($memcacheInstanceClass);
             $memcacheInstance->addMethodCall('connect', array($memcacheHost, $memcachePort));
             $container->setDefinition(sprintf('doctrine.odm.mongodb.%s_memcache_instance', $documentManager['name']), $memcacheInstance);

src/Symfony/Bundle/DoctrineMongoDBBundle/Resources/config/schema/mongodb-1.0.xsd

@@ -11,8 +11,8 @@
     <xsd:attribute name="host" type="xsd:string" />
     <xsd:attribute name="port" type="xsd:integer" />
     <xsd:attribute name="database" type="xsd:string" />
-    <xsd:attribute name="proxy_dir" type="xsd:string" />
-    <xsd:attribute name="auto_generate_proxy_classes" type="xsd:boolean" />
+    <xsd:attribute name="proxy-dir" type="xsd:string" />
+    <xsd:attribute name="auto-generate-proxy-classes" type="xsd:boolean" />
     <xsd:attribute name="cache" type="cache" />
     <xsd:attribute name="metadata" type="metadata" />
   </xsd:complexType>

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_multiple_connections.xml

@@ -7,11 +7,11 @@
                         http://www.symfony-project.org/schema/dic/doctrine/odm/mongodb http://www.symfony-project.org/schema/dic/doctrine/odm/mongodb/mongodb-1.0.xsd">
 
     <doctrine:mongodb
-            metadata_cache_driver="apc"
-            default_document_manager="dm2"
-            default_connection="conn1"
-            proxy_namespace="Proxies"
-            auto_generate_proxy_classes="true"
+            metadata-cache-driver="apc"
+            default-document-manager="dm2"
+            default-connection="conn1"
+            proxy-namespace="Proxies"
+            auto-generate-proxy-classes="true"
         >
         <doctrine:connections>
             <doctrine:connection id="conn1" server="mongodb://localhost:27017">
@@ -25,9 +25,9 @@
                 </options>
             </doctrine:connection>
         </doctrine:connections>
-        <doctrine:document_managers>
-            <doctrine:document_manager id="dm1" metadata_cache_driver="xcache" connection="conn1" />
-            <doctrine:document_manager id="dm2" connection="conn2" />
-        </doctrine:document_managers>
+        <doctrine:document-managers>
+            <doctrine:document-manager id="dm1" metadata-cache-driver="xcache" connection="conn1" />
+            <doctrine:document-manager id="dm2" connection="conn2" />
+        </doctrine:document-managers>
     </doctrine:mongodb>
 </container>

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_simple_single_connection.xml

@@ -7,12 +7,12 @@
                         http://www.symfony-project.org/schema/dic/doctrine/odm/mongodb http://www.symfony-project.org/schema/dic/doctrine/odm/mongodb/mongodb-1.0.xsd">
 
     <doctrine:mongodb server="mongodb://localhost:27017" default_database="mydb">
-        <metadata_cache_driver type="memcache">
+        <metadata-cache-driver type="memcache">
             <class>Doctrine\Common\Cache\MemcacheCache</class>
             <host>localhost</host>
             <port>11211</port>
-            <instance_class>Memcache</instance_class>
-        </metadata_cache_driver>
+            <instance-class>Memcache</instance-class>
+        </metadata-cache-driver>
         <options>
             <connect>true</connect>
         </options>

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_single_connection.xml

@@ -14,15 +14,15 @@
                 </options>
             </doctrine:connection>
         </doctrine:connections>
-        <doctrine:document_managers>
-            <doctrine:document_manager id="default" connection="default">
-                <metadata_cache_driver type="memcache">
+        <doctrine:document-managers>
+            <doctrine:document-manager id="default" connection="default">
+                <metadata-cache-driver type="memcache">
                     <class>Doctrine\Common\Cache\MemcacheCache</class>
                     <host>localhost</host>
                     <port>11211</port>
-                    <instance_class>Memcache</instance_class>
-                </metadata_cache_driver>
-            </doctrine:document_manager>
-        </doctrine:document_managers>
+                    <instance-class>Memcache</instance-class>
+                </metadata-cache-driver>
+            </doctrine:document-manager>
+        </doctrine:document-managers>
     </doctrine:mongodb>
 </container>

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/odm_imports.xml

@@ -11,7 +11,7 @@
     </imports>
 
     <doctrine:mongodb
-        auto_generate_proxy_classes="true"
+        auto-generate-proxy-classes="true"
     >
     </doctrine:mongodb>
 </container>

src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/odm_imports_import.xml

@@ -7,8 +7,8 @@
                         http://www.symfony-project.org/schema/dic/doctrine/odm/mongodb http://www.symfony-project.org/schema/dic/doctrine/odm/mongodb/mongodb-1.0.xsd">
 
     <doctrine:mongodb
-        auto_generate_proxy_classes="false"
-        metadata_cache_driver="apc"
+        auto-generate-proxy-classes="false"
+        metadata-cache-driver="apc"
     >
     </doctrine:mongodb>
 </container>

src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -160,10 +160,18 @@ class FrameworkExtension extends Extension
             }
         }
 
+        if (array_key_exists('assets-version', $config)) {
+            $container->setParameter('templating.assets.version', $config['assets-version']);
+        }
+
         if (array_key_exists('assets_version', $config)) {
             $container->setParameter('templating.assets.version', $config['assets_version']);
         }
 
+        if (array_key_exists('assets-base-urls', $config)) {
+            $container->setParameter('templating.assets.base_urls', $config['assets-base-urls']);
+        }
+
         if (array_key_exists('assets_base_urls', $config)) {
             $container->setParameter('templating.assets.base_urls', $config['assets_base_urls']);
         }
@@ -324,6 +332,10 @@ class FrameworkExtension extends Extension
             $container->setParameter('session.class', $config['class']);
         }
 
+        if (isset($config['storage-id'])) {
+            $config['storage_id'] = $config['storage-id'];
+        }
+
         if (isset($config['storage_id'])) {
             $container->setAlias('session.storage', 'session.storage.'.$config['storage_id']);
         } else {
@@ -331,10 +343,15 @@ class FrameworkExtension extends Extension
         }
 
         $options = $container->getParameter('session.storage.'.strtolower($config['storage_id']).'.options');
-        foreach (array('name', 'lifetime', 'path', 'domain', 'secure', 'httponly', 'cache_limiter', 'cache-limiter', 'pdo.db_table') as $name) {
+        foreach (array('name', 'lifetime', 'path', 'domain', 'secure', 'httponly', 'cache_limiter', 'pdo.db_table') as $name) {
             if (isset($config[$name])) {
                 $options[$name] = $config[$name];
             }
+
+            $nName = str_replace('_', '-', $name);
+            if (isset($config[$nName])) {
+                $options[$name] = $config[$nName];
+            }
         }
         $container->setParameter('session.storage.'.strtolower($config['storage_id']).'.options', $options);
 

src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

@@ -47,7 +47,7 @@
 
     <xsd:complexType name="session">
         <xsd:attribute name="class" type="xsd:string" />
-        <xsd:attribute name="storage_id" type="xsd:string" />
+        <xsd:attribute name="storage-id" type="xsd:string" />
         <xsd:attribute name="default-locale" type="xsd:string" />
         <xsd:attribute name="name" type="xsd:string" />
         <xsd:attribute name="lifetime" type="xsd:integer" />
@@ -57,7 +57,7 @@
         <xsd:attribute name="httponly" type="xsd:string" />
         <xsd:attribute name="cache-limiter" type="xsd:string" />
         <xsd:attribute name="auto-start" type="xsd:boolean" />
-        <xsd:attribute name="pdo.db_table" type="xsd:string" />
+        <xsd:attribute name="pdo.db-table" type="xsd:string" />
     </xsd:complexType>
 
     <xsd:complexType name="templating">
@@ -65,7 +65,8 @@
             <xsd:element name="loader" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
 
-        <xsd:attribute name="assets_version" type="xsd:string" />
+        <xsd:attribute name="assets-version" type="xsd:string" />
+        <xsd:attribute name="assets-base-urls" type="xsd:string" />
         <xsd:attribute name="path" type="xsd:string" />
         <xsd:attribute name="cache" type="xsd:string" />
     </xsd:complexType>

src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php

@@ -28,7 +28,7 @@ class SwiftMailerExtension extends Extension
      *
      * Usage example:
      *
-     *      <swiftmailer:config transport="gmail" delivery_strategy="spool">
+     *      <swiftmailer:config transport="gmail">
      *        <swiftmailer:username>fabien</swift:username>
      *        <swiftmailer:password>xxxxx</swift:password>
      *        <swiftmailer:spool path="/path/to/spool/" />
@@ -91,11 +91,19 @@ class SwiftMailerExtension extends Extension
             }
         }
 
+        if (array_key_exists('delivery-address', $config)) {
+            $config['delivery-address'] = $config['delivery_address'];
+        }
+
         if (isset($config['delivery_address'])) {
             $container->setParameter('swiftmailer.single_address', $config['delivery_address']);
             $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.redirecting')));
         }
 
+        if (array_key_exists('disable-delivery', $config)) {
+            $config['disable_delivery'] = $config['disable-delivery'];
+        }
+
         if (isset($config['disable_delivery']) && $config['disable_delivery']) {
             $container->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.blackhole')));
         }

src/Symfony/Bundle/SwiftmailerBundle/Resources/config/schema/swiftmailer-1.0.xsd

@@ -17,12 +17,11 @@
     <xsd:attribute name="host" type="xsd:string" />
     <xsd:attribute name="port" type="xsd:string" />
     <xsd:attribute name="encryption" type="encryption" />
-    <xsd:attribute name="auth_mode" type="auth_mode" />
+    <xsd:attribute name="auth-mode" type="auth_mode" />
     <xsd:attribute name="transport" type="xsd:string" />
     <xsd:attribute name="type" type="xsd:string" />
-    <xsd:attribute name="delivery_strategy" type="delivery_strategy" />
-    <xsd:attribute name="delivery_address" type="xsd:string" />
-    <xsd:attribute name="disable_delivery" type="xsd:boolean" />
+    <xsd:attribute name="delivery-address" type="xsd:string" />
+    <xsd:attribute name="disable-delivery" type="xsd:boolean" />
   </xsd:complexType>
 
   <xsd:complexType name="spool">
@@ -49,7 +48,7 @@
     <xsd:restriction base="xsd:string">
       <xsd:enumeration value="realtime" />
       <xsd:enumeration value="spool" />
-      <xsd:enumeration value="single_address" />
+      <xsd:enumeration value="single-address" />
       <xsd:enumeration value="none" />
     </xsd:restriction>
   </xsd:simpleType>