Page MenuHomePhabricator
Files F14087035

D11996.diff
No OneTemporary
Actions

D11996.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
@@ -375,10 +375,8 @@
'DifferentialHunkTestCase' => 'applications/differential/storage/__tests__/DifferentialHunkTestCase.php',
'DifferentialInlineComment' => 'applications/differential/storage/DifferentialInlineComment.php',
'DifferentialInlineCommentEditController' => 'applications/differential/controller/DifferentialInlineCommentEditController.php',
- 'DifferentialInlineCommentEditView' => 'applications/differential/view/DifferentialInlineCommentEditView.php',
'DifferentialInlineCommentPreviewController' => 'applications/differential/controller/DifferentialInlineCommentPreviewController.php',
'DifferentialInlineCommentQuery' => 'applications/differential/query/DifferentialInlineCommentQuery.php',
- 'DifferentialInlineCommentView' => 'applications/differential/view/DifferentialInlineCommentView.php',
'DifferentialJIRAIssuesField' => 'applications/differential/customfield/DifferentialJIRAIssuesField.php',
'DifferentialLandingActionMenuEventListener' => 'applications/differential/landing/DifferentialLandingActionMenuEventListener.php',
'DifferentialLandingStrategy' => 'applications/differential/landing/DifferentialLandingStrategy.php',
@@ -1138,6 +1136,9 @@
'PHUIColorPalletteExample' => 'applications/uiexample/examples/PHUIColorPalletteExample.php',
'PHUICrumbView' => 'view/phui/PHUICrumbView.php',
'PHUICrumbsView' => 'view/phui/PHUICrumbsView.php',
+ 'PHUIDiffInlineCommentDetailView' => 'infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php',
+ 'PHUIDiffInlineCommentEditView' => 'infrastructure/diff/view/PHUIDiffInlineCommentEditView.php',
+ 'PHUIDiffInlineCommentView' => 'infrastructure/diff/view/PHUIDiffInlineCommentView.php',
'PHUIDocumentExample' => 'applications/uiexample/examples/PHUIDocumentExample.php',
'PHUIDocumentView' => 'view/phui/PHUIDocumentView.php',
'PHUIFeedStoryExample' => 'applications/uiexample/examples/PHUIFeedStoryExample.php',
@@ -3518,10 +3519,8 @@
'DifferentialHunkTestCase' => 'ArcanistPhutilTestCase',
'DifferentialInlineComment' => 'PhabricatorInlineCommentInterface',
'DifferentialInlineCommentEditController' => 'PhabricatorInlineCommentController',
- 'DifferentialInlineCommentEditView' => 'AphrontView',
'DifferentialInlineCommentPreviewController' => 'PhabricatorInlineCommentPreviewController',
'DifferentialInlineCommentQuery' => 'PhabricatorOffsetPagedQuery',
- 'DifferentialInlineCommentView' => 'AphrontView',
'DifferentialJIRAIssuesField' => 'DifferentialStoredCustomField',
'DifferentialLandingActionMenuEventListener' => 'PhabricatorEventListener',
'DifferentialLegacyHunk' => 'DifferentialHunk',
@@ -4366,6 +4365,9 @@
'PHUIColorPalletteExample' => 'PhabricatorUIExample',
'PHUICrumbView' => 'AphrontView',
'PHUICrumbsView' => 'AphrontView',
+ 'PHUIDiffInlineCommentDetailView' => 'PHUIDiffInlineCommentView',
+ 'PHUIDiffInlineCommentEditView' => 'PHUIDiffInlineCommentView',
+ 'PHUIDiffInlineCommentView' => 'AphrontView',
'PHUIDocumentExample' => 'PhabricatorUIExample',
'PHUIDocumentView' => 'AphrontTagView',
'PHUIFeedStoryExample' => 'PhabricatorUIExample',
diff --git a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
--- a/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
+++ b/src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
@@ -430,7 +430,7 @@
&& $this->getShowEditAndReplyLinks();
$allow_reply = (bool)$user && $this->getShowEditAndReplyLinks();
- return id(new DifferentialInlineCommentView())
+ return id(new PHUIDiffInlineCommentDetailView())
->setInlineComment($comment)
->setOnRight($on_right)
->setHandles($this->getHandles())
diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
@@ -845,7 +845,7 @@
$rows = array();
foreach ($inlines as $inline) {
- $inline_view = id(new DifferentialInlineCommentView())
+ $inline_view = id(new PHUIDiffInlineCommentDetailView())
->setMarkupEngine($engine)
->setInlineComment($inline)
->render();
diff --git a/src/infrastructure/diff/PhabricatorInlineCommentController.php b/src/infrastructure/diff/PhabricatorInlineCommentController.php
--- a/src/infrastructure/diff/PhabricatorInlineCommentController.php
+++ b/src/infrastructure/diff/PhabricatorInlineCommentController.php
@@ -196,7 +196,7 @@
$request = $this->getRequest();
$user = $request->getUser();
- $edit_dialog = id(new DifferentialInlineCommentEditView())
+ $edit_dialog = id(new PHUIDiffInlineCommentEditView())
->setUser($user)
->setSubmitURI($request->getRequestURI())
->setOnRight($this->getIsOnRight())
@@ -233,7 +233,7 @@
$handles = $this->loadViewerHandles($phids);
- $view = id(new DifferentialInlineCommentView())
+ $view = id(new PHUIDiffInlineCommentDetailView())
->setInlineComment($inline)
->setOnRight($on_right)
->setBuildScaffolding(true)
diff --git a/src/infrastructure/diff/PhabricatorInlineCommentPreviewController.php b/src/infrastructure/diff/PhabricatorInlineCommentPreviewController.php
--- a/src/infrastructure/diff/PhabricatorInlineCommentPreviewController.php
+++ b/src/infrastructure/diff/PhabricatorInlineCommentPreviewController.php
@@ -26,7 +26,7 @@
$views = array();
foreach ($inlines as $inline) {
- $view = new DifferentialInlineCommentView();
+ $view = new PHUIDiffInlineCommentDetailView();
$view->setInlineComment($inline);
$view->setMarkupEngine($engine);
$view->setHandles($handles);
diff --git a/src/applications/differential/view/DifferentialInlineCommentView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
rename from src/applications/differential/view/DifferentialInlineCommentView.php
rename to src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
--- a/src/applications/differential/view/DifferentialInlineCommentView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
@@ -1,6 +1,7 @@
<?php
-final class DifferentialInlineCommentView extends AphrontView {
+final class PHUIDiffInlineCommentDetailView
+ extends PHUIDiffInlineCommentView {
private $inlineComment;
private $onRight;
diff --git a/src/applications/differential/view/DifferentialInlineCommentEditView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentEditView.php
rename from src/applications/differential/view/DifferentialInlineCommentEditView.php
rename to src/infrastructure/diff/view/PHUIDiffInlineCommentEditView.php
--- a/src/applications/differential/view/DifferentialInlineCommentEditView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentEditView.php
@@ -1,6 +1,7 @@
<?php
-final class DifferentialInlineCommentEditView extends AphrontView {
+final class PHUIDiffInlineCommentEditView
+ extends PHUIDiffInlineCommentView {
private $inputs = array();
private $uri;
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentView.php
new file mode 100644
--- /dev/null
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentView.php
@@ -0,0 +1,3 @@
+<?php
+
+abstract class PHUIDiffInlineCommentView extends AphrontView {}

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 24, 6:37 PM (21 h, 16 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6783684
Default Alt Text
D11996.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility