From 3102e15497379a52d430c5f652c089037a5c7f03 Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Fri, 1 Jun 2012 21:41:56 -0700
Subject: [PATCH] Replace array_mergev(array()) by array_merge()

Test Plan: Save owners package.

Reviewers: jungejason, epriestley

Reviewed By: epriestley

CC: aran, epriestley

Differential Revision: https://secure.phabricator.com/D2646
---
 src/applications/owners/mail/PackageMail.php                 | 5 ++---
 src/applications/owners/mail/PackageModifyMail.php           | 5 ++---
 src/applications/owners/storage/PhabricatorOwnersPackage.php | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/applications/owners/mail/PackageMail.php b/src/applications/owners/mail/PackageMail.php
index ec9dbbbe45..1ec79512d8 100644
--- a/src/applications/owners/mail/PackageMail.php
+++ b/src/applications/owners/mail/PackageMail.php
@@ -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();
   }
 
diff --git a/src/applications/owners/mail/PackageModifyMail.php b/src/applications/owners/mail/PackageModifyMail.php
index b5fd890ecd..7f38698c72 100644
--- a/src/applications/owners/mail/PackageModifyMail.php
+++ b/src/applications/owners/mail/PackageModifyMail.php
@@ -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();
   }
 
diff --git a/src/applications/owners/storage/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
index 2fa5e579a5..39f45c14c3 100644
--- a/src/applications/owners/storage/PhabricatorOwnersPackage.php
+++ b/src/applications/owners/storage/PhabricatorOwnersPackage.php
@@ -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());