Fix issues with CS merge

Author: merk

DependencyInjection/FOSElasticaExtension.php

@@ -487,9 +487,10 @@ private function loadTypeListener(array $typeConfig, ContainerBuilder $container
             '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']) {

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">

Tests/Doctrine/AbstractProviderTest.php

@@ -19,7 +19,7 @@ public function setUp()
     {
         $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();