revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-25 16:22:43 +01:00
Code Issues Releases Wiki Activity

Fix diffusion.branchquery returning dictionary instead of array when branches are filtered out

Browse source 
Summary:
`diffusion.branchquery` can return dictionary instead of array if some branches are filtered out.
Eg.:
```
{
  "result": [
    {
      "shortName": "master",
      "commitIdentifier": "2817b0d8f79748ddfad0220c46d9b20bea34f460",
      "refType": "branch",
      "rawFields": {
        "objectname": "2817b0d8f79748ddfad0220c46d9b20bea34f460",
        "objecttype": "commit",
```
might become:
```
{
  "result": {
    "1": {
      "shortName": "master",
      "commitIdentifier": "2817b0d8f79748ddfad0220c46d9b20bea34f460",
      "refType": "branch",
      "rawFields": {
        "objectname": "2817b0d8f79748ddfad0220c46d9b20bea34f460",
        "objecttype": "commit",

```
Reproduction - find repository which has couple of branches, setup to track only some of them, execute `diffusion.branchquery` API call - result is dictionary instead of array

Test Plan: Apply patch, execution `diffusion.branchquery` call - result is no longer dictionary if it was one before

Reviewers: #blessed_reviewers, epriestley

Reviewed By: #blessed_reviewers, epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D20973
This commit is contained in:
Arturas Moskvinas arturas@uber.com 2020-02-12 11:50:22 -08:00 committed by epriestley
parent af84f215f9
commit 8cc6fe465c
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/diffusion/conduit/DiffusionBranchQueryConduitAPIMethod.php
View file

@ -128,6 +128,8 @@ final class DiffusionBranchQueryConduitAPIMethod
$refs = array_slice($refs, 0, $limit); $refs = array_slice($refs, 0, $limit);
} }
$refs = array_values($refs);
return mpull($refs, 'toDictionary'); return mpull($refs, 'toDictionary');
} }