Merge pull request #14 from curzio-della-santa/fix/factory-default-an…

…d-headers-setup
detailnet · Nov 3, 2015 · f59a433 · f59a433
2 parents 1a0defb + 719734a
commit f59a433
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Denner/Client/DennerClient.php b/src/Denner/Client/DennerClient.php
@@ -34,6 +34,11 @@ public static function factory($options = array())
             ),
         );
 
+        // If default options present, do a union with our $defaultOptions['defaults']
+        if (array_key_exists('defaults', $options)) {
+            $options['defaults'] += $defaultOptions['defaults'];
+        }
+
 //        $requiredOptions = array();
 //
 //        foreach ($requiredOptions as $optionName) {
@@ -60,7 +65,10 @@ public static function factory($options = array())
         }
 
         $httpClient = new HttpClient($config->toArray());
-        $httpClient->setDefaultOption('headers', $headers);
+        $httpClient->setDefaultOption(
+            'headers',
+            array_merge($httpClient->getDefaultOption('headers') ?: array(), $headers)
+        );
         $httpClient->getEmitter()->attach(new Subscriber\ErrorHandler());
 
         $serviceDescriptionFile = __DIR__ . sprintf('/ServiceDescription/%s.php', self::getServiceDescriptionName());