Merge pull request #164 from gitazem/master

Provide support for setting custom curl options in ReportUtils.

Author: fiboknacky

src/Google/Api/Ads/AdWords/Util/v201607/ReportUtils.php

@@ -70,14 +70,14 @@ public function __construct(AdsUtilityRegistry $adsUtilityRegistry = null) {
    *     otherwise the size in bytes of the downloaded report
    */
   public function DownloadReport($reportDefinition, $path = null,
-      AdWordsUser $user, array $options = null) {
+      AdWordsUser $user, array $options = null, $customCurlOptions = null) {
     if ($path === null || $path === '') {
       $this->adsUtilityRegistry->addUtility(AdsUtility::REPORT_UTILS_STRING);
     } else {
       $this->adsUtilityRegistry->addUtility(AdsUtility::REPORT_UTILS_FILE);
     }
     return ReportUtilsDelegate::DownloadReport($reportDefinition, $path, $user,
-        $options);
+        $options, $customCurlOptions);
   }
 
   /**
@@ -97,13 +97,13 @@ public function DownloadReport($reportDefinition, $path = null,
    *     otherwise the size in bytes of the downloaded report
    */
   public function DownloadReportWithAwql($reportQuery, $path = null,
-      AdWordsUser $user, $reportFormat, array $options = null) {
+      AdWordsUser $user, $reportFormat, array $options = null, array $customCurlOptions = null) {
     if ($path === null || $path === '') {
       $this->adsUtilityRegistry->addUtility(AdsUtility::REPORT_UTILS_STRING);
     } else {
       $this->adsUtilityRegistry->addUtility(AdsUtility::REPORT_UTILS_FILE);
     }
     return ReportUtilsDelegate::DownloadReportWithAwql($reportQuery, $path,
-        $user, $reportFormat, $options);
+        $user, $reportFormat, $options, $customCurlOptions);
   }
 }

src/Google/Api/Ads/AdWords/Util/v201607/ReportUtilsDelegate.php

@@ -70,22 +70,22 @@ private function __construct() {}
    * @see ReportUtils::DownloadReport
    */
   public static function DownloadReport($reportDefinition, $path = null,
-      AdWordsUser $user, array $options = null) {
+      AdWordsUser $user, array $options = null, array $customCurlOptions = null) {
     $url = self::GetUrl($user, $options);
     $headers = self::GetHeaders($user, $url, $options);
     $params = self::GetParams($reportDefinition);
-    return self::DownloadReportFromUrl($url, $headers, $params, $path);
+    return self::DownloadReportFromUrl($url, $headers, $params, $path, $customCurlOptions);
   }
 
   /**
    * @see ReportUtils::DownloadReportWithAwql
    */
   public static function DownloadReportWithAwql($reportQuery, $path = null,
-      AdWordsUser $user, $reportFormat, array $options = null) {
+      AdWordsUser $user, $reportFormat, array $options = null, array $customCurlOptions = null) {
     $url = self::GetUrl($user, $options);
     $headers = self::GetHeaders($user, $url, $options);
     $params = self::GetQueryParams($reportQuery, $reportFormat);
-    return self::DownloadReportFromUrl($url, $headers, $params, $path);
+    return self::DownloadReportFromUrl($url, $headers, $params, $path, $customCurlOptions);
   }
 
   /**
@@ -98,7 +98,7 @@ public static function DownloadReportWithAwql($reportQuery, $path = null,
    *     otherwise the size in bytes of the downloaded report
    */
   private static function DownloadReportFromUrl($url, $headers, $params,
-      $path = null) {
+      $path = null, $customCurlOptions = null) {
     /*
      * This method should not be static and instantiation of this class should
      * be allowed so we can "inject" CurlUtils, but would break too many things
@@ -126,6 +126,13 @@ private static function DownloadReportFromUrl($url, $headers, $params,
       $curlUtils->SetOpt($ch, CURLOPT_FILE, $file);
     }
 
+    ## sometimes need to set some useful curl options. example: $customCurlOptions =  ['CURLOPT_TIMEOUT' => 1];
+    if(!empty($customCurlOptions)) {
+        foreach ($customCurlOptions as $curlOption => $curlValue) {
+            $curlUtils->SetOpt($ch, $curlOption, $curlValue);
+        }
+    }
+
     $response = $curlUtils->Exec($ch);
     $error = $curlUtils->Error($ch);
     $code = $curlUtils->GetInfo($ch, CURLINFO_HTTP_CODE);