Don't overwrite CURLOPT_HTTPHEADER option on WebClient if set

Author: vaites

src/Clients/WebClient.php

@@ -54,6 +54,7 @@ class WebClient extends Client
     protected $options =
     [
         CURLINFO_HEADER_OUT    => true,
+        CURLOPT_HTTPHEADER     => [],
         CURLOPT_PUT            => true,
         CURLOPT_RETURNTRANSFER => true,
         CURLOPT_TIMEOUT        => 5,
@@ -213,7 +214,10 @@ public function request($type, $file = null)
         $options = $this->getCurlOptions($type, $file);
 
         // sets headers
-        $options[CURLOPT_HTTPHEADER] = $headers;
+        foreach($headers as $header)
+        {
+            $options[CURLOPT_HTTPHEADER][] = $header;
+        }
 
         // cURL init and options
         $options[CURLOPT_URL] = "http://{$this->host}:{$this->port}" . "/$resource";

tests/BaseTest.php

@@ -216,7 +216,7 @@ public function testDocumentMainText($file)
 
         if($client::MODE == 'web' && version_compare(self::$version, '1.15') < 0)
         {
-            $this->markTestSkipped('Apache Tika ' . self::$version . 'lacks main content extraction');
+            $this->markTestSkipped('Apache Tika ' . self::$version . ' lacks main content extraction');
         }
         else
         {
@@ -344,7 +344,7 @@ public function testMainTextCallback($file)
 
         if($client::MODE == 'web' && version_compare(self::$version, '1.15') < 0)
         {
-            $this->markTestSkipped('Apache Tika ' . self::$version . 'lacks main content extraction');
+            $this->markTestSkipped('Apache Tika ' . self::$version . ' lacks main content extraction');
         }
         else
         {

tests/WebTest.php

@@ -30,6 +30,19 @@ public function testCurlOptions()
         $this->assertEquals(3, $options[CURLOPT_TIMEOUT]);
     }
 
+    /**
+     * cURL headers test
+     */
+    public function testCurlHeaders()
+    {
+        $header = 'Content-Type: image/jpeg';
+
+        $client = Client::make('localhost', 9998, [CURLOPT_HTTPHEADER => [$header]]);
+        $options = $client->getOptions();
+
+        $this->assertContains($header, $options[CURLOPT_HTTPHEADER]);
+    }
+
     /**
      * Set host test
      */