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

Replace array_mergev(array()) by array_merge()

Browse source 
Test Plan: Save owners package.

Reviewers: jungejason, epriestley

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D2646
This commit is contained in:
vrana 2012-06-01 21:41:56 -07:00
parent ec9589fb3b
commit 3102e15497
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/applications/owners/mail/PackageMail.php
View file

@ -89,11 +89,10 @@ abstract class PackageMail {
$paths = $package->loadPaths();
$this->paths = mgroup($paths, 'getRepositoryPHID', 'getPath');
$phids = array_mergev(array(
$phids = array_merge(
$this->mailTo,
array($package->getActorPHID()),
array_keys($this->paths),
));
array_keys($this->paths));
$this->handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
}

5
src/applications/owners/mail/PackageModifyMail.php
View file

@ -69,13 +69,12 @@ final class PackageModifyMail extends PackageMail {
protected function loadData() {
$this->mailTo = $this->allOwners;
$phids = array_mergev(array(
$phids = array_merge(
$this->allOwners,
$this->touchedRepos,
array(
$this->getPackage()->getActorPHID(),
),
));
));
$this->handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
}

4
src/applications/owners/storage/PhabricatorOwnersPackage.php
View file

@ -199,10 +199,10 @@ final class PhabricatorOwnersPackage extends PhabricatorOwnersDAO {
}
$add_owners = array_diff_key($new_owners, $cur_owners);
$all_owners = array_mergev(array(
$all_owners = array_merge(
array($this->getPrimaryOwnerPHID() => true),
$new_owners,
$remove_owners));
$remove_owners);
foreach ($add_owners as $phid => $ignored) {
$owner = new PhabricatorOwnersOwner();
$owner->setPackageID($this->getID());