Merge pull request #6 from thewulf7/hotfix/flight-fix

execute method fix for flight
thewulf7 · Dec 7, 2015 · af4dc70 · af4dc70
2 parents e15a0ec + 7d58ee2
commit af4dc70
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/travelPayouts/components/Client.php b/src/travelPayouts/components/Client.php
@@ -52,22 +52,28 @@ public function __construct($token)
     }
 
     /**
-     * @param        $url
-     * @param array  $options
-     * @param string $type
+     * @param string    $url
+     * @param array     $options
+     * @param string    $type
+     * @param bool|true $replaceOptions
      *
      * @return mixed
-     * @throws \RuntimeException
      */
-    public function execute($url, array $options, $type = 'GET')
+    public function execute($url, array $options, $type = 'GET', $replaceOptions = true)
     {
         $url    = '/' . $this->getApiVersion() . '/' . $url;
         $params = [
-            'http_errors' => false
+            'http_errors' => false,
         ];
 
-        $paramName          = $type === 'GET' ? 'query' : 'body';
-        $params[$paramName] = $options;
+        if ($replaceOptions)
+        {
+            $paramName          = $type === 'GET' ? 'query' : 'body';
+            $params[$paramName] = $options;
+        } else
+        {
+            $params += $options;
+        }
 
         /** @var \GuzzleHttp\Psr7\Request $res */
         $res = $this->getClient()->request($type, $url, $params);
@@ -77,7 +83,7 @@ public function execute($url, array $options, $type = 'GET')
 
         if ($statusCode !== 200)
         {
-            $strBody = json_decode((string)$body,true);
+            $strBody = json_decode((string)$body, true);
             throw new \RuntimeException("{$statusCode}:{$strBody['message']}");
         }
 

diff --git a/src/travelPayouts/services/Flight.php b/src/travelPayouts/services/Flight.php
@@ -71,7 +71,7 @@ public function search($locale = 'ru', $trip_class = 'Y')
 
         $options['json']['signature'] = $this->getSignature($options['json']);
 
-        return $this->getClient()->setApiVersion('v1')->execute($url, $options, 'POST');
+        return $this->getClient()->setApiVersion('v1')->execute($url, $options, 'POST', false);
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -71,7 +71,7 @@ public function search($locale = 'ru', $trip_class = 'Y') @@
             $options['json']['signature'] = $this->getSignature($options['json']);
-            return $this->getClient()->setApiVersion('v1')->execute($url, $options, 'POST');
+            return $this->getClient()->setApiVersion('v1')->execute($url, $options, 'POST', false);
         }
         /**
@@ Expand Down @@