Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15470875
D9988.id24006.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
20 KB
Referenced Files
None
Subscribers
None
D9988.id24006.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
@@ -1549,7 +1549,7 @@
'PhabricatorDebugController' => 'applications/system/controller/PhabricatorDebugController.php',
'PhabricatorDefaultFileStorageEngineSelector' => 'applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php',
'PhabricatorDefaultSearchEngineSelector' => 'applications/search/selector/PhabricatorDefaultSearchEngineSelector.php',
- 'PhabricatorDestructableInterface' => 'applications/system/interface/PhabricatorDestructableInterface.php',
+ 'PhabricatorDestructibleInterface' => 'applications/system/interface/PhabricatorDestructibleInterface.php',
'PhabricatorDestructionEngine' => 'applications/system/engine/PhabricatorDestructionEngine.php',
'PhabricatorDeveloperConfigOptions' => 'applications/config/option/PhabricatorDeveloperConfigOptions.php',
'PhabricatorDifferenceEngine' => 'infrastructure/diff/PhabricatorDifferenceEngine.php',
@@ -3094,7 +3094,7 @@
1 => 'PhabricatorPolicyInterface',
2 => 'HarbormasterBuildableInterface',
3 => 'PhabricatorApplicationTransactionInterface',
- 4 => 'PhabricatorDestructableInterface',
+ 4 => 'PhabricatorDestructibleInterface',
),
'DifferentialDiffCreateController' => 'DifferentialController',
'DifferentialDiffProperty' => 'DifferentialDAO',
@@ -3162,7 +3162,7 @@
6 => 'PhabricatorSubscribableInterface',
7 => 'PhabricatorCustomFieldInterface',
8 => 'PhabricatorApplicationTransactionInterface',
- 9 => 'PhabricatorDestructableInterface',
+ 9 => 'PhabricatorDestructibleInterface',
10 => 'PhabricatorProjectInterface',
),
'DifferentialRevisionDetailView' => 'AphrontView',
@@ -3586,7 +3586,7 @@
0 => 'HeraldDAO',
1 => 'PhabricatorFlaggableInterface',
2 => 'PhabricatorPolicyInterface',
- 3 => 'PhabricatorDestructableInterface',
+ 3 => 'PhabricatorDestructibleInterface',
),
'HeraldRuleController' => 'HeraldController',
'HeraldRuleEdit' => 'HeraldDAO',
@@ -3625,7 +3625,7 @@
1 => 'PhabricatorPolicyInterface',
2 => 'PhabricatorSubscribableInterface',
3 => 'PhabricatorApplicationTransactionInterface',
- 4 => 'PhabricatorDestructableInterface',
+ 4 => 'PhabricatorDestructibleInterface',
),
'LegalpadDocumentBody' => array(
0 => 'LegalpadDAO',
@@ -3712,7 +3712,7 @@
4 => 'PhabricatorFlaggableInterface',
5 => 'PhrequentTrackableInterface',
6 => 'PhabricatorCustomFieldInterface',
- 7 => 'PhabricatorDestructableInterface',
+ 7 => 'PhabricatorDestructibleInterface',
8 => 'PhabricatorApplicationTransactionInterface',
),
'ManiphestTaskDescriptionPreviewController' => 'ManiphestController',
@@ -3987,13 +3987,13 @@
'PhabricatorApplicationTransaction' => array(
0 => 'PhabricatorLiskDAO',
1 => 'PhabricatorPolicyInterface',
- 2 => 'PhabricatorDestructableInterface',
+ 2 => 'PhabricatorDestructibleInterface',
),
'PhabricatorApplicationTransactionComment' => array(
0 => 'PhabricatorLiskDAO',
1 => 'PhabricatorMarkupInterface',
2 => 'PhabricatorPolicyInterface',
- 3 => 'PhabricatorDestructableInterface',
+ 3 => 'PhabricatorDestructibleInterface',
),
'PhabricatorApplicationTransactionCommentEditController' => 'PhabricatorApplicationTransactionController',
'PhabricatorApplicationTransactionCommentEditor' => 'PhabricatorEditor',
@@ -4610,6 +4610,7 @@
'PhabricatorMetaMTAMailingList' => array(
0 => 'PhabricatorMetaMTADAO',
1 => 'PhabricatorPolicyInterface',
+ 2 => 'PhabricatorDestructibleInterface',
),
'PhabricatorMetaMTAMemberQuery' => 'PhabricatorQuery',
'PhabricatorMetaMTAPermanentFailureException' => 'Exception',
@@ -4792,7 +4793,7 @@
2 => 'PhabricatorPolicyInterface',
3 => 'PhabricatorSubscribableInterface',
4 => 'PhabricatorCustomFieldInterface',
- 5 => 'PhabricatorDestructableInterface',
+ 5 => 'PhabricatorDestructibleInterface',
),
'PhabricatorProjectArchiveController' => 'PhabricatorProjectController',
'PhabricatorProjectBoardController' => 'PhabricatorProjectController',
@@ -4803,7 +4804,7 @@
'PhabricatorProjectColumn' => array(
0 => 'PhabricatorProjectDAO',
1 => 'PhabricatorPolicyInterface',
- 2 => 'PhabricatorDestructableInterface',
+ 2 => 'PhabricatorDestructibleInterface',
),
'PhabricatorProjectColumnDetailController' => 'PhabricatorProjectBoardController',
'PhabricatorProjectColumnQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
@@ -4879,13 +4880,13 @@
1 => 'PhabricatorPolicyInterface',
2 => 'PhabricatorFlaggableInterface',
3 => 'PhabricatorMarkupInterface',
- 4 => 'PhabricatorDestructableInterface',
+ 4 => 'PhabricatorDestructibleInterface',
5 => 'PhabricatorProjectInterface',
),
'PhabricatorRepositoryArcanistProject' => array(
0 => 'PhabricatorRepositoryDAO',
1 => 'PhabricatorPolicyInterface',
- 2 => 'PhabricatorDestructableInterface',
+ 2 => 'PhabricatorDestructibleInterface',
),
'PhabricatorRepositoryArcanistProjectDeleteController' => 'PhabricatorRepositoryController',
'PhabricatorRepositoryArcanistProjectEditController' => 'PhabricatorRepositoryController',
@@ -5195,7 +5196,7 @@
1 => 'PhutilPerson',
2 => 'PhabricatorPolicyInterface',
3 => 'PhabricatorCustomFieldInterface',
- 4 => 'PhabricatorDestructableInterface',
+ 4 => 'PhabricatorDestructibleInterface',
),
'PhabricatorUserBlurbField' => 'PhabricatorUserCustomField',
'PhabricatorUserConfigOptions' => 'PhabricatorApplicationConfigOptions',
@@ -5338,7 +5339,7 @@
5 => 'PhabricatorFlaggableInterface',
6 => 'PhabricatorApplicationTransactionInterface',
7 => 'PhabricatorProjectInterface',
- 8 => 'PhabricatorDestructableInterface',
+ 8 => 'PhabricatorDestructibleInterface',
),
'PholioMockCommentController' => 'PholioController',
'PholioMockEditController' => 'PholioController',
@@ -5483,6 +5484,7 @@
2 => 'PhabricatorSubscribableInterface',
3 => 'PhabricatorFlaggableInterface',
4 => 'PhabricatorTokenReceiverInterface',
+ 5 => 'PhabricatorDestructibleInterface',
),
'PhrictionDocumentController' => 'PhrictionController',
'PhrictionDocumentEditor' => 'PhabricatorEditor',
diff --git a/src/applications/differential/storage/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
--- a/src/applications/differential/storage/DifferentialDiff.php
+++ b/src/applications/differential/storage/DifferentialDiff.php
@@ -6,7 +6,7 @@
PhabricatorPolicyInterface,
HarbormasterBuildableInterface,
PhabricatorApplicationTransactionInterface,
- PhabricatorDestructableInterface {
+ PhabricatorDestructibleInterface {
protected $revisionID;
protected $authorPHID;
@@ -392,7 +392,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
diff --git a/src/applications/differential/storage/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
--- a/src/applications/differential/storage/DifferentialRevision.php
+++ b/src/applications/differential/storage/DifferentialRevision.php
@@ -10,7 +10,7 @@
PhabricatorSubscribableInterface,
PhabricatorCustomFieldInterface,
PhabricatorApplicationTransactionInterface,
- PhabricatorDestructableInterface,
+ PhabricatorDestructibleInterface,
PhabricatorProjectInterface {
protected $title = '';
@@ -449,7 +449,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
diff --git a/src/applications/herald/storage/HeraldRule.php b/src/applications/herald/storage/HeraldRule.php
--- a/src/applications/herald/storage/HeraldRule.php
+++ b/src/applications/herald/storage/HeraldRule.php
@@ -4,7 +4,7 @@
implements
PhabricatorFlaggableInterface,
PhabricatorPolicyInterface,
- PhabricatorDestructableInterface {
+ PhabricatorDestructibleInterface {
const TABLE_RULE_APPLIED = 'herald_ruleapplied';
@@ -252,7 +252,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
PhabricatorDestructionEngine $engine) {
diff --git a/src/applications/legalpad/storage/LegalpadDocument.php b/src/applications/legalpad/storage/LegalpadDocument.php
--- a/src/applications/legalpad/storage/LegalpadDocument.php
+++ b/src/applications/legalpad/storage/LegalpadDocument.php
@@ -5,7 +5,7 @@
PhabricatorPolicyInterface,
PhabricatorSubscribableInterface,
PhabricatorApplicationTransactionInterface,
- PhabricatorDestructableInterface {
+ PhabricatorDestructibleInterface {
protected $title;
protected $contributorCount;
@@ -201,7 +201,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
diff --git a/src/applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php b/src/applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php
--- a/src/applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php
+++ b/src/applications/mailinglists/storage/PhabricatorMetaMTAMailingList.php
@@ -3,7 +3,7 @@
final class PhabricatorMetaMTAMailingList extends PhabricatorMetaMTADAO
implements
PhabricatorPolicyInterface,
- PhabricatorDestructableInterface {
+ PhabricatorDestructibleInterface {
protected $name;
protected $email;
@@ -43,7 +43,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
diff --git a/src/applications/maniphest/storage/ManiphestTask.php b/src/applications/maniphest/storage/ManiphestTask.php
--- a/src/applications/maniphest/storage/ManiphestTask.php
+++ b/src/applications/maniphest/storage/ManiphestTask.php
@@ -8,7 +8,7 @@
PhabricatorFlaggableInterface,
PhrequentTrackableInterface,
PhabricatorCustomFieldInterface,
- PhabricatorDestructableInterface,
+ PhabricatorDestructibleInterface,
PhabricatorApplicationTransactionInterface {
const MARKUP_FIELD_DESCRIPTION = 'markup:desc';
@@ -285,7 +285,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -9,7 +9,7 @@
PhutilPerson,
PhabricatorPolicyInterface,
PhabricatorCustomFieldInterface,
- PhabricatorDestructableInterface {
+ PhabricatorDestructibleInterface {
const SESSION_TABLE = 'phabricator_session';
const NAMETOKEN_TABLE = 'user_nametoken';
@@ -821,7 +821,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
diff --git a/src/applications/pholio/storage/PholioMock.php b/src/applications/pholio/storage/PholioMock.php
--- a/src/applications/pholio/storage/PholioMock.php
+++ b/src/applications/pholio/storage/PholioMock.php
@@ -9,7 +9,7 @@
PhabricatorFlaggableInterface,
PhabricatorApplicationTransactionInterface,
PhabricatorProjectInterface,
- PhabricatorDestructableInterface {
+ PhabricatorDestructibleInterface {
const MARKUP_FIELD_DESCRIPTION = 'markup:description';
@@ -258,7 +258,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
diff --git a/src/applications/phriction/storage/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
--- a/src/applications/phriction/storage/PhrictionDocument.php
+++ b/src/applications/phriction/storage/PhrictionDocument.php
@@ -6,7 +6,7 @@
PhabricatorSubscribableInterface,
PhabricatorFlaggableInterface,
PhabricatorTokenReceiverInterface,
- PhabricatorDestructableInterface {
+ PhabricatorDestructibleInterface {
protected $slug;
protected $depth;
@@ -183,7 +183,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
diff --git a/src/applications/project/storage/PhabricatorProject.php b/src/applications/project/storage/PhabricatorProject.php
--- a/src/applications/project/storage/PhabricatorProject.php
+++ b/src/applications/project/storage/PhabricatorProject.php
@@ -6,7 +6,7 @@
PhabricatorPolicyInterface,
PhabricatorSubscribableInterface,
PhabricatorCustomFieldInterface,
- PhabricatorDestructableInterface {
+ PhabricatorDestructibleInterface {
protected $name;
protected $status = PhabricatorProjectStatus::STATUS_ACTIVE;
@@ -308,7 +308,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
PhabricatorDestructionEngine $engine) {
diff --git a/src/applications/project/storage/PhabricatorProjectColumn.php b/src/applications/project/storage/PhabricatorProjectColumn.php
--- a/src/applications/project/storage/PhabricatorProjectColumn.php
+++ b/src/applications/project/storage/PhabricatorProjectColumn.php
@@ -2,8 +2,9 @@
final class PhabricatorProjectColumn
extends PhabricatorProjectDAO
- implements PhabricatorPolicyInterface,
- PhabricatorDestructableInterface {
+ implements
+ PhabricatorPolicyInterface,
+ PhabricatorDestructibleInterface {
const STATUS_ACTIVE = 0;
const STATUS_HIDDEN = 1;
@@ -99,7 +100,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
PhabricatorDestructionEngine $engine) {
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -8,7 +8,7 @@
PhabricatorPolicyInterface,
PhabricatorFlaggableInterface,
PhabricatorMarkupInterface,
- PhabricatorDestructableInterface,
+ PhabricatorDestructibleInterface,
PhabricatorProjectInterface {
/**
@@ -1387,7 +1387,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
PhabricatorDestructionEngine $engine) {
diff --git a/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php b/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
--- a/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
@@ -2,8 +2,9 @@
final class PhabricatorRepositoryArcanistProject
extends PhabricatorRepositoryDAO
- implements PhabricatorPolicyInterface,
- PhabricatorDestructableInterface {
+ implements
+ PhabricatorPolicyInterface,
+ PhabricatorDestructibleInterface {
protected $name;
protected $repositoryID;
@@ -89,7 +90,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
PhabricatorDestructionEngine $engine) {
diff --git a/src/applications/system/engine/PhabricatorDestructionEngine.php b/src/applications/system/engine/PhabricatorDestructionEngine.php
--- a/src/applications/system/engine/PhabricatorDestructionEngine.php
+++ b/src/applications/system/engine/PhabricatorDestructionEngine.php
@@ -4,7 +4,7 @@
private $rootLogID;
- public function destroyObject(PhabricatorDestructableInterface $object) {
+ public function destroyObject(PhabricatorDestructibleInterface $object) {
$log = id(new PhabricatorSystemDestructionLog())
->setEpoch(time())
->setObjectClass(get_class($object));
diff --git a/src/applications/system/interface/PhabricatorDestructableInterface.php b/src/applications/system/interface/PhabricatorDestructableInterface.php
deleted file mode 100644
--- a/src/applications/system/interface/PhabricatorDestructableInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-interface PhabricatorDestructableInterface {
-
- public function destroyObjectPermanently(
- PhabricatorDestructionEngine $engine);
-
-}
-
-
-// TEMPLATE IMPLEMENTATION /////////////////////////////////////////////////////
-
-
-/* -( PhabricatorDestructableInterface )----------------------------------- */
-/*
-
- public function destroyObjectPermanently(
- PhabricatorDestructionEngine $engine) {
-
- <<<$this->nuke();>>>
-
- }
-
-*/
diff --git a/src/applications/system/interface/PhabricatorDestructibleInterface.php b/src/applications/system/interface/PhabricatorDestructibleInterface.php
new file mode 100644
--- /dev/null
+++ b/src/applications/system/interface/PhabricatorDestructibleInterface.php
@@ -0,0 +1,8 @@
+<?php
+
+interface PhabricatorDestructibleInterface {
+
+ public function destroyObjectPermanently(
+ PhabricatorDestructionEngine $engine);
+
+}
diff --git a/src/applications/system/management/PhabricatorSystemRemoveDestroyWorkflow.php b/src/applications/system/management/PhabricatorSystemRemoveDestroyWorkflow.php
--- a/src/applications/system/management/PhabricatorSystemRemoveDestroyWorkflow.php
+++ b/src/applications/system/management/PhabricatorSystemRemoveDestroyWorkflow.php
@@ -45,12 +45,12 @@
}
foreach ($named_objects as $object_name => $object) {
- if (!($object instanceof PhabricatorDestructableInterface)) {
+ if (!($object instanceof PhabricatorDestructibleInterface)) {
throw new PhutilArgumentUsageException(
pht(
'Object "%s" can not be destroyed (it does not implement %s).',
$object_name,
- 'PhabricatorDestructableInterface'));
+ 'PhabricatorDestructibleInterface'));
}
}
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -4,7 +4,7 @@
extends PhabricatorLiskDAO
implements
PhabricatorPolicyInterface,
- PhabricatorDestructableInterface {
+ PhabricatorDestructibleInterface {
const TARGET_TEXT = 'text';
const TARGET_HTML = 'html';
@@ -1026,7 +1026,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransactionComment.php b/src/applications/transactions/storage/PhabricatorApplicationTransactionComment.php
--- a/src/applications/transactions/storage/PhabricatorApplicationTransactionComment.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransactionComment.php
@@ -5,7 +5,7 @@
implements
PhabricatorMarkupInterface,
PhabricatorPolicyInterface,
- PhabricatorDestructableInterface {
+ PhabricatorDestructibleInterface {
const MARKUP_FIELD_COMMENT = 'markup:comment';
@@ -135,7 +135,7 @@
}
-/* -( PhabricatorDestructableInterface )----------------------------------- */
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
public function destroyObjectPermanently(
PhabricatorDestructionEngine $engine) {
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Apr 6, 1:48 AM (2 d, 1 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7733841
Default Alt Text
D9988.id24006.diff (20 KB)
Attached To
Mode
D9988: Rename `PhabricatorDestructableInterface` interface
Attached
Detach File
Event Timeline
Log In to Comment