Optimizing if statement when creating client requests

Guzzle3 · Feb 24, 2013 · 62e31f3 · 62e31f3
1 parent eb0d87f
commit 62e31f3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Client.php b/Client.php
@@ -258,10 +258,10 @@ public function createRequest($method = RequestInterface::GET, $uri = null, $hea
         // If default headers are provided, then merge them into existing headers
         // If a collision occurs, the header is completely replaced
         if (count($this->defaultHeaders)) {
-            if ($headers instanceof Collection) {
+            if (is_array($headers)) {
+                $headers = array_merge($this->defaultHeaders->getAll(), $headers);
+            } elseif ($headers instanceof Collection) {
                 $headers = array_merge($this->defaultHeaders->getAll(), $headers->getAll());
-            } elseif (is_array($headers)) {
-                 $headers = array_merge($this->defaultHeaders->getAll(), $headers);
             } else {
                 $headers = $this->defaultHeaders;
             }