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 @@ -16,9 +16,6 @@ 'ArcanistBackoutWorkflow' => 'workflow/ArcanistBackoutWorkflow.php', 'ArcanistBaseCommitParser' => 'parser/ArcanistBaseCommitParser.php', 'ArcanistBaseCommitParserTestCase' => 'parser/__tests__/ArcanistBaseCommitParserTestCase.php', - 'ArcanistBaseTestResultParser' => 'unit/engine/ArcanistBaseTestResultParser.php', - 'ArcanistBaseUnitTestEngine' => 'unit/engine/ArcanistBaseUnitTestEngine.php', - 'ArcanistBaseWorkflow' => 'workflow/ArcanistBaseWorkflow.php', 'ArcanistBaseXHPASTLinter' => 'lint/linter/ArcanistBaseXHPASTLinter.php', 'ArcanistBookmarkWorkflow' => 'workflow/ArcanistBookmarkWorkflow.php', 'ArcanistBranchWorkflow' => 'workflow/ArcanistBranchWorkflow.php', @@ -168,6 +165,7 @@ 'ArcanistSvnHookPreCommitWorkflow' => 'workflow/ArcanistSvnHookPreCommitWorkflow.php', 'ArcanistTasksWorkflow' => 'workflow/ArcanistTasksWorkflow.php', 'ArcanistTestCase' => 'infrastructure/testing/ArcanistTestCase.php', + 'ArcanistTestResultParser' => 'unit/engine/ArcanistTestResultParser.php', 'ArcanistTextLinter' => 'lint/linter/ArcanistTextLinter.php', 'ArcanistTextLinterTestCase' => 'lint/linter/__tests__/ArcanistTextLinterTestCase.php', 'ArcanistTimeWorkflow' => 'workflow/ArcanistTimeWorkflow.php', @@ -175,6 +173,7 @@ 'ArcanistUncommittedChangesException' => 'exception/usage/ArcanistUncommittedChangesException.php', 'ArcanistUnitConsoleRenderer' => 'unit/renderer/ArcanistUnitConsoleRenderer.php', 'ArcanistUnitRenderer' => 'unit/renderer/ArcanistUnitRenderer.php', + 'ArcanistUnitTestEngine' => 'unit/engine/ArcanistUnitTestEngine.php', 'ArcanistUnitTestResult' => 'unit/ArcanistUnitTestResult.php', 'ArcanistUnitWorkflow' => 'workflow/ArcanistUnitWorkflow.php', 'ArcanistUpgradeWorkflow' => 'workflow/ArcanistUpgradeWorkflow.php', @@ -183,6 +182,7 @@ 'ArcanistUserAbortException' => 'exception/usage/ArcanistUserAbortException.php', 'ArcanistVersionWorkflow' => 'workflow/ArcanistVersionWorkflow.php', 'ArcanistWhichWorkflow' => 'workflow/ArcanistWhichWorkflow.php', + 'ArcanistWorkflow' => 'workflow/ArcanistWorkflow.php', 'ArcanistWorkingCopyIdentity' => 'workingcopyidentity/ArcanistWorkingCopyIdentity.php', 'ArcanistXHPASTLintNamingHook' => 'lint/linter/xhpast/ArcanistXHPASTLintNamingHook.php', 'ArcanistXHPASTLintNamingHookTestCase' => 'lint/linter/xhpast/__tests__/ArcanistXHPASTLintNamingHookTestCase.php', @@ -210,69 +210,68 @@ ), 'function' => array(), 'xmap' => array( - 'ArcanistAliasWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistAmendWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistAnoidWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistAliasWorkflow' => 'ArcanistWorkflow', + 'ArcanistAmendWorkflow' => 'ArcanistWorkflow', + 'ArcanistAnoidWorkflow' => 'ArcanistWorkflow', 'ArcanistArcanistLinterTestCase' => 'ArcanistLinterTestCase', - 'ArcanistBackoutWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistBackoutWorkflow' => 'ArcanistWorkflow', 'ArcanistBaseCommitParserTestCase' => 'ArcanistTestCase', - 'ArcanistBaseWorkflow' => 'Phobject', 'ArcanistBaseXHPASTLinter' => 'ArcanistFutureLinter', 'ArcanistBookmarkWorkflow' => 'ArcanistFeatureWorkflow', 'ArcanistBranchWorkflow' => 'ArcanistFeatureWorkflow', 'ArcanistBritishTestCase' => 'ArcanistTestCase', - 'ArcanistBrowseWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistBrowseWorkflow' => 'ArcanistWorkflow', 'ArcanistBundleTestCase' => 'ArcanistTestCase', 'ArcanistCSSLintLinter' => 'ArcanistExternalLinter', 'ArcanistCSSLintLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistCSharpLinter' => 'ArcanistLinter', - 'ArcanistCallConduitWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistCallConduitWorkflow' => 'ArcanistWorkflow', 'ArcanistCapabilityNotSupportedException' => 'Exception', 'ArcanistChmodLinter' => 'ArcanistLinter', 'ArcanistChooseInvalidRevisionException' => 'Exception', 'ArcanistChooseNoRevisionsException' => 'Exception', - 'ArcanistCloseRevisionWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistCloseWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistCloseRevisionWorkflow' => 'ArcanistWorkflow', + 'ArcanistCloseWorkflow' => 'ArcanistWorkflow', 'ArcanistClosureLinter' => 'ArcanistExternalLinter', 'ArcanistClosureLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistCoffeeLintLinter' => 'ArcanistExternalLinter', 'ArcanistCoffeeLintLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistCommentRemoverTestCase' => 'ArcanistTestCase', - 'ArcanistCommitWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistCommitWorkflow' => 'ArcanistWorkflow', 'ArcanistConduitLinter' => 'ArcanistLinter', 'ArcanistConfigurationDrivenLintEngine' => 'ArcanistLintEngine', - 'ArcanistCoverWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistCoverWorkflow' => 'ArcanistWorkflow', 'ArcanistCppcheckLinter' => 'ArcanistExternalLinter', 'ArcanistCppcheckLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistCpplintLinter' => 'ArcanistExternalLinter', 'ArcanistCpplintLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistDiffParserTestCase' => 'ArcanistTestCase', 'ArcanistDiffUtilsTestCase' => 'ArcanistTestCase', - 'ArcanistDiffWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistDiffWorkflow' => 'ArcanistWorkflow', 'ArcanistDifferentialCommitMessageParserException' => 'Exception', 'ArcanistDifferentialDependencyGraph' => 'AbstractDirectedGraph', - 'ArcanistDownloadWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistDownloadWorkflow' => 'ArcanistWorkflow', 'ArcanistEventType' => 'PhutilEventType', - 'ArcanistExportWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistExportWorkflow' => 'ArcanistWorkflow', 'ArcanistExternalLinter' => 'ArcanistFutureLinter', - 'ArcanistFeatureWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistFeatureWorkflow' => 'ArcanistWorkflow', 'ArcanistFilenameLinter' => 'ArcanistLinter', - 'ArcanistFlagWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistFlagWorkflow' => 'ArcanistWorkflow', 'ArcanistFlake8Linter' => 'ArcanistExternalLinter', 'ArcanistFlake8LinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistFutureLinter' => 'ArcanistLinter', 'ArcanistGeneratedLinter' => 'ArcanistLinter', - 'ArcanistGetConfigWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistGetConfigWorkflow' => 'ArcanistWorkflow', 'ArcanistGitAPI' => 'ArcanistRepositoryAPI', - 'ArcanistGitHookPreReceiveWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistGitHookPreReceiveWorkflow' => 'ArcanistWorkflow', 'ArcanistGoLintLinter' => 'ArcanistExternalLinter', 'ArcanistGoLintLinterTestCase' => 'ArcanistArcanistLinterTestCase', - 'ArcanistHelpWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistHelpWorkflow' => 'ArcanistWorkflow', 'ArcanistHgClientChannel' => 'PhutilProtocolChannel', 'ArcanistHgServerChannel' => 'PhutilProtocolChannel', 'ArcanistInfrastructureTestCase' => 'ArcanistTestCase', - 'ArcanistInlinesWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistInstallCertificateWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistInlinesWorkflow' => 'ArcanistWorkflow', + 'ArcanistInstallCertificateWorkflow' => 'ArcanistWorkflow', 'ArcanistJSHintLinter' => 'ArcanistExternalLinter', 'ArcanistJSHintLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistJSONLintLinter' => 'ArcanistExternalLinter', @@ -281,20 +280,20 @@ 'ArcanistJSONLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistJscsLinter' => 'ArcanistExternalLinter', 'ArcanistJscsLinterTestCase' => 'ArcanistArcanistLinterTestCase', - 'ArcanistLandWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistLandWorkflow' => 'ArcanistWorkflow', 'ArcanistLesscLinter' => 'ArcanistExternalLinter', 'ArcanistLesscLinterTestCase' => 'ArcanistArcanistLinterTestCase', - 'ArcanistLiberateWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistLiberateWorkflow' => 'ArcanistWorkflow', 'ArcanistLintCheckstyleXMLRenderer' => 'ArcanistLintRenderer', 'ArcanistLintConsoleRenderer' => 'ArcanistLintRenderer', 'ArcanistLintJSONRenderer' => 'ArcanistLintRenderer', 'ArcanistLintLikeCompilerRenderer' => 'ArcanistLintRenderer', 'ArcanistLintNoneRenderer' => 'ArcanistLintRenderer', 'ArcanistLintSummaryRenderer' => 'ArcanistLintRenderer', - 'ArcanistLintWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistLintWorkflow' => 'ArcanistWorkflow', 'ArcanistLinterTestCase' => 'ArcanistPhutilTestCase', - 'ArcanistLintersWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistListWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistLintersWorkflow' => 'ArcanistWorkflow', + 'ArcanistListWorkflow' => 'ArcanistWorkflow', 'ArcanistMercurialAPI' => 'ArcanistRepositoryAPI', 'ArcanistMercurialParserTestCase' => 'ArcanistTestCase', 'ArcanistMergeConflictLinter' => 'ArcanistLinter', @@ -306,10 +305,10 @@ 'ArcanistPEP8Linter' => 'ArcanistExternalLinter', 'ArcanistPEP8LinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistPHPCSLinterTestCase' => 'ArcanistArcanistLinterTestCase', - 'ArcanistPasteWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistPatchWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistPasteWorkflow' => 'ArcanistWorkflow', + 'ArcanistPatchWorkflow' => 'ArcanistWorkflow', 'ArcanistPhpcsLinter' => 'ArcanistExternalLinter', - 'ArcanistPhrequentWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistPhrequentWorkflow' => 'ArcanistWorkflow', 'ArcanistPhutilLibraryLinter' => 'ArcanistLinter', 'ArcanistPhutilTestCaseTestCase' => 'ArcanistPhutilTestCase', 'ArcanistPhutilTestSkippedException' => 'Exception', @@ -324,12 +323,12 @@ 'ArcanistPyLintLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistRepositoryAPIMiscTestCase' => 'ArcanistTestCase', 'ArcanistRepositoryAPIStateTestCase' => 'ArcanistTestCase', - 'ArcanistRevertWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistRevertWorkflow' => 'ArcanistWorkflow', 'ArcanistRubyLinter' => 'ArcanistExternalLinter', 'ArcanistRubyLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistScriptAndRegexLinter' => 'ArcanistLinter', - 'ArcanistSetConfigWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistShellCompleteWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistSetConfigWorkflow' => 'ArcanistWorkflow', + 'ArcanistShellCompleteWorkflow' => 'ArcanistWorkflow', 'ArcanistSingleLintEngine' => 'ArcanistLintEngine', 'ArcanistSpellingLinter' => 'ArcanistLinter', 'ArcanistSpellingLinterTestCase' => 'ArcanistArcanistLinterTestCase', @@ -337,22 +336,23 @@ 'ArcanistStopWorkflow' => 'ArcanistPhrequentWorkflow', 'ArcanistSubversionAPI' => 'ArcanistRepositoryAPI', 'ArcanistSubversionHookAPI' => 'ArcanistHookAPI', - 'ArcanistSvnHookPreCommitWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistTasksWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistSvnHookPreCommitWorkflow' => 'ArcanistWorkflow', + 'ArcanistTasksWorkflow' => 'ArcanistWorkflow', 'ArcanistTestCase' => 'ArcanistPhutilTestCase', 'ArcanistTextLinter' => 'ArcanistLinter', 'ArcanistTextLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistTimeWorkflow' => 'ArcanistPhrequentWorkflow', - 'ArcanistTodoWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistTodoWorkflow' => 'ArcanistWorkflow', 'ArcanistUncommittedChangesException' => 'ArcanistUsageException', 'ArcanistUnitConsoleRenderer' => 'ArcanistUnitRenderer', - 'ArcanistUnitWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistUpgradeWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistUploadWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistUnitWorkflow' => 'ArcanistWorkflow', + 'ArcanistUpgradeWorkflow' => 'ArcanistWorkflow', + 'ArcanistUploadWorkflow' => 'ArcanistWorkflow', 'ArcanistUsageException' => 'Exception', 'ArcanistUserAbortException' => 'ArcanistUsageException', - 'ArcanistVersionWorkflow' => 'ArcanistBaseWorkflow', - 'ArcanistWhichWorkflow' => 'ArcanistBaseWorkflow', + 'ArcanistVersionWorkflow' => 'ArcanistWorkflow', + 'ArcanistWhichWorkflow' => 'ArcanistWorkflow', + 'ArcanistWorkflow' => 'Phobject', 'ArcanistXHPASTLintNamingHookTestCase' => 'ArcanistTestCase', 'ArcanistXHPASTLintTestSwitchHook' => 'ArcanistXHPASTLintSwitchHook', 'ArcanistXHPASTLinter' => 'ArcanistBaseXHPASTLinter', @@ -361,17 +361,17 @@ 'ArcanistXMLLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'CSharpToolsTestEngine' => 'XUnitTestEngine', 'ComprehensiveLintEngine' => 'ArcanistLintEngine', - 'GoTestResultParser' => 'ArcanistBaseTestResultParser', + 'GoTestResultParser' => 'ArcanistTestResultParser', 'GoTestResultParserTestCase' => 'ArcanistTestCase', - 'NoseTestEngine' => 'ArcanistBaseUnitTestEngine', + 'NoseTestEngine' => 'ArcanistUnitTestEngine', 'PHPUnitTestEngineTestCase' => 'ArcanistTestCase', - 'PhpunitResultParser' => 'ArcanistBaseTestResultParser', - 'PhpunitTestEngine' => 'ArcanistBaseUnitTestEngine', - 'PhutilUnitTestEngine' => 'ArcanistBaseUnitTestEngine', + 'PhpunitResultParser' => 'ArcanistTestResultParser', + 'PhpunitTestEngine' => 'ArcanistUnitTestEngine', + 'PhutilUnitTestEngine' => 'ArcanistUnitTestEngine', 'PhutilUnitTestEngineTestCase' => 'ArcanistTestCase', - 'PytestTestEngine' => 'ArcanistBaseUnitTestEngine', + 'PytestTestEngine' => 'ArcanistUnitTestEngine', 'UnitTestableArcanistLintEngine' => 'ArcanistLintEngine', - 'XUnitTestEngine' => 'ArcanistBaseUnitTestEngine', + 'XUnitTestEngine' => 'ArcanistUnitTestEngine', 'XUnitTestResultParserTestCase' => 'ArcanistTestCase', ), )); diff --git a/src/configuration/ArcanistConfiguration.php b/src/configuration/ArcanistConfiguration.php --- a/src/configuration/ArcanistConfiguration.php +++ b/src/configuration/ArcanistConfiguration.php @@ -38,7 +38,7 @@ $workflows_by_name = array(); $workflows_by_class_name = id(new PhutilSymbolLoader()) - ->setAncestorClass('ArcanistBaseWorkflow') + ->setAncestorClass('ArcanistWorkflow') ->loadObjects(); foreach ($workflows_by_class_name as $class => $workflow) { $name = $workflow->getWorkflowName(); @@ -60,14 +60,11 @@ return (bool)$this->buildWorkflow($workflow); } - public function willRunWorkflow($command, ArcanistBaseWorkflow $workflow) { + public function willRunWorkflow($command, ArcanistWorkflow $workflow) { // This is a hook. } - public function didRunWorkflow( - $command, - ArcanistBaseWorkflow $workflow, - $err) { + public function didRunWorkflow($command, ArcanistWorkflow $workflow, $err) { // This is a hook. } diff --git a/src/unit/engine/ArcanistBaseTestResultParser.php b/src/unit/engine/ArcanistTestResultParser.php rename from src/unit/engine/ArcanistBaseTestResultParser.php rename to src/unit/engine/ArcanistTestResultParser.php --- a/src/unit/engine/ArcanistBaseTestResultParser.php +++ b/src/unit/engine/ArcanistTestResultParser.php @@ -1,9 +1,9 @@ getPaths(); diff --git a/src/unit/engine/PhpunitResultParser.php b/src/unit/engine/PhpunitResultParser.php --- a/src/unit/engine/PhpunitResultParser.php +++ b/src/unit/engine/PhpunitResultParser.php @@ -6,7 +6,7 @@ * For an example on how to integrate with your test engine, see * @{class:PhpunitTestEngine}. */ -final class PhpunitResultParser extends ArcanistBaseTestResultParser { +final class PhpunitResultParser extends ArcanistTestResultParser { /** * Parse test results from phpunit json report diff --git a/src/unit/engine/PhpunitTestEngine.php b/src/unit/engine/PhpunitTestEngine.php --- a/src/unit/engine/PhpunitTestEngine.php +++ b/src/unit/engine/PhpunitTestEngine.php @@ -3,7 +3,7 @@ /** * PHPUnit wrapper. */ -final class PhpunitTestEngine extends ArcanistBaseUnitTestEngine { +final class PhpunitTestEngine extends ArcanistUnitTestEngine { private $configFile; private $phpunitBinary = 'phpunit'; diff --git a/src/unit/engine/PhutilUnitTestEngine.php b/src/unit/engine/PhutilUnitTestEngine.php --- a/src/unit/engine/PhutilUnitTestEngine.php +++ b/src/unit/engine/PhutilUnitTestEngine.php @@ -3,7 +3,7 @@ /** * Very basic unit test engine which runs libphutil tests. */ -final class PhutilUnitTestEngine extends ArcanistBaseUnitTestEngine { +final class PhutilUnitTestEngine extends ArcanistUnitTestEngine { protected function supportsRunAllTests() { return true; diff --git a/src/unit/engine/PytestTestEngine.php b/src/unit/engine/PytestTestEngine.php --- a/src/unit/engine/PytestTestEngine.php +++ b/src/unit/engine/PytestTestEngine.php @@ -3,7 +3,7 @@ /** * Very basic 'py.test' unit test engine wrapper. */ -final class PytestTestEngine extends ArcanistBaseUnitTestEngine { +final class PytestTestEngine extends ArcanistUnitTestEngine { public function run() { $working_copy = $this->getWorkingCopy(); diff --git a/src/unit/engine/XUnitTestEngine.php b/src/unit/engine/XUnitTestEngine.php --- a/src/unit/engine/XUnitTestEngine.php +++ b/src/unit/engine/XUnitTestEngine.php @@ -9,7 +9,7 @@ * * @concrete-extensible */ -class XUnitTestEngine extends ArcanistBaseUnitTestEngine { +class XUnitTestEngine extends ArcanistUnitTestEngine { protected $runtimeEngine; protected $buildEngine; diff --git a/src/workflow/ArcanistAliasWorkflow.php b/src/workflow/ArcanistAliasWorkflow.php --- a/src/workflow/ArcanistAliasWorkflow.php +++ b/src/workflow/ArcanistAliasWorkflow.php @@ -3,7 +3,7 @@ /** * Manages aliases for commands with options. */ -final class ArcanistAliasWorkflow extends ArcanistBaseWorkflow { +final class ArcanistAliasWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'alias'; diff --git a/src/workflow/ArcanistAmendWorkflow.php b/src/workflow/ArcanistAmendWorkflow.php --- a/src/workflow/ArcanistAmendWorkflow.php +++ b/src/workflow/ArcanistAmendWorkflow.php @@ -3,7 +3,7 @@ /** * Synchronizes commit messages from Differential. */ -final class ArcanistAmendWorkflow extends ArcanistBaseWorkflow { +final class ArcanistAmendWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'amend'; diff --git a/src/workflow/ArcanistAnoidWorkflow.php b/src/workflow/ArcanistAnoidWorkflow.php --- a/src/workflow/ArcanistAnoidWorkflow.php +++ b/src/workflow/ArcanistAnoidWorkflow.php @@ -1,6 +1,6 @@ 'red', // Red diff --git a/src/workflow/ArcanistGetConfigWorkflow.php b/src/workflow/ArcanistGetConfigWorkflow.php --- a/src/workflow/ArcanistGetConfigWorkflow.php +++ b/src/workflow/ArcanistGetConfigWorkflow.php @@ -3,7 +3,7 @@ /** * Read configuration settings. */ -final class ArcanistGetConfigWorkflow extends ArcanistBaseWorkflow { +final class ArcanistGetConfigWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'get-config'; diff --git a/src/workflow/ArcanistGitHookPreReceiveWorkflow.php b/src/workflow/ArcanistGitHookPreReceiveWorkflow.php --- a/src/workflow/ArcanistGitHookPreReceiveWorkflow.php +++ b/src/workflow/ArcanistGitHookPreReceiveWorkflow.php @@ -3,7 +3,7 @@ /** * Installable as a git pre-receive hook. */ -final class ArcanistGitHookPreReceiveWorkflow extends ArcanistBaseWorkflow { +final class ArcanistGitHookPreReceiveWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'git-hook-pre-receive'; diff --git a/src/workflow/ArcanistHelpWorkflow.php b/src/workflow/ArcanistHelpWorkflow.php --- a/src/workflow/ArcanistHelpWorkflow.php +++ b/src/workflow/ArcanistHelpWorkflow.php @@ -3,7 +3,7 @@ /** * Seduces the reader with majestic prose. */ -final class ArcanistHelpWorkflow extends ArcanistBaseWorkflow { +final class ArcanistHelpWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'help'; diff --git a/src/workflow/ArcanistInlinesWorkflow.php b/src/workflow/ArcanistInlinesWorkflow.php --- a/src/workflow/ArcanistInlinesWorkflow.php +++ b/src/workflow/ArcanistInlinesWorkflow.php @@ -1,6 +1,6 @@ getConduit(); diff --git a/src/workflow/ArcanistRevertWorkflow.php b/src/workflow/ArcanistRevertWorkflow.php --- a/src/workflow/ArcanistRevertWorkflow.php +++ b/src/workflow/ArcanistRevertWorkflow.php @@ -3,7 +3,7 @@ /** * Redirects to `arc backout` workflow. */ -final class ArcanistRevertWorkflow extends ArcanistBaseWorkflow { +final class ArcanistRevertWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'revert'; diff --git a/src/workflow/ArcanistSetConfigWorkflow.php b/src/workflow/ArcanistSetConfigWorkflow.php --- a/src/workflow/ArcanistSetConfigWorkflow.php +++ b/src/workflow/ArcanistSetConfigWorkflow.php @@ -3,7 +3,7 @@ /** * Write configuration settings. */ -final class ArcanistSetConfigWorkflow extends ArcanistBaseWorkflow { +final class ArcanistSetConfigWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'set-config'; diff --git a/src/workflow/ArcanistShellCompleteWorkflow.php b/src/workflow/ArcanistShellCompleteWorkflow.php --- a/src/workflow/ArcanistShellCompleteWorkflow.php +++ b/src/workflow/ArcanistShellCompleteWorkflow.php @@ -3,7 +3,7 @@ /** * Powers shell-completion scripts. */ -final class ArcanistShellCompleteWorkflow extends ArcanistBaseWorkflow { +final class ArcanistShellCompleteWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'shell-complete'; diff --git a/src/workflow/ArcanistSvnHookPreCommitWorkflow.php b/src/workflow/ArcanistSvnHookPreCommitWorkflow.php --- a/src/workflow/ArcanistSvnHookPreCommitWorkflow.php +++ b/src/workflow/ArcanistSvnHookPreCommitWorkflow.php @@ -3,7 +3,7 @@ /** * Installable as an SVN "pre-commit" hook. */ -final class ArcanistSvnHookPreCommitWorkflow extends ArcanistBaseWorkflow { +final class ArcanistSvnHookPreCommitWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'svn-hook-pre-commit'; diff --git a/src/workflow/ArcanistTasksWorkflow.php b/src/workflow/ArcanistTasksWorkflow.php --- a/src/workflow/ArcanistTasksWorkflow.php +++ b/src/workflow/ArcanistTasksWorkflow.php @@ -3,7 +3,7 @@ /** * Displays User Tasks. */ -final class ArcanistTasksWorkflow extends ArcanistBaseWorkflow { +final class ArcanistTasksWorkflow extends ArcanistWorkflow { private $tasks; diff --git a/src/workflow/ArcanistTodoWorkflow.php b/src/workflow/ArcanistTodoWorkflow.php --- a/src/workflow/ArcanistTodoWorkflow.php +++ b/src/workflow/ArcanistTodoWorkflow.php @@ -3,7 +3,7 @@ /** * Quickly create a task. */ -final class ArcanistTodoWorkflow extends ArcanistBaseWorkflow { +final class ArcanistTodoWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'todo'; diff --git a/src/workflow/ArcanistUnitWorkflow.php b/src/workflow/ArcanistUnitWorkflow.php --- a/src/workflow/ArcanistUnitWorkflow.php +++ b/src/workflow/ArcanistUnitWorkflow.php @@ -3,7 +3,7 @@ /** * Runs unit tests which cover your changes. */ -final class ArcanistUnitWorkflow extends ArcanistBaseWorkflow { +final class ArcanistUnitWorkflow extends ArcanistWorkflow { const RESULT_OKAY = 0; const RESULT_UNSOUND = 1; @@ -133,10 +133,10 @@ $paths = $this->selectPathsForWorkflow($paths, $rev); if (!class_exists($engine_class) || - !is_subclass_of($engine_class, 'ArcanistBaseUnitTestEngine')) { + !is_subclass_of($engine_class, 'ArcanistUnitTestEngine')) { throw new ArcanistUsageException( "Configured unit test engine '{$engine_class}' is not a subclass of ". - "'ArcanistBaseUnitTestEngine'."); + "'ArcanistUnitTestEngine'."); } $this->engine = newv($engine_class, array()); diff --git a/src/workflow/ArcanistUpgradeWorkflow.php b/src/workflow/ArcanistUpgradeWorkflow.php --- a/src/workflow/ArcanistUpgradeWorkflow.php +++ b/src/workflow/ArcanistUpgradeWorkflow.php @@ -3,7 +3,7 @@ /** * Upgrade arcanist itself. */ -final class ArcanistUpgradeWorkflow extends ArcanistBaseWorkflow { +final class ArcanistUpgradeWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'upgrade'; diff --git a/src/workflow/ArcanistUploadWorkflow.php b/src/workflow/ArcanistUploadWorkflow.php --- a/src/workflow/ArcanistUploadWorkflow.php +++ b/src/workflow/ArcanistUploadWorkflow.php @@ -3,7 +3,7 @@ /** * Upload a file to Phabricator. */ -final class ArcanistUploadWorkflow extends ArcanistBaseWorkflow { +final class ArcanistUploadWorkflow extends ArcanistWorkflow { private $paths; private $json; diff --git a/src/workflow/ArcanistVersionWorkflow.php b/src/workflow/ArcanistVersionWorkflow.php --- a/src/workflow/ArcanistVersionWorkflow.php +++ b/src/workflow/ArcanistVersionWorkflow.php @@ -3,7 +3,7 @@ /** * Display the current version of Arcanist. */ -final class ArcanistVersionWorkflow extends ArcanistBaseWorkflow { +final class ArcanistVersionWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'version'; diff --git a/src/workflow/ArcanistWhichWorkflow.php b/src/workflow/ArcanistWhichWorkflow.php --- a/src/workflow/ArcanistWhichWorkflow.php +++ b/src/workflow/ArcanistWhichWorkflow.php @@ -3,7 +3,7 @@ /** * Show which revision or revisions are in the working copy. */ -final class ArcanistWhichWorkflow extends ArcanistBaseWorkflow { +final class ArcanistWhichWorkflow extends ArcanistWorkflow { public function getWorkflowName() { return 'which'; diff --git a/src/workflow/ArcanistBaseWorkflow.php b/src/workflow/ArcanistWorkflow.php rename from src/workflow/ArcanistBaseWorkflow.php rename to src/workflow/ArcanistWorkflow.php --- a/src/workflow/ArcanistBaseWorkflow.php +++ b/src/workflow/ArcanistWorkflow.php @@ -35,7 +35,7 @@ * * @stable */ -abstract class ArcanistBaseWorkflow extends Phobject { +abstract class ArcanistWorkflow extends Phobject { const COMMIT_DISABLE = 0; const COMMIT_ALLOW = 1;