Merge branch 'hotfix/109' into develop

Forward port #109

Author: Xerkus

src/Client/Adapter/Proxy.php

@@ -31,19 +31,21 @@ class Proxy extends Socket
      * @var array
      */
     protected $config = [
+        'persistent'         => false,
         'ssltransport'       => 'ssl',
         'sslcert'            => null,
         'sslpassphrase'      => null,
         'sslverifypeer'      => true,
+        'sslcafile'          => null,
         'sslcapath'          => null,
         'sslallowselfsigned' => false,
         'sslusecontext'      => false,
+        'sslverifypeername'  => true,
         'proxy_host'         => '',
         'proxy_port'         => 8080,
         'proxy_user'         => '',
         'proxy_pass'         => '',
         'proxy_auth'         => Client::AUTH_BASIC,
-        'persistent'         => false
     ];
 
     /**

test/Client/ProxyAdapterTest.php

@@ -132,4 +132,19 @@ public function testProxyKeysCorrectlySetInProxyAdapter()
         $this->assertSame($this->host, $adapterHost);
         $this->assertSame($this->port, $adapterPort);
     }
+
+    public function testProxyHasAllSocketConfigs()
+    {
+        $socket = new \Zend\Http\Client\Adapter\Socket();
+        $socketConfig = $socket->getConfig();
+        $proxy = new \Zend\Http\Client\Adapter\Proxy();
+        $proxyConfig = $proxy->getConfig();
+        foreach (array_keys($socketConfig) as $socketConfigKey) {
+            $this->assertArrayHasKey(
+                $socketConfigKey,
+                $proxyConfig,
+                "Proxy adapter should have all the Socket configuration keys"
+            );
+        }
+    }
 }