iml: fix getPostCode & makeRequest methods (#33)

gwinn · Nov 3, 2017 · 0215622 · 0215622
1 parent 7f264cc
commit 0215622
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/SaaS/Service/Iml/Api.php b/src/SaaS/Service/Iml/Api.php
@@ -277,19 +277,15 @@ public function getPostRateZone()
      *
      * @return Responce
      */
-    public function getPostCode($index)
+    public function getPostCode($index = null)
     {
         $parameters = array();
 
-        if(empty($index) || !isset($index)){
-            throw new \InvalidArgumentException(
-                "index must be established and must be not empty"
-            );
-        }else{
+        if(!is_null($index)){
             $parameters = array('index' => $index);
         }
 
-        return $this->client->makeRequest('PostCode', 'GET',$parameters);
+        return $this->client->makeRequest('PostCode', 'GET', $parameters);
     }
 
     /**

diff --git a/src/SaaS/Service/Iml/Request.php b/src/SaaS/Service/Iml/Request.php
@@ -67,6 +67,10 @@ public function makeRequest($path, $method, array $parameters = array()){
             'GetPrice'
         );
 
+        $apiLongTimeMethods = array(
+            'PostCode'
+        );
+
         if (!in_array($method, $allowedMethods)) {
             throw new \InvalidArgumentException(
                 sprintf(
@@ -77,11 +81,17 @@ public function makeRequest($path, $method, array $parameters = array()){
             );
         }
 
+        $timeouts = 60;
+
+        if (in_array($path, $apiLongTimeMethods) && empty($parameters)) {
+            $timeouts = 600;
+        }
+
         if (self::METHOD_GET === $method && in_array($path, $apiListMethods)){
             $url = 'https://api.iml.ru/list/';
         } elseif(self::METHOD_GET === $method && !in_array($path, $apiListMethods)){
             $url = 'https://list.iml.ru/';
-        }else {
+        } else {
             $url = 'https://api.iml.ru/json/';
         }
 
@@ -107,8 +117,8 @@ public function makeRequest($path, $method, array $parameters = array()){
         curl_setopt($curlHandler, CURLOPT_FAILONERROR, false);
         curl_setopt($curlHandler, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curlHandler, CURLOPT_SSL_VERIFYHOST, false);
-        curl_setopt($curlHandler, CURLOPT_TIMEOUT, 60);
-        curl_setopt($curlHandler, CURLOPT_CONNECTTIMEOUT, 60);
+        curl_setopt($curlHandler, CURLOPT_TIMEOUT, $timeouts);
+        curl_setopt($curlHandler, CURLOPT_CONNECTTIMEOUT, $timeouts);
 
         $responseBody = curl_exec($curlHandler);
         $statusCode   = curl_getinfo($curlHandler, CURLINFO_HTTP_CODE);