Page MenuHomePhabricator
Files F13973358

D13271.id32123.diff
No OneTemporary
Actions

D13271.id32123.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
@@ -672,18 +672,18 @@
'DivinerStaticPublisher' => 'applications/diviner/publisher/DivinerStaticPublisher.php',
'DivinerSymbolRemarkupRule' => 'applications/diviner/markup/DivinerSymbolRemarkupRule.php',
'DivinerWorkflow' => 'applications/diviner/workflow/DivinerWorkflow.php',
+ 'DoorkeeperAsanaBridge' => 'applications/doorkeeper/bridge/DoorkeeperAsanaBridge.php',
'DoorkeeperAsanaFeedWorker' => 'applications/doorkeeper/worker/DoorkeeperAsanaFeedWorker.php',
'DoorkeeperAsanaRemarkupRule' => 'applications/doorkeeper/remarkup/DoorkeeperAsanaRemarkupRule.php',
'DoorkeeperBridge' => 'applications/doorkeeper/bridge/DoorkeeperBridge.php',
- 'DoorkeeperBridgeAsana' => 'applications/doorkeeper/bridge/DoorkeeperBridgeAsana.php',
- 'DoorkeeperBridgeJIRA' => 'applications/doorkeeper/bridge/DoorkeeperBridgeJIRA.php',
- 'DoorkeeperBridgeJIRATestCase' => 'applications/doorkeeper/bridge/__tests__/DoorkeeperBridgeJIRATestCase.php',
'DoorkeeperDAO' => 'applications/doorkeeper/storage/DoorkeeperDAO.php',
'DoorkeeperExternalObject' => 'applications/doorkeeper/storage/DoorkeeperExternalObject.php',
'DoorkeeperExternalObjectQuery' => 'applications/doorkeeper/query/DoorkeeperExternalObjectQuery.php',
'DoorkeeperFeedStoryPublisher' => 'applications/doorkeeper/engine/DoorkeeperFeedStoryPublisher.php',
'DoorkeeperFeedWorker' => 'applications/doorkeeper/worker/DoorkeeperFeedWorker.php',
'DoorkeeperImportEngine' => 'applications/doorkeeper/engine/DoorkeeperImportEngine.php',
+ 'DoorkeeperJIRABridge' => 'applications/doorkeeper/bridge/DoorkeeperJIRABridge.php',
+ 'DoorkeeperJIRABridgeTestCase' => 'applications/doorkeeper/bridge/__tests__/DoorkeeperJIRABridgeTestCase.php',
'DoorkeeperJIRAFeedWorker' => 'applications/doorkeeper/worker/DoorkeeperJIRAFeedWorker.php',
'DoorkeeperJIRARemarkupRule' => 'applications/doorkeeper/remarkup/DoorkeeperJIRARemarkupRule.php',
'DoorkeeperMissingLinkException' => 'applications/doorkeeper/exception/DoorkeeperMissingLinkException.php',
@@ -3950,12 +3950,10 @@
'DivinerStaticPublisher' => 'DivinerPublisher',
'DivinerSymbolRemarkupRule' => 'PhutilRemarkupRule',
'DivinerWorkflow' => 'PhabricatorManagementWorkflow',
+ 'DoorkeeperAsanaBridge' => 'DoorkeeperBridge',
'DoorkeeperAsanaFeedWorker' => 'DoorkeeperFeedWorker',
'DoorkeeperAsanaRemarkupRule' => 'DoorkeeperRemarkupRule',
'DoorkeeperBridge' => 'Phobject',
- 'DoorkeeperBridgeAsana' => 'DoorkeeperBridge',
- 'DoorkeeperBridgeJIRA' => 'DoorkeeperBridge',
- 'DoorkeeperBridgeJIRATestCase' => 'PhabricatorTestCase',
'DoorkeeperDAO' => 'PhabricatorLiskDAO',
'DoorkeeperExternalObject' => array(
'DoorkeeperDAO',
@@ -3964,6 +3962,8 @@
'DoorkeeperExternalObjectQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
'DoorkeeperFeedWorker' => 'FeedPushWorker',
'DoorkeeperImportEngine' => 'Phobject',
+ 'DoorkeeperJIRABridge' => 'DoorkeeperBridge',
+ 'DoorkeeperJIRABridgeTestCase' => 'PhabricatorTestCase',
'DoorkeeperJIRAFeedWorker' => 'DoorkeeperFeedWorker',
'DoorkeeperJIRARemarkupRule' => 'DoorkeeperRemarkupRule',
'DoorkeeperMissingLinkException' => 'Exception',
diff --git a/src/applications/differential/customfield/DifferentialJIRAIssuesField.php b/src/applications/differential/customfield/DifferentialJIRAIssuesField.php
--- a/src/applications/differential/customfield/DifferentialJIRAIssuesField.php
+++ b/src/applications/differential/customfield/DifferentialJIRAIssuesField.php
@@ -72,9 +72,9 @@
if ($value) {
foreach ($value as $jira_key) {
$refs[] = id(new DoorkeeperObjectRef())
- ->setApplicationType(DoorkeeperBridgeJIRA::APPTYPE_JIRA)
+ ->setApplicationType(DoorkeeperJIRABridge::APPTYPE_JIRA)
->setApplicationDomain($provider->getProviderDomain())
- ->setObjectType(DoorkeeperBridgeJIRA::OBJTYPE_ISSUE)
+ ->setObjectType(DoorkeeperJIRABridge::OBJTYPE_ISSUE)
->setObjectID($jira_key);
}
}
diff --git a/src/applications/doorkeeper/bridge/DoorkeeperBridgeAsana.php b/src/applications/doorkeeper/bridge/DoorkeeperAsanaBridge.php
rename from src/applications/doorkeeper/bridge/DoorkeeperBridgeAsana.php
rename to src/applications/doorkeeper/bridge/DoorkeeperAsanaBridge.php
--- a/src/applications/doorkeeper/bridge/DoorkeeperBridgeAsana.php
+++ b/src/applications/doorkeeper/bridge/DoorkeeperAsanaBridge.php
@@ -1,6 +1,6 @@
<?php
-final class DoorkeeperBridgeAsana extends DoorkeeperBridge {
+final class DoorkeeperAsanaBridge extends DoorkeeperBridge {
const APPTYPE_ASANA = 'asana';
const APPDOMAIN_ASANA = 'asana.com';
@@ -23,7 +23,6 @@
}
public function pullRefs(array $refs) {
-
$id_map = mpull($refs, 'getObjectID', 'getObjectKey');
$viewer = $this->getViewer();
diff --git a/src/applications/doorkeeper/bridge/DoorkeeperBridgeJIRA.php b/src/applications/doorkeeper/bridge/DoorkeeperJIRABridge.php
rename from src/applications/doorkeeper/bridge/DoorkeeperBridgeJIRA.php
rename to src/applications/doorkeeper/bridge/DoorkeeperJIRABridge.php
--- a/src/applications/doorkeeper/bridge/DoorkeeperBridgeJIRA.php
+++ b/src/applications/doorkeeper/bridge/DoorkeeperJIRABridge.php
@@ -1,6 +1,6 @@
<?php
-final class DoorkeeperBridgeJIRA extends DoorkeeperBridge {
+final class DoorkeeperJIRABridge extends DoorkeeperBridge {
const APPTYPE_JIRA = 'jira';
const OBJTYPE_ISSUE = 'jira:issue';
@@ -18,7 +18,6 @@
}
public function pullRefs(array $refs) {
-
$id_map = mpull($refs, 'getObjectID', 'getObjectKey');
$viewer = $this->getViewer();
diff --git a/src/applications/doorkeeper/bridge/__tests__/DoorkeeperBridgeJIRATestCase.php b/src/applications/doorkeeper/bridge/__tests__/DoorkeeperJIRABridgeTestCase.php
rename from src/applications/doorkeeper/bridge/__tests__/DoorkeeperBridgeJIRATestCase.php
rename to src/applications/doorkeeper/bridge/__tests__/DoorkeeperJIRABridgeTestCase.php
--- a/src/applications/doorkeeper/bridge/__tests__/DoorkeeperBridgeJIRATestCase.php
+++ b/src/applications/doorkeeper/bridge/__tests__/DoorkeeperJIRABridgeTestCase.php
@@ -1,6 +1,6 @@
<?php
-final class DoorkeeperBridgeJIRATestCase extends PhabricatorTestCase {
+final class DoorkeeperJIRABridgeTestCase extends PhabricatorTestCase {
public function testJIRABridgeRestAPIURIConversion() {
$map = array(
@@ -28,7 +28,7 @@
list($rest_uri, $object_id, $expect) = $inputs;
$this->assertEqual(
$expect,
- DoorkeeperBridgeJIRA::getJIRAIssueBrowseURIFromJIRARestURI(
+ DoorkeeperJIRABridge::getJIRAIssueBrowseURIFromJIRARestURI(
$rest_uri,
$object_id));
}
diff --git a/src/applications/doorkeeper/remarkup/DoorkeeperAsanaRemarkupRule.php b/src/applications/doorkeeper/remarkup/DoorkeeperAsanaRemarkupRule.php
--- a/src/applications/doorkeeper/remarkup/DoorkeeperAsanaRemarkupRule.php
+++ b/src/applications/doorkeeper/remarkup/DoorkeeperAsanaRemarkupRule.php
@@ -16,9 +16,9 @@
'href' => $matches[0],
'tag' => array(
'ref' => array(
- DoorkeeperBridgeAsana::APPTYPE_ASANA,
- DoorkeeperBridgeAsana::APPDOMAIN_ASANA,
- DoorkeeperBridgeAsana::OBJTYPE_TASK,
+ DoorkeeperAsanaBridge::APPTYPE_ASANA,
+ DoorkeeperAsanaBridge::APPDOMAIN_ASANA,
+ DoorkeeperAsanaBridge::OBJTYPE_TASK,
$matches[2],
),
'extra' => array(
diff --git a/src/applications/doorkeeper/remarkup/DoorkeeperJIRARemarkupRule.php b/src/applications/doorkeeper/remarkup/DoorkeeperJIRARemarkupRule.php
--- a/src/applications/doorkeeper/remarkup/DoorkeeperJIRARemarkupRule.php
+++ b/src/applications/doorkeeper/remarkup/DoorkeeperJIRARemarkupRule.php
@@ -31,9 +31,9 @@
'href' => $matches[0],
'tag' => array(
'ref' => array(
- DoorkeeperBridgeJIRA::APPTYPE_JIRA,
+ DoorkeeperJIRABridge::APPTYPE_JIRA,
$provider->getProviderDomain(),
- DoorkeeperBridgeJIRA::OBJTYPE_ISSUE,
+ DoorkeeperJIRABridge::OBJTYPE_ISSUE,
$match_issue,
),
),
diff --git a/src/applications/doorkeeper/worker/DoorkeeperAsanaFeedWorker.php b/src/applications/doorkeeper/worker/DoorkeeperAsanaFeedWorker.php
--- a/src/applications/doorkeeper/worker/DoorkeeperAsanaFeedWorker.php
+++ b/src/applications/doorkeeper/worker/DoorkeeperAsanaFeedWorker.php
@@ -182,7 +182,7 @@
) + $main_data);
$parent_ref = $this->newRefFromResult(
- DoorkeeperBridgeAsana::OBJTYPE_TASK,
+ DoorkeeperAsanaBridge::OBJTYPE_TASK,
$parent);
@@ -363,7 +363,7 @@
));
$subtask_ref = $this->newRefFromResult(
- DoorkeeperBridgeAsana::OBJTYPE_TASK,
+ DoorkeeperAsanaBridge::OBJTYPE_TASK,
$subtask);
$user_to_ref_map[$user_phid] = $subtask_ref;
@@ -629,8 +629,8 @@
private function newRefFromResult($type, $result) {
$ref = id(new DoorkeeperObjectRef())
- ->setApplicationType(DoorkeeperBridgeAsana::APPTYPE_ASANA)
- ->setApplicationDomain(DoorkeeperBridgeAsana::APPDOMAIN_ASANA)
+ ->setApplicationType(DoorkeeperAsanaBridge::APPTYPE_ASANA)
+ ->setApplicationDomain(DoorkeeperAsanaBridge::APPDOMAIN_ASANA)
->setObjectType($type)
->setObjectID($result['id'])
->setIsVisible(true);
@@ -638,7 +638,7 @@
$xobj = $ref->newExternalObject();
$ref->attachExternalObject($xobj);
- $bridge = new DoorkeeperBridgeAsana();
+ $bridge = new DoorkeeperAsanaBridge();
$bridge->fillObjectFromData($xobj, $result);
$xobj->save();

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 19, 12:34 AM (3 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6729434
Default Alt Text
D13271.id32123.diff (9 KB)

Event Timeline

Phabricator · Built by Phacility