- bugfixes

library/Solarium/Client/Adapter/ZendHttp.php

@@ -71,11 +71,12 @@ class Solarium_Client_Adapter_ZendHttp extends Solarium_Client_Adapter
      * method, like Zend_Config
      *
      * @param array|object $options
+     * @param boolean $overwrite
      * @return Solarium_Client_Adapter_ZendHttp Provides fluent interface
      */
-    public function setOptions($options)
+    public function setOptions($options, $overwrite = false)
     {
-        parent::setOptions($options);
+        parent::setOptions($options, $overwrite);
 
         // forward options to zendHttp instance
         if (null !== $this->_zendHttp) {

tests/Solarium/Client/Adapter/ZendHttpTest.php

@@ -38,7 +38,7 @@ class Solarium_Client_Adapter_ZendHttpTest extends PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        if (!class_exists('Zend_Loader_Autoloader') && (include_once 'Zend/Loader/Autoloader.php') !== 'OK') {
+        if (!class_exists('Zend_Loader_Autoloader') && (@include_once 'Zend/Loader/Autoloader.php') !== 'OK') {
             $this->markTestSkipped('ZF not in include_path, skipping ZendHttp adapter tests');
         }