From 418b9d72cec839d1b5f2dcb73cbd83bdd276bdbe Mon Sep 17 00:00:00 2001
From: tgallice <tmgallice@gmail.com>
Date: Tue, 4 Mar 2014 17:54:49 +0100
Subject: [PATCH] Rework configuration validation to fix #461

---
 DependencyInjection/Configuration.php          |  4 ++--
 .../DependencyInjection/ConfigurationTest.php  | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 107744d..4488bf2 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -103,8 +103,8 @@ class Configuration implements ConfigurationInterface
                                     ->children()
                                         ->scalarNode('url')
                                             ->validate()
-                                                ->ifTrue(function($v) { return substr($v['url'], -1) !== '/'; })
-                                                ->then(function($v) { return $v['url'].'/'; })
+                                                ->ifTrue(function($url) { return substr($url, -1) !== '/'; })
+                                                ->then(function($url) { return $url.'/'; })
                                             ->end()
                                         ->end()
                                         ->scalarNode('host')->end()
diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
index 35b2af3..0f0d374 100644
--- a/Tests/DependencyInjection/ConfigurationTest.php
+++ b/Tests/DependencyInjection/ConfigurationTest.php
@@ -3,6 +3,7 @@
 namespace FOS\ElasticaBundle\Tests\Resetter\DependencyInjection;
 
 use FOS\ElasticaBundle\DependencyInjection\Configuration;
+use Symfony\Component\Config\Definition\Processor;
 
 /**
  * ConfigurationTest
@@ -85,4 +86,21 @@ class ConfigurationTest extends \PHPUnit_Framework_TestCase
         $this->assertInstanceOf('Symfony\Component\Config\Definition\ScalarNode', $mapping['index']);
         $this->assertNull($mapping['index']->getDefaultValue());
     }
+
+    public function testSlashIsAddedAtTheEndOfServerUrl()
+    {
+        $config = array(
+            'clients' => array(
+                'default' => array(
+                    'url' => 'http://www.github.com',
+                ),
+            ),
+        ); 
+        
+        $processor = new Processor();
+
+        $configuration = $processor->processConfiguration($this->configuration, array($config));
+
+        $this->assertEquals('http://www.github.com/', $configuration['clients']['default']['servers'][0]['url']);
+    }
 }