deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch '3.0.x' into 3.1.x

Browse source 
Conflicts:
	Resources/config/orm.xml
This commit is contained in:
Christophe Coevoet 2015-03-12 17:49:25 +01:00
parent 4e087af50d f72c51503a
commit c013ed9657
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Resources/config/mongodb.xml
View file

@ -29,7 +29,7 @@
<argument /> <!-- object persister -->
<argument type="service" id="fos_elastica.indexable" />
<argument type="collection" /> <!-- configuration -->
<argument /> <!-- logger -->
<argument>null</argument> <!-- logger -->
</service>
<service id="fos_elastica.elastica_to_model_transformer.prototype.mongodb" class="%fos_elastica.elastica_to_model_transformer.prototype.mongodb.class%" public="false" abstract="true">

2
Resources/config/orm.xml
View file

@ -29,7 +29,7 @@
<argument /> <!-- object persister -->
<argument type="service" id="fos_elastica.indexable" />
<argument type="collection" /> <!-- configuration -->
<argument on-invalid="null" /> <!-- logger -->
<argument>null</argument> <!-- logger -->
</service>
<service id="fos_elastica.elastica_to_model_transformer.prototype.orm" class="%fos_elastica.elastica_to_model_transformer.prototype.orm.class%" public="false" abstract="true">