Wrap up header support for now

humbug · Mar 8, 2015 · 7841b65 · 7841b65
1 parent bc2c025
commit 7841b65
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/Humbug/FileGetContents.php b/src/Humbug/FileGetContents.php
@@ -70,7 +70,14 @@ public static function setHttpHeaders($context)
         $headers = self::getNextRequestHeaders();
         if (!empty($headers)) {
             $options = stream_context_get_options($context);
-            $headers = empty($options) ? $headers : array_merge($options['http']['headers'], $headers);
+            if (!isset($options['http'])) {
+                $options['http'] = array('header'=>array());
+            } elseif (!isset($options['http']['header'])) {
+                $options['http']['header'] = array();
+            } elseif (is_string($options['http']['header'])) {
+                $options['http']['header'] = explode("\r\n", $options['http']['header']);
+            }
+            $headers = empty($options['http']['headers']) ? $headers : array_merge($options['http']['headers'], $headers);
             stream_context_set_option(
                 $context,
                 'http',

diff --git a/src/function.php b/src/function.php
@@ -51,7 +51,7 @@ function humbug_get_headers() {
 
 if (!function_exists('humbug_set_headers')) {
 
-    function humbug_set_headers($headers) {
+    function humbug_set_headers(array $headers) {
         return FileGetContents::setNextRequestHeaders($headers);
     }
 

diff --git a/tests/Humbug/Test/FunctionTest.php b/tests/Humbug/Test/FunctionTest.php
@@ -76,5 +76,16 @@ public function testCanGetResponseHeaders()
         humbug_get_contents('http://padraic.github.io');
         $this->assertTrue(count(humbug_get_headers()) > 0);
     }
+
+    public function testCanSetRequestHeaders()
+    {
+        humbug_set_headers(array(
+            'Accept-Language: da',
+            'User-Agent: Humbug'
+        ));
+        $out = humbug_get_contents('http://myhttp.info/');
+        $this->assertEquals(1, preg_match('%'.preg_quote('<td>Accept language</td><td>da</td>').'%', $out));
+        $this->assertEquals(1, preg_match('%'.preg_quote('<td>User agent</td><td>Humbug</td>').'%', $out));
+    }
 
 }