Page MenuHomePhabricator
Files F15299040

D20957.id49925.diff
No OneTemporary
Actions

D20957.id49925.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -737,12 +737,14 @@
'DiffusionCommitAuditorsHeraldField' => 'applications/diffusion/herald/DiffusionCommitAuditorsHeraldField.php',
'DiffusionCommitAuditorsTransaction' => 'applications/diffusion/xaction/DiffusionCommitAuditorsTransaction.php',
'DiffusionCommitAuthorHeraldField' => 'applications/diffusion/herald/DiffusionCommitAuthorHeraldField.php',
+ 'DiffusionCommitAuthorPackagesHeraldField' => 'applications/diffusion/herald/DiffusionCommitAuthorPackagesHeraldField.php',
'DiffusionCommitAuthorProjectsHeraldField' => 'applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php',
'DiffusionCommitAutocloseHeraldField' => 'applications/diffusion/herald/DiffusionCommitAutocloseHeraldField.php',
'DiffusionCommitBranchesController' => 'applications/diffusion/controller/DiffusionCommitBranchesController.php',
'DiffusionCommitBranchesHeraldField' => 'applications/diffusion/herald/DiffusionCommitBranchesHeraldField.php',
'DiffusionCommitBuildableTransaction' => 'applications/diffusion/xaction/DiffusionCommitBuildableTransaction.php',
'DiffusionCommitCommitterHeraldField' => 'applications/diffusion/herald/DiffusionCommitCommitterHeraldField.php',
+ 'DiffusionCommitCommitterPackagesHeraldField' => 'applications/diffusion/herald/DiffusionCommitCommitterPackagesHeraldField.php',
'DiffusionCommitCommitterProjectsHeraldField' => 'applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php',
'DiffusionCommitConcernTransaction' => 'applications/diffusion/xaction/DiffusionCommitConcernTransaction.php',
'DiffusionCommitController' => 'applications/diffusion/controller/DiffusionCommitController.php',
@@ -908,10 +910,12 @@
'DiffusionPhpExternalSymbolsSource' => 'applications/diffusion/symbol/DiffusionPhpExternalSymbolsSource.php',
'DiffusionPreCommitContentAffectedFilesHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAffectedFilesHeraldField.php',
'DiffusionPreCommitContentAuthorHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAuthorHeraldField.php',
+ 'DiffusionPreCommitContentAuthorPackagesHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAuthorPackagesHeraldField.php',
'DiffusionPreCommitContentAuthorProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAuthorProjectsHeraldField.php',
'DiffusionPreCommitContentAuthorRawHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentAuthorRawHeraldField.php',
'DiffusionPreCommitContentBranchesHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentBranchesHeraldField.php',
'DiffusionPreCommitContentCommitterHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentCommitterHeraldField.php',
+ 'DiffusionPreCommitContentCommitterPackagesHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentCommitterPackagesHeraldField.php',
'DiffusionPreCommitContentCommitterProjectsHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php',
'DiffusionPreCommitContentCommitterRawHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentCommitterRawHeraldField.php',
'DiffusionPreCommitContentDiffContentAddedHeraldField' => 'applications/diffusion/herald/DiffusionPreCommitContentDiffContentAddedHeraldField.php',
@@ -6731,12 +6735,14 @@
'DiffusionCommitAuditorsHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitAuditorsTransaction' => 'DiffusionCommitTransactionType',
'DiffusionCommitAuthorHeraldField' => 'DiffusionCommitHeraldField',
+ 'DiffusionCommitAuthorPackagesHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitAuthorProjectsHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitAutocloseHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitBranchesController' => 'DiffusionController',
'DiffusionCommitBranchesHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitBuildableTransaction' => 'DiffusionCommitTransactionType',
'DiffusionCommitCommitterHeraldField' => 'DiffusionCommitHeraldField',
+ 'DiffusionCommitCommitterPackagesHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitCommitterProjectsHeraldField' => 'DiffusionCommitHeraldField',
'DiffusionCommitConcernTransaction' => 'DiffusionCommitAuditTransaction',
'DiffusionCommitController' => 'DiffusionController',
@@ -6905,10 +6911,12 @@
'DiffusionPhpExternalSymbolsSource' => 'DiffusionExternalSymbolsSource',
'DiffusionPreCommitContentAffectedFilesHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentAuthorHeraldField' => 'DiffusionPreCommitContentHeraldField',
+ 'DiffusionPreCommitContentAuthorPackagesHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentAuthorProjectsHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentAuthorRawHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentBranchesHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentCommitterHeraldField' => 'DiffusionPreCommitContentHeraldField',
+ 'DiffusionPreCommitContentCommitterPackagesHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentCommitterProjectsHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentCommitterRawHeraldField' => 'DiffusionPreCommitContentHeraldField',
'DiffusionPreCommitContentDiffContentAddedHeraldField' => 'DiffusionPreCommitContentHeraldField',
diff --git a/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitAuthorPackagesHeraldField.php
copy from src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php
copy to src/applications/diffusion/herald/DiffusionCommitAuthorPackagesHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitAuthorPackagesHeraldField.php
@@ -1,29 +1,29 @@
<?php
-final class DiffusionCommitAuthorProjectsHeraldField
+final class DiffusionCommitAuthorPackagesHeraldField
extends DiffusionCommitHeraldField {
- const FIELDCONST = 'diffusion.commit.author.projects';
+ const FIELDCONST = 'diffusion.commit.author.packages';
public function getHeraldFieldName() {
- return pht("Author's projects");
+ return pht("Author's packages");
}
public function getHeraldFieldValue($object) {
$adapter = $this->getAdapter();
$viewer = $adapter->getViewer();
- $phid = $adapter->getAuthorPHID();
- if (!$phid) {
+ $author_phid = $adapter->getAuthorPHID();
+ if (!$author_phid) {
return array();
}
- $projects = id(new PhabricatorProjectQuery())
+ $packages = id(new PhabricatorOwnersPackageQuery())
->setViewer($viewer)
- ->withMemberPHIDs(array($phid))
+ ->withAuthorityPHIDs(array($author_phid))
->execute();
- return mpull($projects, 'getPHID');
+ return mpull($packages, 'getPHID');
}
protected function getHeraldFieldStandardType() {
@@ -31,7 +31,7 @@
}
protected function getDatasource() {
- return new PhabricatorProjectDatasource();
+ return new PhabricatorOwnersPackageDatasource();
}
}
diff --git a/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php
@@ -13,14 +13,14 @@
$adapter = $this->getAdapter();
$viewer = $adapter->getViewer();
- $phid = $adapter->getAuthorPHID();
- if (!$phid) {
+ $author_phid = $adapter->getAuthorPHID();
+ if (!$author_phid) {
return array();
}
$projects = id(new PhabricatorProjectQuery())
->setViewer($viewer)
- ->withMemberPHIDs(array($phid))
+ ->withMemberPHIDs(array($author_phid))
->execute();
return mpull($projects, 'getPHID');
diff --git a/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitCommitterPackagesHeraldField.php
copy from src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php
copy to src/applications/diffusion/herald/DiffusionCommitCommitterPackagesHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionCommitAuthorProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitCommitterPackagesHeraldField.php
@@ -1,29 +1,29 @@
<?php
-final class DiffusionCommitAuthorProjectsHeraldField
+final class DiffusionCommitCommitterPackagesHeraldField
extends DiffusionCommitHeraldField {
- const FIELDCONST = 'diffusion.commit.author.projects';
+ const FIELDCONST = 'diffusion.commit.committer.packages';
public function getHeraldFieldName() {
- return pht("Author's projects");
+ return pht("Committer's packages");
}
public function getHeraldFieldValue($object) {
$adapter = $this->getAdapter();
$viewer = $adapter->getViewer();
- $phid = $adapter->getAuthorPHID();
- if (!$phid) {
+ $committer_phid = $adapter->getAuthorPHID();
+ if (!$committer_phid) {
return array();
}
- $projects = id(new PhabricatorProjectQuery())
+ $packages = id(new PhabricatorOwnersPackageQuery())
->setViewer($viewer)
- ->withMemberPHIDs(array($phid))
+ ->withAuthorityPHIDs(array($committer_phid))
->execute();
- return mpull($projects, 'getPHID');
+ return mpull($packages, 'getPHID');
}
protected function getHeraldFieldStandardType() {
@@ -31,7 +31,7 @@
}
protected function getDatasource() {
- return new PhabricatorProjectDatasource();
+ return new PhabricatorOwnersPackageDatasource();
}
}
diff --git a/src/applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionCommitCommitterProjectsHeraldField.php
@@ -13,16 +13,14 @@
$adapter = $this->getAdapter();
$viewer = $adapter->getViewer();
- $phid = $adapter->getCommitterPHID();
- if (!$phid) {
+ $committer_phid = $adapter->getCommitterPHID();
+ if (!$committer_phid) {
return array();
}
- $viewer = $adapter->getViewer();
-
$projects = id(new PhabricatorProjectQuery())
->setViewer($viewer)
- ->withMemberPHIDs(array($phid))
+ ->withMemberPHIDs(array($committer_phid))
->execute();
return mpull($projects, 'getPHID');
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorPackagesHeraldField.php
copy from src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php
copy to src/applications/diffusion/herald/DiffusionPreCommitContentAuthorPackagesHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorPackagesHeraldField.php
@@ -1,30 +1,29 @@
<?php
-final class DiffusionPreCommitContentCommitterProjectsHeraldField
+final class DiffusionPreCommitContentAuthorPackagesHeraldField
extends DiffusionPreCommitContentHeraldField {
- const FIELDCONST = 'diffusion.pre.commit.committer.projects';
+ const FIELDCONST = 'diffusion.pre.commit.author.packages';
public function getHeraldFieldName() {
- return pht("Committer's projects");
+ return pht("Author's packages");
}
public function getHeraldFieldValue($object) {
$adapter = $this->getAdapter();
+ $viewer = $adapter->getViewer();
- $phid = $adapter->getCommitterPHID();
- if (!$phid) {
+ $author_phid = $adapter->getAuthorPHID();
+ if (!$author_phid) {
return array();
}
- $viewer = $adapter->getViewer();
-
- $projects = id(new PhabricatorProjectQuery())
+ $packages = id(new PhabricatorOwnersPackageQuery())
->setViewer($viewer)
- ->withMemberPHIDs(array($phid))
+ ->withAuthorityPHIDs(array($author_phid))
->execute();
- return mpull($projects, 'getPHID');
+ return mpull($packages, 'getPHID');
}
protected function getHeraldFieldStandardType() {
@@ -32,7 +31,7 @@
}
protected function getDatasource() {
- return new PhabricatorProjectDatasource();
+ return new PhabricatorOwnersPackageDatasource();
}
}
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorProjectsHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentAuthorProjectsHeraldField.php
@@ -11,17 +11,16 @@
public function getHeraldFieldValue($object) {
$adapter = $this->getAdapter();
+ $viewer = $adapter->getViewer();
- $phid = $adapter->getAuthorPHID();
- if (!$phid) {
+ $author_phid = $adapter->getAuthorPHID();
+ if (!$author_phid) {
return array();
}
- $viewer = $adapter->getViewer();
-
$projects = id(new PhabricatorProjectQuery())
->setViewer($viewer)
- ->withMemberPHIDs(array($phid))
+ ->withMemberPHIDs(array($author_phid))
->execute();
return mpull($projects, 'getPHID');
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterPackagesHeraldField.php
copy from src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php
copy to src/applications/diffusion/herald/DiffusionPreCommitContentCommitterPackagesHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterPackagesHeraldField.php
@@ -1,30 +1,29 @@
<?php
-final class DiffusionPreCommitContentCommitterProjectsHeraldField
+final class DiffusionPreCommitContentCommitterPackagesHeraldField
extends DiffusionPreCommitContentHeraldField {
- const FIELDCONST = 'diffusion.pre.commit.committer.projects';
+ const FIELDCONST = 'diffusion.pre.commit.committer.packages';
public function getHeraldFieldName() {
- return pht("Committer's projects");
+ return pht("Committer's packages");
}
public function getHeraldFieldValue($object) {
$adapter = $this->getAdapter();
+ $viewer = $adapter->getViewer();
- $phid = $adapter->getCommitterPHID();
- if (!$phid) {
+ $committer_phid = $adapter->getCommitterPHID();
+ if (!$committer_phid) {
return array();
}
- $viewer = $adapter->getViewer();
-
- $projects = id(new PhabricatorProjectQuery())
+ $packages = id(new PhabricatorOwnersPackageQuery())
->setViewer($viewer)
- ->withMemberPHIDs(array($phid))
+ ->withAuthorityPHIDs(array($committer_phid))
->execute();
- return mpull($projects, 'getPHID');
+ return mpull($packages, 'getPHID');
}
protected function getHeraldFieldStandardType() {
@@ -32,7 +31,7 @@
}
protected function getDatasource() {
- return new PhabricatorProjectDatasource();
+ return new PhabricatorOwnersPackageDatasource();
}
}
diff --git a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php b/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php
--- a/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php
+++ b/src/applications/diffusion/herald/DiffusionPreCommitContentCommitterProjectsHeraldField.php
@@ -11,17 +11,16 @@
public function getHeraldFieldValue($object) {
$adapter = $this->getAdapter();
+ $viewer = $adapter->getViewer();
- $phid = $adapter->getCommitterPHID();
- if (!$phid) {
+ $committer_phid = $adapter->getCommitterPHID();
+ if (!$committer_phid) {
return array();
}
- $viewer = $adapter->getViewer();
-
$projects = id(new PhabricatorProjectQuery())
->setViewer($viewer)
- ->withMemberPHIDs(array($phid))
+ ->withMemberPHIDs(array($committer_phid))
->execute();
return mpull($projects, 'getPHID');

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 6, 2:12 PM (6 h, 57 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7265044
Default Alt Text
D20957.id49925.diff (16 KB)

Event Timeline

Phabricator · Built by Phacility