From 156b6e37bbc74daee779cbb3367fb43933ca26d7 Mon Sep 17 00:00:00 2001
From: Anthon Pang <apang@softwaredevelopment.ca>
Date: Fri, 28 Sep 2012 22:32:22 -0400
Subject: [PATCH] partial revert 37dfaec to not set default (as it is
 browser-specific); define the other Proxy JSON options (previously supported
 implicitly via useAttributeAsKey); use validation rule to fix #37

---
 src/Behat/MinkExtension/Extension.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Behat/MinkExtension/Extension.php b/src/Behat/MinkExtension/Extension.php
index 918175c..8edcf4d 100644
--- a/src/Behat/MinkExtension/Extension.php
+++ b/src/Behat/MinkExtension/Extension.php
@@ -245,9 +245,17 @@ class Extension implements ExtensionInterface
                                 booleanNode('nativeEvents')->end()->
                                 arrayNode('proxy')->
                                     children()->
-                                        scalarNode('proxyType')->
-                                            defaultValue(isset($config['selenium2']['capabilities']['proxy']['proxyType']) ? $config['selenium2']['capabilities']['proxy']['proxyType'] : 'system')->
-                                        end()->
+                                        scalarNode('proxyType')->end()->
+                                        scalarNode('proxyAuthconfigUrl')->end()->
+                                        scalarNode('ftpProxy')->end()->
+                                        scalarNode('httpProxy')->end()->
+                                        scalarNode('sslProxy')->end()->
+                                    end()->
+                                    validate()->
+                                        ifTrue(function ($v) {
+                                            return empty($v);
+                                        })->
+                                        thenUnset()->
                                     end()->
                                 end()->
                                 arrayNode('chrome')->