diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index d8f6279d02..79e62bb652 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -23,8 +23,8 @@ phutil_register_library_map(array( 'AphrontContextBarView' => 'view/layout/AphrontContextBarView.php', 'AphrontController' => 'aphront/AphrontController.php', 'AphrontCrumbsView' => 'view/layout/AphrontCrumbsView.php', - 'AphrontDatabaseConnection' => 'storage/connection/AphrontDatabaseConnection.php', - 'AphrontDatabaseTransactionState' => 'storage/AphrontDatabaseTransactionState.php', + 'AphrontDatabaseConnection' => 'infrastructure/storage/connection/AphrontDatabaseConnection.php', + 'AphrontDatabaseTransactionState' => 'infrastructure/storage/connection/AphrontDatabaseTransactionState.php', 'AphrontDefaultApplicationConfiguration' => 'aphront/configuration/AphrontDefaultApplicationConfiguration.php', 'AphrontDialogResponse' => 'aphront/response/AphrontDialogResponse.php', 'AphrontDialogView' => 'view/AphrontDialogView.php', @@ -60,8 +60,8 @@ phutil_register_library_map(array( 'AphrontHeadsupActionView' => 'view/layout/headsup/AphrontHeadsupActionView.php', 'AphrontHeadsupView' => 'view/layout/headsup/AphrontHeadsupView.php', 'AphrontIDPagerView' => 'view/control/AphrontIDPagerView.php', - 'AphrontIsolatedDatabaseConnection' => 'storage/connection/AphrontIsolatedDatabaseConnection.php', - 'AphrontIsolatedDatabaseConnectionTestCase' => 'storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php', + 'AphrontIsolatedDatabaseConnection' => 'infrastructure/storage/connection/AphrontIsolatedDatabaseConnection.php', + 'AphrontIsolatedDatabaseConnectionTestCase' => 'infrastructure/storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php', 'AphrontIsolatedHTTPSink' => 'aphront/sink/AphrontIsolatedHTTPSink.php', 'AphrontJSONResponse' => 'aphront/response/AphrontJSONResponse.php', 'AphrontJavelinView' => 'view/AphrontJavelinView.php', @@ -69,10 +69,10 @@ phutil_register_library_map(array( 'AphrontListFilterView' => 'view/layout/AphrontListFilterView.php', 'AphrontMiniPanelView' => 'view/layout/AphrontMiniPanelView.php', 'AphrontMoreView' => 'view/layout/AphrontMoreView.php', - 'AphrontMySQLDatabaseConnection' => 'storage/connection/mysql/AphrontMySQLDatabaseConnection.php', - 'AphrontMySQLDatabaseConnectionBase' => 'storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php', - 'AphrontMySQLDatabaseConnectionTestCase' => 'storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php', - 'AphrontMySQLiDatabaseConnection' => 'storage/connection/mysql/AphrontMySQLiDatabaseConnection.php', + 'AphrontMySQLDatabaseConnection' => 'infrastructure/storage/connection/mysql/AphrontMySQLDatabaseConnection.php', + 'AphrontMySQLDatabaseConnectionBase' => 'infrastructure/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php', + 'AphrontMySQLDatabaseConnectionTestCase' => 'infrastructure/storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php', + 'AphrontMySQLiDatabaseConnection' => 'infrastructure/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php', 'AphrontNullView' => 'view/AphrontNullView.php', 'AphrontPHPHTTPSink' => 'aphront/sink/AphrontPHPHTTPSink.php', 'AphrontPageView' => 'view/page/AphrontPageView.php', @@ -80,17 +80,17 @@ phutil_register_library_map(array( 'AphrontPanelView' => 'view/layout/AphrontPanelView.php', 'AphrontPlainTextResponse' => 'aphront/response/AphrontPlainTextResponse.php', 'AphrontProxyResponse' => 'aphront/response/AphrontProxyResponse.php', - 'AphrontQueryAccessDeniedException' => 'storage/exception/AphrontQueryAccessDeniedException.php', - 'AphrontQueryConnectionException' => 'storage/exception/AphrontQueryConnectionException.php', - 'AphrontQueryConnectionLostException' => 'storage/exception/AphrontQueryConnectionLostException.php', - 'AphrontQueryCountException' => 'storage/exception/AphrontQueryCountException.php', - 'AphrontQueryDeadlockException' => 'storage/exception/AphrontQueryDeadlockException.php', - 'AphrontQueryDuplicateKeyException' => 'storage/exception/AphrontQueryDuplicateKeyException.php', - 'AphrontQueryException' => 'storage/exception/AphrontQueryException.php', - 'AphrontQueryObjectMissingException' => 'storage/exception/AphrontQueryObjectMissingException.php', - 'AphrontQueryParameterException' => 'storage/exception/AphrontQueryParameterException.php', - 'AphrontQueryRecoverableException' => 'storage/exception/AphrontQueryRecoverableException.php', - 'AphrontQuerySchemaException' => 'storage/exception/AphrontQuerySchemaException.php', + 'AphrontQueryAccessDeniedException' => 'infrastructure/storage/exception/AphrontQueryAccessDeniedException.php', + 'AphrontQueryConnectionException' => 'infrastructure/storage/exception/AphrontQueryConnectionException.php', + 'AphrontQueryConnectionLostException' => 'infrastructure/storage/exception/AphrontQueryConnectionLostException.php', + 'AphrontQueryCountException' => 'infrastructure/storage/exception/AphrontQueryCountException.php', + 'AphrontQueryDeadlockException' => 'infrastructure/storage/exception/AphrontQueryDeadlockException.php', + 'AphrontQueryDuplicateKeyException' => 'infrastructure/storage/exception/AphrontQueryDuplicateKeyException.php', + 'AphrontQueryException' => 'infrastructure/storage/exception/AphrontQueryException.php', + 'AphrontQueryObjectMissingException' => 'infrastructure/storage/exception/AphrontQueryObjectMissingException.php', + 'AphrontQueryParameterException' => 'infrastructure/storage/exception/AphrontQueryParameterException.php', + 'AphrontQueryRecoverableException' => 'infrastructure/storage/exception/AphrontQueryRecoverableException.php', + 'AphrontQuerySchemaException' => 'infrastructure/storage/exception/AphrontQuerySchemaException.php', 'AphrontRedirectException' => 'aphront/exception/AphrontRedirectException.php', 'AphrontRedirectResponse' => 'aphront/response/AphrontRedirectResponse.php', 'AphrontReloadResponse' => 'aphront/response/AphrontReloadResponse.php', @@ -215,8 +215,8 @@ phutil_register_library_map(array( 'DarkConsoleServicesPlugin' => 'aphront/console/plugin/DarkConsoleServicesPlugin.php', 'DarkConsoleXHProfPlugin' => 'aphront/console/plugin/DarkConsoleXHProfPlugin.php', 'DarkConsoleXHProfPluginAPI' => 'aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php', - 'DatabaseConfigurationProvider' => 'applications/base/storage/configuration/DatabaseConfigurationProvider.php', - 'DefaultDatabaseConfigurationProvider' => 'applications/base/storage/configuration/DefaultDatabaseConfigurationProvider.php', + 'DatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DatabaseConfigurationProvider.php', + 'DefaultDatabaseConfigurationProvider' => 'infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php', 'DifferentialAction' => 'applications/differential/constants/DifferentialAction.php', 'DifferentialActionHasNoEffectException' => 'applications/differential/exception/DifferentialActionHasNoEffectException.php', 'DifferentialAddCommentView' => 'applications/differential/view/DifferentialAddCommentView.php', @@ -483,13 +483,13 @@ phutil_register_library_map(array( 'JavelinReactorExample' => 'applications/uiexample/examples/JavelinReactorExample.php', 'JavelinViewExample' => 'applications/uiexample/examples/JavelinViewExample.php', 'JavelinViewExampleServerView' => 'applications/uiexample/examples/JavelinViewExampleServerView.php', - 'LiskDAO' => 'storage/lisk/LiskDAO.php', - 'LiskDAOSet' => 'storage/lisk/LiskDAOSet.php', - 'LiskEphemeralObjectException' => 'storage/lisk/LiskEphemeralObjectException.php', - 'LiskFixtureTestCase' => 'storage/lisk/__tests__/LiskFixtureTestCase.php', - 'LiskIsolationTestCase' => 'storage/lisk/__tests__/LiskIsolationTestCase.php', - 'LiskIsolationTestDAO' => 'storage/lisk/__tests__/LiskIsolationTestDAO.php', - 'LiskIsolationTestDAOException' => 'storage/lisk/__tests__/LiskIsolationTestDAOException.php', + 'LiskDAO' => 'infrastructure/storage/lisk/LiskDAO.php', + 'LiskDAOSet' => 'infrastructure/storage/lisk/LiskDAOSet.php', + 'LiskEphemeralObjectException' => 'infrastructure/storage/lisk/LiskEphemeralObjectException.php', + 'LiskFixtureTestCase' => 'infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php', + 'LiskIsolationTestCase' => 'infrastructure/storage/lisk/__tests__/LiskIsolationTestCase.php', + 'LiskIsolationTestDAO' => 'infrastructure/storage/lisk/__tests__/LiskIsolationTestDAO.php', + 'LiskIsolationTestDAOException' => 'infrastructure/storage/lisk/__tests__/LiskIsolationTestDAOException.php', 'ManiphestAction' => 'applications/maniphest/constants/ManiphestAction.php', 'ManiphestAuxiliaryFieldDefaultSpecification' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldDefaultSpecification.php', 'ManiphestAuxiliaryFieldSpecification' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldSpecification.php', @@ -560,7 +560,7 @@ phutil_register_library_map(array( 'PhabricatorAuditStatusConstants' => 'applications/audit/constants/PhabricatorAuditStatusConstants.php', 'PhabricatorAuthController' => 'applications/auth/controller/PhabricatorAuthController.php', 'PhabricatorBaseEnglishTranslation' => 'infrastructure/internationalization/PhabricatorBaseEnglishTranslation.php', - 'PhabricatorBuiltinPatchList' => 'infrastructure/setup/sql/PhabricatorBuiltinPatchList.php', + 'PhabricatorBuiltinPatchList' => 'infrastructure/storage/patch/PhabricatorBuiltinPatchList.php', 'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/PhabricatorCalendarBrowseController.php', 'PhabricatorCalendarController' => 'applications/calendar/controller/PhabricatorCalendarController.php', 'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php', @@ -720,7 +720,7 @@ phutil_register_library_map(array( 'PhabricatorLDAPRegistrationController' => 'applications/auth/controller/PhabricatorLDAPRegistrationController.php', 'PhabricatorLDAPUnlinkController' => 'applications/auth/controller/PhabricatorLDAPUnlinkController.php', 'PhabricatorLintEngine' => 'infrastructure/lint/PhabricatorLintEngine.php', - 'PhabricatorLiskDAO' => 'applications/base/storage/PhabricatorLiskDAO.php', + 'PhabricatorLiskDAO' => 'infrastructure/storage/lisk/PhabricatorLiskDAO.php', 'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php', 'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php', 'PhabricatorLoginController' => 'applications/auth/controller/PhabricatorLoginController.php', @@ -917,7 +917,7 @@ phutil_register_library_map(array( 'PhabricatorRepositoryTestCase' => 'applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php', 'PhabricatorRepositoryType' => 'applications/repository/constants/PhabricatorRepositoryType.php', 'PhabricatorS3FileStorageEngine' => 'applications/files/engine/PhabricatorS3FileStorageEngine.php', - 'PhabricatorSQLPatchList' => 'infrastructure/setup/sql/PhabricatorSQLPatchList.php', + 'PhabricatorSQLPatchList' => 'infrastructure/storage/patch/PhabricatorSQLPatchList.php', 'PhabricatorScopedEnv' => 'infrastructure/PhabricatorScopedEnv.php', 'PhabricatorSearchAbstractDocument' => 'applications/search/index/PhabricatorSearchAbstractDocument.php', 'PhabricatorSearchAttachController' => 'applications/search/controller/PhabricatorSearchAttachController.php', @@ -960,14 +960,14 @@ phutil_register_library_map(array( 'PhabricatorStandardPageView' => 'view/page/PhabricatorStandardPageView.php', 'PhabricatorStatusController' => 'applications/status/PhabricatorStatusController.php', 'PhabricatorStorageFixtureScopeGuard' => 'infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php', - 'PhabricatorStorageManagementAPI' => 'infrastructure/setup/storage/PhabricatorStorageManagementAPI.php', - 'PhabricatorStorageManagementDatabasesWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementDatabasesWorkflow.php', - 'PhabricatorStorageManagementDestroyWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementDestroyWorkflow.php', - 'PhabricatorStorageManagementDumpWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementDumpWorkflow.php', - 'PhabricatorStorageManagementStatusWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementStatusWorkflow.php', - 'PhabricatorStorageManagementUpgradeWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementUpgradeWorkflow.php', - 'PhabricatorStorageManagementWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementWorkflow.php', - 'PhabricatorStoragePatch' => 'infrastructure/setup/storage/PhabricatorStoragePatch.php', + 'PhabricatorStorageManagementAPI' => 'infrastructure/storage/management/PhabricatorStorageManagementAPI.php', + 'PhabricatorStorageManagementDatabasesWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php', + 'PhabricatorStorageManagementDestroyWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php', + 'PhabricatorStorageManagementDumpWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php', + 'PhabricatorStorageManagementStatusWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementStatusWorkflow.php', + 'PhabricatorStorageManagementUpgradeWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php', + 'PhabricatorStorageManagementWorkflow' => 'infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php', + 'PhabricatorStoragePatch' => 'infrastructure/storage/management/PhabricatorStoragePatch.php', 'PhabricatorSymbolNameLinter' => 'infrastructure/lint/hook/PhabricatorSymbolNameLinter.php', 'PhabricatorSyntaxHighlighter' => 'infrastructure/markup/PhabricatorSyntaxHighlighter.php', 'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php', @@ -1072,13 +1072,13 @@ phutil_register_library_map(array( 'PhrictionEditController' => 'applications/phriction/controller/PhrictionEditController.php', 'PhrictionHistoryController' => 'applications/phriction/controller/PhrictionHistoryController.php', 'PhrictionListController' => 'applications/phriction/controller/PhrictionListController.php', - 'QueryFormattingTestCase' => 'storage/__tests__/QueryFormattingTestCase.php', + 'QueryFormattingTestCase' => 'infrastructure/storage/query/__tests__/QueryFormattingTestCase.php', ), 'function' => array( '_phabricator_date_format' => 'view/viewutils.php', - '_qsprintf_check_scalar_type' => 'storage/qsprintf.php', - '_qsprintf_check_type' => 'storage/qsprintf.php', + '_qsprintf_check_scalar_type' => 'infrastructure/storage/query/qsprintf.php', + '_qsprintf_check_type' => 'infrastructure/storage/query/qsprintf.php', 'celerity_generate_unique_node_id' => 'infrastructure/celerity/api.php', 'celerity_get_resource_uri' => 'infrastructure/celerity/api.php', 'celerity_register_resource_map' => 'infrastructure/celerity/map.php', @@ -1097,15 +1097,15 @@ phutil_register_library_map(array( 'phabricator_time' => 'view/viewutils.php', 'phid_get_type' => 'applications/phid/utils.php', 'phid_group_by_type' => 'applications/phid/utils.php', - 'qsprintf' => 'storage/qsprintf.php', - 'queryfx' => 'storage/queryfx.php', - 'queryfx_all' => 'storage/queryfx.php', - 'queryfx_one' => 'storage/queryfx.php', + 'qsprintf' => 'infrastructure/storage/query/qsprintf.php', + 'queryfx' => 'infrastructure/storage/query/queryfx.php', + 'queryfx_all' => 'infrastructure/storage/query/queryfx.php', + 'queryfx_one' => 'infrastructure/storage/query/queryfx.php', 'require_celerity_resource' => 'infrastructure/celerity/api.php', - 'vqsprintf' => 'storage/qsprintf.php', - 'vqueryfx' => 'storage/queryfx.php', - 'vqueryfx_all' => 'storage/queryfx.php', - 'xsprintf_query' => 'storage/qsprintf.php', + 'vqsprintf' => 'infrastructure/storage/query/qsprintf.php', + 'vqueryfx' => 'infrastructure/storage/query/queryfx.php', + 'vqueryfx_all' => 'infrastructure/storage/query/queryfx.php', + 'xsprintf_query' => 'infrastructure/storage/query/qsprintf.php', ), 'xmap' => array( diff --git a/src/applications/base/storage/configuration/DatabaseConfigurationProvider.php b/src/infrastructure/storage/configuration/DatabaseConfigurationProvider.php similarity index 100% rename from src/applications/base/storage/configuration/DatabaseConfigurationProvider.php rename to src/infrastructure/storage/configuration/DatabaseConfigurationProvider.php diff --git a/src/applications/base/storage/configuration/DefaultDatabaseConfigurationProvider.php b/src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php similarity index 100% rename from src/applications/base/storage/configuration/DefaultDatabaseConfigurationProvider.php rename to src/infrastructure/storage/configuration/DefaultDatabaseConfigurationProvider.php diff --git a/src/storage/connection/AphrontDatabaseConnection.php b/src/infrastructure/storage/connection/AphrontDatabaseConnection.php similarity index 100% rename from src/storage/connection/AphrontDatabaseConnection.php rename to src/infrastructure/storage/connection/AphrontDatabaseConnection.php diff --git a/src/storage/AphrontDatabaseTransactionState.php b/src/infrastructure/storage/connection/AphrontDatabaseTransactionState.php similarity index 100% rename from src/storage/AphrontDatabaseTransactionState.php rename to src/infrastructure/storage/connection/AphrontDatabaseTransactionState.php diff --git a/src/storage/connection/AphrontIsolatedDatabaseConnection.php b/src/infrastructure/storage/connection/AphrontIsolatedDatabaseConnection.php similarity index 100% rename from src/storage/connection/AphrontIsolatedDatabaseConnection.php rename to src/infrastructure/storage/connection/AphrontIsolatedDatabaseConnection.php diff --git a/src/storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php b/src/infrastructure/storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php similarity index 100% rename from src/storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php rename to src/infrastructure/storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php diff --git a/src/storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php b/src/infrastructure/storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php similarity index 100% rename from src/storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php rename to src/infrastructure/storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php diff --git a/src/storage/connection/mysql/AphrontMySQLDatabaseConnection.php b/src/infrastructure/storage/connection/mysql/AphrontMySQLDatabaseConnection.php similarity index 100% rename from src/storage/connection/mysql/AphrontMySQLDatabaseConnection.php rename to src/infrastructure/storage/connection/mysql/AphrontMySQLDatabaseConnection.php diff --git a/src/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php b/src/infrastructure/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php similarity index 100% rename from src/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php rename to src/infrastructure/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php diff --git a/src/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php b/src/infrastructure/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php similarity index 100% rename from src/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php rename to src/infrastructure/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php diff --git a/src/storage/exception/AphrontQueryAccessDeniedException.php b/src/infrastructure/storage/exception/AphrontQueryAccessDeniedException.php similarity index 100% rename from src/storage/exception/AphrontQueryAccessDeniedException.php rename to src/infrastructure/storage/exception/AphrontQueryAccessDeniedException.php diff --git a/src/storage/exception/AphrontQueryConnectionException.php b/src/infrastructure/storage/exception/AphrontQueryConnectionException.php similarity index 100% rename from src/storage/exception/AphrontQueryConnectionException.php rename to src/infrastructure/storage/exception/AphrontQueryConnectionException.php diff --git a/src/storage/exception/AphrontQueryConnectionLostException.php b/src/infrastructure/storage/exception/AphrontQueryConnectionLostException.php similarity index 100% rename from src/storage/exception/AphrontQueryConnectionLostException.php rename to src/infrastructure/storage/exception/AphrontQueryConnectionLostException.php diff --git a/src/storage/exception/AphrontQueryCountException.php b/src/infrastructure/storage/exception/AphrontQueryCountException.php similarity index 100% rename from src/storage/exception/AphrontQueryCountException.php rename to src/infrastructure/storage/exception/AphrontQueryCountException.php diff --git a/src/storage/exception/AphrontQueryDeadlockException.php b/src/infrastructure/storage/exception/AphrontQueryDeadlockException.php similarity index 100% rename from src/storage/exception/AphrontQueryDeadlockException.php rename to src/infrastructure/storage/exception/AphrontQueryDeadlockException.php diff --git a/src/storage/exception/AphrontQueryDuplicateKeyException.php b/src/infrastructure/storage/exception/AphrontQueryDuplicateKeyException.php similarity index 100% rename from src/storage/exception/AphrontQueryDuplicateKeyException.php rename to src/infrastructure/storage/exception/AphrontQueryDuplicateKeyException.php diff --git a/src/storage/exception/AphrontQueryException.php b/src/infrastructure/storage/exception/AphrontQueryException.php similarity index 100% rename from src/storage/exception/AphrontQueryException.php rename to src/infrastructure/storage/exception/AphrontQueryException.php diff --git a/src/storage/exception/AphrontQueryObjectMissingException.php b/src/infrastructure/storage/exception/AphrontQueryObjectMissingException.php similarity index 100% rename from src/storage/exception/AphrontQueryObjectMissingException.php rename to src/infrastructure/storage/exception/AphrontQueryObjectMissingException.php diff --git a/src/storage/exception/AphrontQueryParameterException.php b/src/infrastructure/storage/exception/AphrontQueryParameterException.php similarity index 100% rename from src/storage/exception/AphrontQueryParameterException.php rename to src/infrastructure/storage/exception/AphrontQueryParameterException.php diff --git a/src/storage/exception/AphrontQueryRecoverableException.php b/src/infrastructure/storage/exception/AphrontQueryRecoverableException.php similarity index 100% rename from src/storage/exception/AphrontQueryRecoverableException.php rename to src/infrastructure/storage/exception/AphrontQueryRecoverableException.php diff --git a/src/storage/exception/AphrontQuerySchemaException.php b/src/infrastructure/storage/exception/AphrontQuerySchemaException.php similarity index 100% rename from src/storage/exception/AphrontQuerySchemaException.php rename to src/infrastructure/storage/exception/AphrontQuerySchemaException.php diff --git a/src/storage/lisk/LiskDAO.php b/src/infrastructure/storage/lisk/LiskDAO.php similarity index 100% rename from src/storage/lisk/LiskDAO.php rename to src/infrastructure/storage/lisk/LiskDAO.php diff --git a/src/storage/lisk/LiskDAOSet.php b/src/infrastructure/storage/lisk/LiskDAOSet.php similarity index 100% rename from src/storage/lisk/LiskDAOSet.php rename to src/infrastructure/storage/lisk/LiskDAOSet.php diff --git a/src/storage/lisk/LiskEphemeralObjectException.php b/src/infrastructure/storage/lisk/LiskEphemeralObjectException.php similarity index 100% rename from src/storage/lisk/LiskEphemeralObjectException.php rename to src/infrastructure/storage/lisk/LiskEphemeralObjectException.php diff --git a/src/applications/base/storage/PhabricatorLiskDAO.php b/src/infrastructure/storage/lisk/PhabricatorLiskDAO.php similarity index 100% rename from src/applications/base/storage/PhabricatorLiskDAO.php rename to src/infrastructure/storage/lisk/PhabricatorLiskDAO.php diff --git a/src/storage/lisk/__tests__/LiskFixtureTestCase.php b/src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php similarity index 100% rename from src/storage/lisk/__tests__/LiskFixtureTestCase.php rename to src/infrastructure/storage/lisk/__tests__/LiskFixtureTestCase.php diff --git a/src/storage/lisk/__tests__/LiskIsolationTestCase.php b/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestCase.php similarity index 100% rename from src/storage/lisk/__tests__/LiskIsolationTestCase.php rename to src/infrastructure/storage/lisk/__tests__/LiskIsolationTestCase.php diff --git a/src/storage/lisk/__tests__/LiskIsolationTestDAO.php b/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestDAO.php similarity index 100% rename from src/storage/lisk/__tests__/LiskIsolationTestDAO.php rename to src/infrastructure/storage/lisk/__tests__/LiskIsolationTestDAO.php diff --git a/src/storage/lisk/__tests__/LiskIsolationTestDAOException.php b/src/infrastructure/storage/lisk/__tests__/LiskIsolationTestDAOException.php similarity index 100% rename from src/storage/lisk/__tests__/LiskIsolationTestDAOException.php rename to src/infrastructure/storage/lisk/__tests__/LiskIsolationTestDAOException.php diff --git a/src/infrastructure/setup/storage/PhabricatorStorageManagementAPI.php b/src/infrastructure/storage/management/PhabricatorStorageManagementAPI.php similarity index 100% rename from src/infrastructure/setup/storage/PhabricatorStorageManagementAPI.php rename to src/infrastructure/storage/management/PhabricatorStorageManagementAPI.php diff --git a/src/infrastructure/setup/storage/PhabricatorStoragePatch.php b/src/infrastructure/storage/management/PhabricatorStoragePatch.php similarity index 100% rename from src/infrastructure/setup/storage/PhabricatorStoragePatch.php rename to src/infrastructure/storage/management/PhabricatorStoragePatch.php diff --git a/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDatabasesWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php similarity index 100% rename from src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDatabasesWorkflow.php rename to src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDatabasesWorkflow.php diff --git a/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDestroyWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php similarity index 100% rename from src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDestroyWorkflow.php rename to src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDestroyWorkflow.php diff --git a/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php similarity index 100% rename from src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDumpWorkflow.php rename to src/infrastructure/storage/management/workflow/PhabricatorStorageManagementDumpWorkflow.php diff --git a/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementStatusWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementStatusWorkflow.php similarity index 100% rename from src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementStatusWorkflow.php rename to src/infrastructure/storage/management/workflow/PhabricatorStorageManagementStatusWorkflow.php diff --git a/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementUpgradeWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php similarity index 100% rename from src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementUpgradeWorkflow.php rename to src/infrastructure/storage/management/workflow/PhabricatorStorageManagementUpgradeWorkflow.php diff --git a/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementWorkflow.php b/src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php similarity index 100% rename from src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementWorkflow.php rename to src/infrastructure/storage/management/workflow/PhabricatorStorageManagementWorkflow.php diff --git a/src/infrastructure/setup/sql/PhabricatorBuiltinPatchList.php b/src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php similarity index 100% rename from src/infrastructure/setup/sql/PhabricatorBuiltinPatchList.php rename to src/infrastructure/storage/patch/PhabricatorBuiltinPatchList.php diff --git a/src/infrastructure/setup/sql/PhabricatorSQLPatchList.php b/src/infrastructure/storage/patch/PhabricatorSQLPatchList.php similarity index 100% rename from src/infrastructure/setup/sql/PhabricatorSQLPatchList.php rename to src/infrastructure/storage/patch/PhabricatorSQLPatchList.php diff --git a/src/storage/__tests__/QueryFormattingTestCase.php b/src/infrastructure/storage/query/__tests__/QueryFormattingTestCase.php similarity index 100% rename from src/storage/__tests__/QueryFormattingTestCase.php rename to src/infrastructure/storage/query/__tests__/QueryFormattingTestCase.php diff --git a/src/storage/qsprintf.php b/src/infrastructure/storage/query/qsprintf.php similarity index 100% rename from src/storage/qsprintf.php rename to src/infrastructure/storage/query/qsprintf.php diff --git a/src/storage/queryfx.php b/src/infrastructure/storage/query/queryfx.php similarity index 100% rename from src/storage/queryfx.php rename to src/infrastructure/storage/query/queryfx.php