Skip to content
Browse files

Small fix for configs.

  • Loading branch information...
1 parent ee956e9 commit 1e761907f7cd3bb344c39e3198fb3ea5c80bb339 @golovanov committed Jul 19, 2011
Showing with 8 additions and 5 deletions.
  1. +3 −3 DependencyInjection/DoctrineOXMExtension.php
  2. +5 −2 Resources/config/oxm.xml
View
6 DependencyInjection/DoctrineOXMExtension.php
@@ -116,7 +116,7 @@ protected function loadXmlEntityManager(array $xmlEntityManager, $defaultXEM, $d
'setProxyDir' => '%doctrine.oxm.proxy_dir%',
'setProxyNamespace' => '%doctrine.oxm.proxy_namespace%',
'setAutoGenerateProxyClasses' => '%doctrine.oxm.auto_generate_proxy_classes%',
- 'setDefaultStorage' => $defaultDatabase,
+ 'setDefaultStorage' => $defaultStorage,
);
// if ($xmlEntityManager['logging']) {
@@ -141,7 +141,7 @@ protected function loadXmlEntityManager(array $xmlEntityManager, $defaultXEM, $d
}
$oxmXemArgs = array(
- new Reference(sprintf('doctrine.oxm.%s_connection', isset($xmlEntityManager['storage']) ? $xmlEntityManager['storage'] : $xmlEntityManager['name'])),
+ new Reference(sprintf('doctrine.oxm.%s_storage', isset($xmlEntityManager['storage']) ? $xmlEntityManager['storage'] : $xmlEntityManager['name'])),
new Reference(sprintf('doctrine.oxm.%s_configuration', $xmlEntityManager['name'])),
new Reference($eventManagerId),
);
@@ -246,7 +246,7 @@ protected function loadStorages(array $storages, ContainerBuilder $container)
* @param Definition A Definition instance
* @param ContainerBuilder $container A ContainerBuilder instance
*/
- protected function loadDocumentManagerBundlesMappingInformation(array $xmlEntityManager, Definition $oxmConfigDef, ContainerBuilder $container)
+ protected function loadXmlEntityManagerBundlesMappingInformation(array $xmlEntityManager, Definition $oxmConfigDef, ContainerBuilder $container)
{
// reset state of drivers and alias map. They are only used by this methods and children.
$this->drivers = array();
View
7 Resources/config/oxm.xml
@@ -5,6 +5,9 @@
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
<parameters>
+ <parameter key="doctrine.oxm.storage.class">Doctrine\OXM\Storage\FileSystemStorage</parameter>
+ <parameter key="doctrine.oxm.configuration.class">Doctrine\OXM\Configuration</parameter>
+ <parameter key="doctrine.oxm.xml_entity_manager.class">Doctrine\OXM\XmlEntityManager</parameter>
<parameter key="doctrine.oxm.event_manager.class">Doctrine\Common\EventManager</parameter>
<!-- proxies -->
@@ -31,7 +34,7 @@
<parameter key="doctrine.oxm.mapping_dirs" type="collection"></parameter>
<parameter key="doctrine.oxm.xml_mapping_dirs">%doctrine.oxm.mapping_dirs%</parameter>
<parameter key="doctrine.oxm.yml_mapping_dirs">%doctrine.oxm.mapping_dirs%</parameter>
- <parameter key="doctrine.oxm.document_dirs" type="collection"></parameter>
+ <parameter key="doctrine.oxm.xml_entity_dirs" type="collection"></parameter>
</parameters>
@@ -44,7 +47,7 @@
<service id="doctrine.oxm.metadata.chain" class="%doctrine.oxm.metadata.driver_chain.class%" />
<service id="doctrine.oxm.metadata.annotation" class="%doctrine.oxm.metadata.annotation.class%">
<argument type="service" id="doctrine.oxm.metadata.annotation_reader" />
- <argument>%doctrine.oxm.document_dirs%</argument>
+ <argument>%doctrine.oxm.xml_entity_dirs%</argument>
</service>
<service id="doctrine.oxm.metadata.annotation_reader" alias="annotation_reader" />
<service id="doctrine.oxm.metadata.xml" class="%doctrine.oxm.metadata.xml.class%">

0 comments on commit 1e76190

Please sign in to comment.
Something went wrong with that request. Please try again.