Skip to content

Commit afc17bf

Browse files
committed
Return subscriptions as 'members' and return 'nextToken' if there is one in subscription list methods - #14
1 parent 59a5e59 commit afc17bf

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

lib/AmazonSNS.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,13 @@ public function listSubscriptions($nextToken = null) {
246246
// Get subscriptions
247247
$subs = $resultXml->ListSubscriptionsResult->Subscriptions->member;
248248

249-
return $this->_processXmlToArray($subs);
249+
$return = ['members' => $this->_processXmlToArray($subs)];
250+
251+
if(isset($resultXml->ListSubscriptionsResult->NextToken)) {
252+
$return['nextToken'] = strval($resultXml->ListSubscriptionsResult->NextToken);
253+
}
254+
255+
return $return;
250256
}
251257

252258
/**
@@ -276,7 +282,13 @@ public function listSubscriptionsByTopic($topicArn, $nextToken = null) {
276282
// Get subscriptions
277283
$subs = $resultXml->ListSubscriptionsByTopicResult->Subscriptions->member;
278284

279-
return $this->_processXmlToArray($subs);
285+
$return = ['members' => $this->_processXmlToArray($subs)];
286+
287+
if(isset($resultXml->ListSubscriptionsByTopicResult->NextToken)) {
288+
$return['nextToken'] = strval($resultXml->ListSubscriptionsByTopicResult->NextToken);
289+
}
290+
291+
return $return;
280292
}
281293

282294
/**

0 commit comments

Comments
 (0)