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

Fix for Issue #543 Client has a dependency on a non-existent service "%kernel.debug%"

Browse source
This commit is contained in:
Milan Magudia 2014-05-16 16:24:37 +01:00
parent 6748c9c623
commit e1bbb87cfe
3 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
DependencyInjection/Configuration.php
View file

@ -16,10 +16,13 @@ class Configuration implements ConfigurationInterface
private $supportedDrivers = array('orm', 'mongodb', 'propel');
private $configArray = array();
private $debug;
public function __construct($configArray)
public function __construct($configArray, $debug)
{
$this->configArray = $configArray;
$this->debug = $debug;
}
/**
@ -121,7 +124,7 @@ class Configuration implements ConfigurationInterface
->scalarNode('host')->end()
->scalarNode('port')->end()
->scalarNode('logger')
->defaultValue('%kernel.debug%')
->defaultValue(($this->debug) ? 'fos_elastica.logger' : false)
->treatNullLike('fos_elastica.logger')
->treatTrueLike('fos_elastica.logger')
->end()

2
DependencyInjection/FOSElasticaExtension.php
View file

@ -61,7 +61,7 @@ class FOSElasticaExtension extends Extension
public function getConfiguration(array $config, ContainerBuilder $container)
{
return new Configuration($config);
return new Configuration($config, $container->getParameter('kernel.debug'));
}
/**

6
Tests/DependencyInjection/ConfigurationTest.php
View file

@ -17,7 +17,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
public function setUp()
{
$this->configuration = new Configuration(array());
$this->configuration = new Configuration(array(), false);
}
public function testEmptyConfigContainsFormatMappingOptionNode()
@ -140,7 +140,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$processor = new Processor();
$configuration = $processor->processConfiguration(new Configuration(array($config)), array($config));
$configuration = $processor->processConfiguration(new Configuration(array($config), false), array($config));
$this->assertArrayNotHasKey('fields', $configuration['indexes']['test']['types']['test']['mappings']['content']);
$this->assertArrayHasKey('fields', $configuration['indexes']['test']['types']['test']['mappings']['title']);
@ -192,7 +192,7 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
$processor = new Processor();
$configuration = $processor->processConfiguration(new Configuration(array($config)), array($config));
$configuration = $processor->processConfiguration(new Configuration(array($config), false), array($config));
$mapping = $configuration['indexes']['test']['types']['test']['mappings'];
$this->assertArrayNotHasKey('properties', $mapping['content']);