Merge pull request sensiolabs#5 from odolbeau/add-proxy-in-config

Add "proxy" config key
musicglue · Nov 4, 2013 · d430dbd · d430dbd
2 parents 02ba894 + 257e492
commit d430dbd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/DependencyInjection/BuzzExtension.php b/DependencyInjection/BuzzExtension.php
@@ -112,6 +112,11 @@ private function configureClientBrowser($name, Definition $browser, array $confi
             $definition->addMethodCall('setTimeout', array($timeout));
         }
 
+        $proxy = $config['client']['proxy'];
+        if (null !== $proxy) {
+            $definition->addMethodCall('setProxy', array($proxy));
+        }
+
         $browser->replaceArgument(0, new Reference('buzz.client.'.$name));
     }
 

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -83,6 +83,7 @@ private function getClientConfiguration()
             ->children()
                 ->scalarNode('name')->end()
                 ->scalarNode('timeout')->defaultNull()->end()
+                ->scalarNode('proxy')->defaultNull()->end()
             ->end()
         ;
     }

diff --git a/Tests/DependencyInjection/BuzzExtensionTest.php b/Tests/DependencyInjection/BuzzExtensionTest.php
@@ -50,9 +50,11 @@ public function testLoadClient()
         $this->assertEquals('Buzz\Client\Curl', get_class($curlClient));
 
         $calls = $client->getMethodCalls();
-        $this->assertCount(1, $calls);
+        $this->assertCount(2, $calls);
         $expected = array('setTimeout', array(123));
         $this->assertEquals($expected, $calls[0]);
+        $expected = array('setProxy', array('http://127.0.0.1'));
+        $this->assertEquals($expected, $calls[1]);
 
         $client = new Reference('buzz.client.foo');
         $this->assertEquals($client, $browser->getArgument(0));
@@ -118,7 +120,7 @@ public function testBcBreakClient()
         $array = array(array('browsers' => array('foo' => array('client' => 'curl'))));
         $this->configs = $extension->load($array, $this->container);
 
-        $this->assertSame(array('name' => 'curl', 'timeout' => null), $this->configs['browsers']['foo']['client']);
+        $this->assertSame(array('name' => 'curl', 'timeout' => null, 'proxy' => null), $this->configs['browsers']['foo']['client']);
     }
 
     private function getConfig()
@@ -130,7 +132,7 @@ private function getConfig()
                 ),
                 'browsers' => array(
                     'foo' => array(
-                        'client' => array('name' => 'curl', 'timeout' => 123),
+                        'client' => array('name' => 'curl', 'timeout' => 123, 'proxy' => 'http://127.0.0.1'),
                         'message_factory' => 'Buzz\\Message\\Factory\\Factory',
                         'host' => 'my://foo',
                         'listeners' => array(