Merge branch 'develop' into feature/nextgen

Conflicts:
	library/Solarium/Client.php
	tests/Solarium/ClientTest.php

library/Solarium/Core/Client/Client.php

@@ -224,7 +224,7 @@ class Client extends Configurable
         foreach ($this->options as $name => $value) {
             switch ($name) {
                 case 'endpoint':
-                    $this->addEndpoints($value);
+                    $this->setEndpoints($value);
                     break;
                 case 'querytype':
                     $this->registerQueryTypes($value);
@@ -452,7 +452,7 @@ class Client extends Configurable
             return $this->setOption('adapter', $adapter);
         } elseif ($adapter instanceof AdapterInterface) {
             // forward options
-            $adapter->setOptions($this->options);
+            $adapter->setOptions($this->getOption('adapteroptions'));
             // overwrite existing adapter
             $this->adapter = $adapter;
 

tests/Solarium/Tests/Core/Client/ClientTest.php

@@ -381,6 +381,23 @@ class ClientTest extends \PHPUnit_Framework_TestCase
         $this->client->getAdapter();
     }
 
+    public function testSetAdapterWithOptions()
+    {
+        $adapterOptions = array(
+            'host' => 'myhost',
+            'port' => 8080,
+            'customOption' => 'foobar'
+        );
+
+        $observer = $this->getMock('Solarium\Core\Client\Adapter\Http', array('setOptions', 'execute'));
+        $observer->expects($this->once())
+                 ->method('setOptions')
+                 ->with($this->equalTo($adapterOptions));
+
+        $this->client->setOptions(array('adapteroptions' => $adapterOptions));
+        $this->client->setAdapter($observer);
+    }
+
     public function testRegisterQueryTypeAndGetQueryTypes()
     {
         $queryTypes = $this->client->getQueryTypes();