Skip to content

Commit 395fbb7

Browse files
committed
Merge pull request googleapis#97 from ianbarber/master
Fix short array syntax usage
2 parents b8007b1 + a2ae5d4 commit 395fbb7

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/Google/IO/Curl.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,10 @@ public function executeRequest(Google_Http_Request $request)
6969
curl_setopt($curl, $key, $var);
7070
}
7171

72+
if (!isset($this->options[CURLOPT_CAINFO])) {
73+
curl_setopt($curl, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
74+
}
75+
7276
$response = curl_exec($curl);
7377
$headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
7478

@@ -77,7 +81,7 @@ public function executeRequest(Google_Http_Request $request)
7781
$responseHeaders = $this->getHttpResponseHeaders($responseHeaderString);
7882
$responseCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
7983

80-
return [$responseBody, $responseHeaders, $responseCode];
84+
return array($responseBody, $responseHeaders, $responseCode);
8185
}
8286

8387
/**

src/Google/IO/Stream.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public function executeRequest(Google_Http_Request $request)
120120

121121
$responseHeaders = $this->getHttpResponseHeaders($http_response_header);
122122

123-
return [$response_data, $responseHeaders, $respHttpCode];
123+
return array($response_data, $responseHeaders, $respHttpCode);
124124
}
125125

126126
/**

0 commit comments

Comments
 (0)