From 4e087af50d1002d0a8206d866ba1a74373190adb Mon Sep 17 00:00:00 2001
From: Tim Nagel <tim@nagel.com.au>
Date: Thu, 12 Mar 2015 22:41:48 +1100
Subject: [PATCH 1/2] Fix issues with CS merge

---
 DependencyInjection/FOSElasticaExtension.php | 7 ++++---
 Resources/config/orm.xml                     | 2 +-
 Tests/Doctrine/AbstractProviderTest.php      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/DependencyInjection/FOSElasticaExtension.php b/DependencyInjection/FOSElasticaExtension.php
index f127470..b26e50c 100644
--- a/DependencyInjection/FOSElasticaExtension.php
+++ b/DependencyInjection/FOSElasticaExtension.php
@@ -487,9 +487,10 @@ class FOSElasticaExtension extends Extension
             'indexName' => $indexName,
             'typeName' => $typeName,
         ));
-        if ($typeConfig['listener']['logger']) {
-            $listenerDef->replaceArgument(3, new Reference($typeConfig['listener']['logger']));
-        }
+        $listenerDef->replaceArgument(3, $typeConfig['listener']['logger'] ?
+            new Reference($typeConfig['listener']['logger']) :
+            null
+        );
 
         $tagName = null;
         switch ($typeConfig['driver']) {
diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
index 4172500..8127db2 100644
--- a/Resources/config/orm.xml
+++ b/Resources/config/orm.xml
@@ -29,7 +29,7 @@
             <argument /> <!-- object persister -->
             <argument type="service" id="fos_elastica.indexable" />
             <argument type="collection" /> <!-- configuration -->
-            <argument on-invalid="ignore" /> <!-- logger -->
+            <argument on-invalid="null" /> <!-- 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">
diff --git a/Tests/Doctrine/AbstractProviderTest.php b/Tests/Doctrine/AbstractProviderTest.php
index cd4c63f..24e3d15 100644
--- a/Tests/Doctrine/AbstractProviderTest.php
+++ b/Tests/Doctrine/AbstractProviderTest.php
@@ -19,7 +19,7 @@ class AbstractProviderTest extends \PHPUnit_Framework_TestCase
     {
         $this->objectClass = 'objectClass';
         $this->options = array('debug_logging' => true, 'indexName' => 'index', 'typeName' => 'type');
-<
+
         $this->objectPersister = $this->getMockObjectPersister();
         $this->managerRegistry = $this->getMockManagerRegistry();
         $this->objectManager = $this->getMockObjectManager();

From f72c51503a53712fb752396e069973391f117b7b Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Thu, 12 Mar 2015 17:44:57 +0100
Subject: [PATCH 2/2] Fix the service definitions when the logger is not set in
 listener

The empty tag is parsed to an empty string, not to null. And this is not
a valid value for the service
---
 Resources/config/mongodb.xml | 2 +-
 Resources/config/orm.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/config/mongodb.xml b/Resources/config/mongodb.xml
index 8e15533..398a0ca 100644
--- a/Resources/config/mongodb.xml
+++ b/Resources/config/mongodb.xml
@@ -26,7 +26,7 @@
             <argument type="collection" /> <!-- events -->
             <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">
diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
index d78ae8d..554bd3e 100644
--- a/Resources/config/orm.xml
+++ b/Resources/config/orm.xml
@@ -25,7 +25,7 @@
             <argument type="collection" /> <!-- events -->
             <argument type="service" id="fos_elastica.indexable" />
             <argument type="collection" /> <!-- configuration -->
-            <argument on-invalid="ignore" /> <!-- 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">