Page MenuHomePhabricator
Files F13178201

D14442.diff
No OneTemporary
Actions

D14442.diff
View Options

diff --git a/resources/sql/autopatches/20151109.xhpast.db.1.sql b/resources/sql/autopatches/20151109.xhpast.db.1.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20151109.xhpast.db.1.sql
@@ -0,0 +1,2 @@
+RENAME TABLE {$NAMESPACE}_xhpastview.xhpastview_parsetree
+ TO {$NAMESPACE}_xhpast.xhpast_parsetree;
diff --git a/resources/sql/autopatches/20151109.xhpast.db.2.sql b/resources/sql/autopatches/20151109.xhpast.db.2.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20151109.xhpast.db.2.sql
@@ -0,0 +1 @@
+DROP DATABASE {$NAMESPACE}_xhpastview;
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
@@ -3245,13 +3245,13 @@
'PhabricatorWorkingCopyDiscoveryTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyDiscoveryTestCase.php',
'PhabricatorWorkingCopyPullTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyPullTestCase.php',
'PhabricatorWorkingCopyTestCase' => 'applications/repository/engine/__tests__/PhabricatorWorkingCopyTestCase.php',
+ 'PhabricatorXHPASTDAO' => 'applications/phpast/storage/PhabricatorXHPASTDAO.php',
+ 'PhabricatorXHPASTParseTree' => 'applications/phpast/storage/PhabricatorXHPASTParseTree.php',
'PhabricatorXHPASTViewController' => 'applications/phpast/controller/PhabricatorXHPASTViewController.php',
- 'PhabricatorXHPASTViewDAO' => 'applications/phpast/storage/PhabricatorXHPASTViewDAO.php',
'PhabricatorXHPASTViewFrameController' => 'applications/phpast/controller/PhabricatorXHPASTViewFrameController.php',
'PhabricatorXHPASTViewFramesetController' => 'applications/phpast/controller/PhabricatorXHPASTViewFramesetController.php',
'PhabricatorXHPASTViewInputController' => 'applications/phpast/controller/PhabricatorXHPASTViewInputController.php',
'PhabricatorXHPASTViewPanelController' => 'applications/phpast/controller/PhabricatorXHPASTViewPanelController.php',
- 'PhabricatorXHPASTViewParseTree' => 'applications/phpast/storage/PhabricatorXHPASTViewParseTree.php',
'PhabricatorXHPASTViewRunController' => 'applications/phpast/controller/PhabricatorXHPASTViewRunController.php',
'PhabricatorXHPASTViewStreamController' => 'applications/phpast/controller/PhabricatorXHPASTViewStreamController.php',
'PhabricatorXHPASTViewTreeController' => 'applications/phpast/controller/PhabricatorXHPASTViewTreeController.php',
@@ -7534,13 +7534,13 @@
'PhabricatorWorkingCopyDiscoveryTestCase' => 'PhabricatorWorkingCopyTestCase',
'PhabricatorWorkingCopyPullTestCase' => 'PhabricatorWorkingCopyTestCase',
'PhabricatorWorkingCopyTestCase' => 'PhabricatorTestCase',
+ 'PhabricatorXHPASTDAO' => 'PhabricatorLiskDAO',
+ 'PhabricatorXHPASTParseTree' => 'PhabricatorXHPASTDAO',
'PhabricatorXHPASTViewController' => 'PhabricatorController',
- 'PhabricatorXHPASTViewDAO' => 'PhabricatorLiskDAO',
'PhabricatorXHPASTViewFrameController' => 'PhabricatorXHPASTViewController',
'PhabricatorXHPASTViewFramesetController' => 'PhabricatorXHPASTViewController',
'PhabricatorXHPASTViewInputController' => 'PhabricatorXHPASTViewPanelController',
'PhabricatorXHPASTViewPanelController' => 'PhabricatorXHPASTViewController',
- 'PhabricatorXHPASTViewParseTree' => 'PhabricatorXHPASTViewDAO',
'PhabricatorXHPASTViewRunController' => 'PhabricatorXHPASTViewController',
'PhabricatorXHPASTViewStreamController' => 'PhabricatorXHPASTViewPanelController',
'PhabricatorXHPASTViewTreeController' => 'PhabricatorXHPASTViewPanelController',
diff --git a/src/applications/phpast/controller/PhabricatorXHPASTViewPanelController.php b/src/applications/phpast/controller/PhabricatorXHPASTViewPanelController.php
--- a/src/applications/phpast/controller/PhabricatorXHPASTViewPanelController.php
+++ b/src/applications/phpast/controller/PhabricatorXHPASTViewPanelController.php
@@ -12,7 +12,7 @@
public function willProcessRequest(array $data) {
$this->id = $data['id'];
- $this->storageTree = id(new PhabricatorXHPASTViewParseTree())
+ $this->storageTree = id(new PhabricatorXHPASTParseTree())
->load($this->id);
if (!$this->storageTree) {
diff --git a/src/applications/phpast/controller/PhabricatorXHPASTViewRunController.php b/src/applications/phpast/controller/PhabricatorXHPASTViewRunController.php
--- a/src/applications/phpast/controller/PhabricatorXHPASTViewRunController.php
+++ b/src/applications/phpast/controller/PhabricatorXHPASTViewRunController.php
@@ -21,7 +21,7 @@
list($err, $stdout, $stderr) = $resolved;
- $storage_tree = id(new PhabricatorXHPASTViewParseTree())
+ $storage_tree = id(new PhabricatorXHPASTParseTree())
->setInput($source)
->setReturnCode($err)
->setStdout($stdout)
diff --git a/src/applications/phpast/storage/PhabricatorXHPASTDAO.php b/src/applications/phpast/storage/PhabricatorXHPASTDAO.php
new file mode 100644
--- /dev/null
+++ b/src/applications/phpast/storage/PhabricatorXHPASTDAO.php
@@ -0,0 +1,8 @@
+<?php
+
+abstract class PhabricatorXHPASTDAO extends PhabricatorLiskDAO {
+
+ public function getApplicationName() {
+ return 'xhpast';
+ }
+}
diff --git a/src/applications/phpast/storage/PhabricatorXHPASTViewParseTree.php b/src/applications/phpast/storage/PhabricatorXHPASTParseTree.php
rename from src/applications/phpast/storage/PhabricatorXHPASTViewParseTree.php
rename to src/applications/phpast/storage/PhabricatorXHPASTParseTree.php
--- a/src/applications/phpast/storage/PhabricatorXHPASTViewParseTree.php
+++ b/src/applications/phpast/storage/PhabricatorXHPASTParseTree.php
@@ -1,6 +1,6 @@
<?php
-final class PhabricatorXHPASTViewParseTree extends PhabricatorXHPASTViewDAO {
+final class PhabricatorXHPASTParseTree extends PhabricatorXHPASTDAO {
protected $authorPHID;
protected $input;
diff --git a/src/applications/phpast/storage/PhabricatorXHPASTViewDAO.php b/src/applications/phpast/storage/PhabricatorXHPASTViewDAO.php
deleted file mode 100644
--- a/src/applications/phpast/storage/PhabricatorXHPASTViewDAO.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-abstract class PhabricatorXHPASTViewDAO extends PhabricatorLiskDAO {
-
- public function getApplicationName() {
- return 'xhpastview';
- }
-}
diff --git a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
--- a/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
+++ b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php
@@ -79,7 +79,10 @@
),
'db.user' => array(),
'db.worker' => array(),
- 'db.xhpastview' => array(),
+ 'db.xhpast' => array(),
+ 'db.xhpastview' => array(
+ 'dead' => true,
+ ),
'db.cache' => array(),
'db.fact' => array(),
'db.ponder' => array(),

File Metadata

Mime Type
text/plain
Expires
May 9 2024, 8:15 PM (6 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6275465
Default Alt Text
D14442.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility