From e1bbb87cfe011c0277a03e9ad66cdde2e521d86b Mon Sep 17 00:00:00 2001
From: Milan Magudia <milan@magudia.com>
Date: Fri, 16 May 2014 16:24:37 +0100
Subject: [PATCH] Fix for Issue #543 Client has a dependency on a non-existent
 service "%kernel.debug%"

---
 DependencyInjection/Configuration.php           | 7 +++++--
 DependencyInjection/FOSElasticaExtension.php    | 2 +-
 Tests/DependencyInjection/ConfigurationTest.php | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 3c57558..fbdba94 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -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()
diff --git a/DependencyInjection/FOSElasticaExtension.php b/DependencyInjection/FOSElasticaExtension.php
index 7d754f1..f58cd5b 100644
--- a/DependencyInjection/FOSElasticaExtension.php
+++ b/DependencyInjection/FOSElasticaExtension.php
@@ -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'));
     }
 
     /**
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
index 08ada08..38ffc58 100644
--- a/Tests/DependencyInjection/ConfigurationTest.php
+++ b/Tests/DependencyInjection/ConfigurationTest.php
@@ -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']);