Skip to content

Commit d96deaf

Browse files
committed
use retrieveData instead of retrieveAll
1 parent e54a363 commit d96deaf

20 files changed

+24
-24
lines changed

src/Redmine/Api/AbstractApi.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ protected function retrieveAll($endpoint, array $params = [])
176176
{
177177
@trigger_error('The '.__METHOD__.' method is deprecated, use `retrieveData()` instead.', E_USER_DEPRECATED);
178178

179-
$data = $this->retrieveData(strval($endpoint), $params);
180-
181-
if (! array_key_exists('response', $data)) {
182-
return $data;
179+
try {
180+
$data = $this->retrieveData(strval($endpoint), $params);
181+
} catch (SerializerException $e) {
182+
$data = false;
183183
}
184184

185-
return ('' === $data['response']) ? false : $data['response'];
185+
return $data;
186186
}
187187

188188
/**

src/Redmine/Api/CustomField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class CustomField extends AbstractApi
2424
*/
2525
public function all(array $params = [])
2626
{
27-
$this->customFields = $this->retrieveAll('/custom_fields.json', $params);
27+
$this->customFields = $this->retrieveData('/custom_fields.json', $params);
2828

2929
return $this->customFields;
3030
}

src/Redmine/Api/Group.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class Group extends AbstractApi
2828
*/
2929
public function all(array $params = [])
3030
{
31-
$this->groups = $this->retrieveAll('/groups.json', $params);
31+
$this->groups = $this->retrieveData('/groups.json', $params);
3232

3333
return $this->groups;
3434
}

src/Redmine/Api/Issue.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Issue extends AbstractApi
4040
*/
4141
public function all(array $params = [])
4242
{
43-
return $this->retrieveAll('/issues.json', $params);
43+
return $this->retrieveData('/issues.json', $params);
4444
}
4545

4646
/**

src/Redmine/Api/IssueCategory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class IssueCategory extends AbstractApi
2828
*/
2929
public function all($project, array $params = [])
3030
{
31-
$this->issueCategories = $this->retrieveAll('/projects/'.$project.'/issue_categories.json', $params);
31+
$this->issueCategories = $this->retrieveData('/projects/'.$project.'/issue_categories.json', $params);
3232

3333
return $this->issueCategories;
3434
}

src/Redmine/Api/IssuePriority.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class IssuePriority extends AbstractApi
2424
*/
2525
public function all(array $params = [])
2626
{
27-
$this->issuePriorities = $this->retrieveAll('/enumerations/issue_priorities.json', $params);
27+
$this->issuePriorities = $this->retrieveData('/enumerations/issue_priorities.json', $params);
2828

2929
return $this->issuePriorities;
3030
}

src/Redmine/Api/IssueRelation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class IssueRelation extends AbstractApi
2727
*/
2828
public function all($issueId, array $params = [])
2929
{
30-
$this->relations = $this->retrieveAll('/issues/'.urlencode($issueId).'/relations.json', $params);
30+
$this->relations = $this->retrieveData('/issues/'.urlencode($issueId).'/relations.json', $params);
3131

3232
return $this->relations;
3333
}

src/Redmine/Api/IssueStatus.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class IssueStatus extends AbstractApi
2424
*/
2525
public function all(array $params = [])
2626
{
27-
$this->issueStatuses = $this->retrieveAll('/issue_statuses.json', $params);
27+
$this->issueStatuses = $this->retrieveData('/issue_statuses.json', $params);
2828

2929
return $this->issueStatuses;
3030
}

src/Redmine/Api/Membership.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Membership extends AbstractApi
2727
*/
2828
public function all($project, array $params = [])
2929
{
30-
$this->memberships = $this->retrieveAll('/projects/'.$project.'/memberships.json', $params);
30+
$this->memberships = $this->retrieveData('/projects/'.$project.'/memberships.json', $params);
3131

3232
return $this->memberships;
3333
}

src/Redmine/Api/News.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class News extends AbstractApi
2424
public function all($project = null, array $params = [])
2525
{
2626
$path = null === $project ? '/news.json' : '/projects/'.$project.'/news.json';
27-
$this->news = $this->retrieveAll($path, $params);
27+
$this->news = $this->retrieveData($path, $params);
2828

2929
return $this->news;
3030
}

0 commit comments

Comments
 (0)