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

Fix issues with CS merge

Browse source
This commit is contained in:
Tim Nagel 2015-03-12 22:41:48 +11:00
parent 89db88c2a0
commit 4e087af50d
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
DependencyInjection/FOSElasticaExtension.php
View file

@ -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']) {

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

2
Tests/Doctrine/AbstractProviderTest.php
View file

@ -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();