Skip to content

Commit 2586b72

Browse files
authored
Merge pull request #2 from Oreolek/folderitems
Construct query without repeats
2 parents a370f86 + be71ca2 commit 2586b72

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

src/Box/Services/Folders/FolderService.php

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,27 @@ public function getFolderItems($folder_id = 0, $fields = [], $limit = 100, $offs
8787
Assert::integerish($limit, "The limit must be an integer. Got: %s");
8888
Assert::integerish($offset, "The offset must be an integer. Got: %s");
8989

90-
$query_fields = "?fields=";
90+
$query_fields = array(
91+
'fields' => array(),
92+
);
9193

92-
foreach ($fields as $field) {
93-
if (trim($field)) {
94-
$query_fields = $query_fields . $field . ",";
95-
}
94+
if (!empty($fields)) {
95+
foreach ($fields as $field) {
96+
if (trim($field)) {
97+
$query_fields['fields'][] = trim($field);
98+
}
99+
}
100+
} else {
101+
unset($query_fields['fields']);
96102
}
97103

98-
$query_fields .= rtrim($query_fields, ',');
99-
$query_fields .= "&limit=" . $limit;
100-
$query_fields .= "&offset=" . $offset;
104+
$query_fields['limit'] = $limit;
105+
$query_fields['offset'] = $offset;
101106

107+
$query = http_build_query($query_fields);
102108
return $this->guzzle_client->request(
103109
'GET',
104-
BAP::BASE_FOLDER_URL . BAP::URL_SEPARATOR . $folder_id . BAP::URL_SEPARATOR . "items" . $query_fields,
110+
BAP::BASE_FOLDER_URL . BAP::URL_SEPARATOR . $folder_id . BAP::URL_SEPARATOR . "items" . '?' . $query,
105111
[
106112
'headers' => [
107113
"Authorization" => "Bearer " . $this->app_auth->getTokenInfo()->access_token

0 commit comments

Comments
 (0)