Merge branch '3.1.x'
This commit is contained in:
commit
133f71b88a
|
@ -487,9 +487,10 @@ class FOSElasticaExtension extends Extension
|
||||||
'indexName' => $indexName,
|
'indexName' => $indexName,
|
||||||
'typeName' => $typeName,
|
'typeName' => $typeName,
|
||||||
));
|
));
|
||||||
if ($typeConfig['listener']['logger']) {
|
$listenerDef->replaceArgument(3, $typeConfig['listener']['logger'] ?
|
||||||
$listenerDef->replaceArgument(3, new Reference($typeConfig['listener']['logger']));
|
new Reference($typeConfig['listener']['logger']) :
|
||||||
}
|
null
|
||||||
|
);
|
||||||
|
|
||||||
$tagName = null;
|
$tagName = null;
|
||||||
switch ($typeConfig['driver']) {
|
switch ($typeConfig['driver']) {
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
<argument /> <!-- object persister -->
|
<argument /> <!-- object persister -->
|
||||||
<argument type="service" id="fos_elastica.indexable" />
|
<argument type="service" id="fos_elastica.indexable" />
|
||||||
<argument type="collection" /> <!-- configuration -->
|
<argument type="collection" /> <!-- configuration -->
|
||||||
<argument /> <!-- logger -->
|
<argument>null</argument> <!-- logger -->
|
||||||
</service>
|
</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">
|
<service id="fos_elastica.elastica_to_model_transformer.prototype.mongodb" class="%fos_elastica.elastica_to_model_transformer.prototype.mongodb.class%" public="false" abstract="true">
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
<argument /> <!-- object persister -->
|
<argument /> <!-- object persister -->
|
||||||
<argument type="service" id="fos_elastica.indexable" />
|
<argument type="service" id="fos_elastica.indexable" />
|
||||||
<argument type="collection" /> <!-- configuration -->
|
<argument type="collection" /> <!-- configuration -->
|
||||||
<argument on-invalid="ignore" /> <!-- logger -->
|
<argument>null</argument> <!-- logger -->
|
||||||
</service>
|
</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">
|
<service id="fos_elastica.elastica_to_model_transformer.prototype.orm" class="%fos_elastica.elastica_to_model_transformer.prototype.orm.class%" public="false" abstract="true">
|
||||||
|
|
|
@ -19,7 +19,7 @@ class AbstractProviderTest extends \PHPUnit_Framework_TestCase
|
||||||
{
|
{
|
||||||
$this->objectClass = 'objectClass';
|
$this->objectClass = 'objectClass';
|
||||||
$this->options = array('debug_logging' => true, 'indexName' => 'index', 'typeName' => 'type');
|
$this->options = array('debug_logging' => true, 'indexName' => 'index', 'typeName' => 'type');
|
||||||
<
|
|
||||||
$this->objectPersister = $this->getMockObjectPersister();
|
$this->objectPersister = $this->getMockObjectPersister();
|
||||||
$this->managerRegistry = $this->getMockManagerRegistry();
|
$this->managerRegistry = $this->getMockManagerRegistry();
|
||||||
$this->objectManager = $this->getMockObjectManager();
|
$this->objectManager = $this->getMockObjectManager();
|
||||||
|
|
Loading…
Reference in a new issue