Fix googleapis#424: Account for installs without the cURL extension enabled.

Author: whatthejeff

src/Google/Config.php

@@ -126,7 +126,7 @@ public function __construct($ini_file_location = null)
           )
         ),
         'Google_IO_Exception' => array(
-          'retry_map' => array(
+          'retry_map' => !extension_loaded('curl') ? array() : array(
             CURLE_COULDNT_RESOLVE_HOST => self::TASK_RETRY_ALWAYS,
             CURLE_COULDNT_CONNECT => self::TASK_RETRY_ALWAYS,
             CURLE_OPERATION_TIMEOUTED => self::TASK_RETRY_ALWAYS,

tests/general/TaskTest.php

@@ -151,6 +151,7 @@ public function testRestTimeouts($config, $minTime)
   }
 
   /**
+   * @requires extension curl
    * @dataProvider defaultCurlErrorProvider
    * @expectedException Google_IO_Exception
    */
@@ -160,6 +161,7 @@ public function testCurlRetryOffByDefault($errorCode, $errorMessage = '')
   }
 
   /**
+   * @requires extension curl
    * @dataProvider defaultCurlErrorProvider
    * @expectedException Google_IO_Exception
    */
@@ -170,6 +172,7 @@ public function testOneCurlRetryWithError($errorCode, $errorMessage = '')
   }
 
   /**
+   * @requires extension curl
    * @dataProvider defaultCurlErrorProvider
    * @expectedException Google_IO_Exception
    */
@@ -182,6 +185,7 @@ public function testMultipleCurlRetriesWithErrors(
   }
 
   /**
+   * @requires extension curl
    * @dataProvider defaultCurlErrorProvider
    */
   public function testOneCurlRetryWithSuccess($errorCode, $errorMessage = '')
@@ -195,6 +199,7 @@ public function testOneCurlRetryWithSuccess($errorCode, $errorMessage = '')
   }
 
   /**
+   * @requires extension curl
    * @dataProvider defaultCurlErrorProvider
    */
   public function testMultipleCurlRetriesWithSuccess(
@@ -210,6 +215,7 @@ public function testMultipleCurlRetriesWithSuccess(
   }
 
   /**
+   * @requires extension curl
    * @dataProvider defaultCurlErrorProvider
    * @expectedException Google_IO_Exception
    */
@@ -226,6 +232,9 @@ public function testCustomCurlRetryMapReplacesDefaults(
     $this->setNextResponseThrows($errorMessage, $errorCode)->makeRequest();
   }
 
+  /**
+   * @requires extension curl
+   */
   public function testCustomCurlRetryMapAddsNewHandlers()
   {
     $this->client->setClassConfig(
@@ -244,6 +253,7 @@ public function testCustomCurlRetryMapAddsNewHandlers()
   }
 
   /**
+   * @requires extension curl
    * @expectedException Google_IO_Exception
    * @dataProvider customLimitsProvider
    */
@@ -262,6 +272,7 @@ public function testCustomCurlRetryMapWithCustomLimits($limit)
   }
 
   /**
+   * @requires extension curl
    * @dataProvider timeoutProvider
    */
   public function testCurlTimeouts($config, $minTime)
@@ -471,11 +482,11 @@ public function defaultRestErrorProvider()
   public function defaultCurlErrorProvider()
   {
     return array(
-        array(CURLE_COULDNT_RESOLVE_HOST),
-        array(CURLE_COULDNT_CONNECT),
-        array(CURLE_OPERATION_TIMEOUTED),
-        array(CURLE_SSL_CONNECT_ERROR),
-        array(CURLE_GOT_NOTHING),
+        array(6),  // CURLE_COULDNT_RESOLVE_HOST
+        array(7),  // CURLE_COULDNT_CONNECT
+        array(28), // CURLE_OPERATION_TIMEOUTED
+        array(35), // CURLE_SSL_CONNECT_ERROR
+        array(52), // CURLE_GOT_NOTHING
     );
   }