Skip to content

Commit f6e13d8

Browse files
authored
fix expries may be null (#153)
1 parent 70d2b11 commit f6e13d8

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/Qcloud/Cos/Client.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,13 @@ private function createPresignedUrl(RequestInterface $request, $expires) {
137137
return $this->signature->createPresignedUrl($request, $expires);
138138
}
139139

140-
public function getPresignetUrl($method, $args, $expires = null) {
140+
public function getPresignetUrl($method, $args, $expires = "+30 minutes") {
141141
$command = $this->getCommand($method, $args);
142142
$request = $this->commandToRequestTransformer($command);
143143
return $this->createPresignedUrl($request, $expires);
144144
}
145145

146-
public function getObjectUrl($bucket, $key, $expires = null, array $args = array()) {
146+
public function getObjectUrl($bucket, $key, $expires = "+30 minutes", array $args = array()) {
147147
$command = $this->getCommand('GetObject', $args + array('Bucket' => $bucket, 'Key' => $key));
148148
$request = $this->commandToRequestTransformer($command);
149149
return $this->createPresignedUrl($request, $expires)->__toString();

src/Qcloud/Cos/Signature.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ public function signRequest(RequestInterface $request) {
2020
return $request->withHeader('Authorization', $authorization);
2121
}
2222
public function createAuthorization(RequestInterface $request, $expires = "+30 minutes") {
23+
if (is_null($expires)) {
24+
$expires = "+30 minutes";
25+
}
2326
$signTime = (string)(time() - 60) . ';' . (string)(strtotime($expires));
2427
$httpString = strtolower($request->getMethod()) . "\n" . urldecode($request->getUri()->getPath()) .
2528
"\n\nhost=" . $request->getHeader("Host")[0]. "\n";

0 commit comments

Comments
 (0)