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 @@ -92,7 +92,6 @@ 'AphrontView' => 'view/AphrontView.php', 'AphrontWebpageResponse' => 'aphront/response/AphrontWebpageResponse.php', 'AuditActionMenuEventListener' => 'applications/audit/events/AuditActionMenuEventListener.php', - 'BuildStepImplementation' => 'applications/harbormaster/step/BuildStepImplementation.php', 'CalendarColors' => 'applications/calendar/constants/CalendarColors.php', 'CalendarConstants' => 'applications/calendar/constants/CalendarConstants.php', 'CalendarTimeUtil' => 'applications/calendar/util/CalendarTimeUtil.php', @@ -715,6 +714,7 @@ 'HarbormasterBuildStepCoreCustomField' => 'applications/harbormaster/customfield/HarbormasterBuildStepCoreCustomField.php', 'HarbormasterBuildStepCustomField' => 'applications/harbormaster/customfield/HarbormasterBuildStepCustomField.php', 'HarbormasterBuildStepEditor' => 'applications/harbormaster/editor/HarbormasterBuildStepEditor.php', + 'HarbormasterBuildStepImplementation' => 'applications/harbormaster/step/HarbormasterBuildStepImplementation.php', 'HarbormasterBuildStepQuery' => 'applications/harbormaster/query/HarbormasterBuildStepQuery.php', 'HarbormasterBuildStepTransaction' => 'applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php', 'HarbormasterBuildStepTransactionQuery' => 'applications/harbormaster/query/HarbormasterBuildStepTransactionQuery.php', @@ -2663,7 +2663,7 @@ 'CelerityResourceGraph' => 'AbstractDirectedGraph', 'CelerityResourceTransformerTestCase' => 'PhabricatorTestCase', 'CelerityResourcesOnDisk' => 'CelerityPhysicalResources', - 'CommandBuildStepImplementation' => 'BuildStepImplementation', + 'CommandBuildStepImplementation' => 'HarbormasterBuildStepImplementation', 'ConduitAPIMethod' => array( 0 => 'Phobject', @@ -3353,7 +3353,7 @@ 'HarbormasterCapabilityManagePlans' => 'PhabricatorPolicyCapability', 'HarbormasterController' => 'PhabricatorController', 'HarbormasterDAO' => 'PhabricatorLiskDAO', - 'HarbormasterHTTPRequestBuildStepImplementation' => 'BuildStepImplementation', + 'HarbormasterHTTPRequestBuildStepImplementation' => 'HarbormasterBuildStepImplementation', 'HarbormasterManagementBuildWorkflow' => 'HarbormasterManagementWorkflow', 'HarbormasterManagementWorkflow' => 'PhabricatorManagementWorkflow', 'HarbormasterObject' => 'HarbormasterDAO', @@ -3381,7 +3381,7 @@ 'HarbormasterStepDeleteController' => 'HarbormasterController', 'HarbormasterStepEditController' => 'HarbormasterController', 'HarbormasterTargetWorker' => 'HarbormasterWorker', - 'HarbormasterThrowExceptionBuildStep' => 'BuildStepImplementation', + 'HarbormasterThrowExceptionBuildStep' => 'HarbormasterBuildStepImplementation', 'HarbormasterUIEventListener' => 'PhabricatorEventListener', 'HarbormasterWorker' => 'PhabricatorWorker', 'HeraldAction' => 'HeraldDAO', @@ -3448,7 +3448,7 @@ 'JavelinUIExample' => 'PhabricatorUIExample', 'JavelinViewExample' => 'PhabricatorUIExample', 'JavelinViewExampleServerView' => 'AphrontView', - 'LeaseHostBuildStepImplementation' => 'BuildStepImplementation', + 'LeaseHostBuildStepImplementation' => 'HarbormasterBuildStepImplementation', 'LegalpadCapabilityDefaultEdit' => 'PhabricatorPolicyCapability', 'LegalpadCapabilityDefaultView' => 'PhabricatorPolicyCapability', 'LegalpadController' => 'PhabricatorController', @@ -5398,7 +5398,7 @@ 'PonderVoteSaveController' => 'PonderController', 'ProjectCapabilityCreateProjects' => 'PhabricatorPolicyCapability', 'ProjectRemarkupRule' => 'PhabricatorRemarkupRuleObject', - 'PublishFragmentBuildStepImplementation' => 'BuildStepImplementation', + 'PublishFragmentBuildStepImplementation' => 'HarbormasterBuildStepImplementation', 'QueryFormattingTestCase' => 'PhabricatorTestCase', 'ReleephAuthorFieldSpecification' => 'ReleephFieldSpecification', 'ReleephBranch' => @@ -5502,10 +5502,10 @@ 'ReleephSummaryFieldSpecification' => 'ReleephFieldSpecification', 'ReleephUserView' => 'AphrontView', 'ShellLogView' => 'AphrontView', - 'SleepBuildStepImplementation' => 'BuildStepImplementation', + 'SleepBuildStepImplementation' => 'HarbormasterBuildStepImplementation', 'SlowvoteEmbedView' => 'AphrontView', 'SlowvoteRemarkupRule' => 'PhabricatorRemarkupRuleObject', - 'UploadArtifactBuildStepImplementation' => 'BuildStepImplementation', - 'WaitForPreviousBuildStepImplementation' => 'BuildStepImplementation', + 'UploadArtifactBuildStepImplementation' => 'HarbormasterBuildStepImplementation', + 'WaitForPreviousBuildStepImplementation' => 'HarbormasterBuildStepImplementation', ), )); diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php --- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php +++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php @@ -164,10 +164,11 @@ $has_conflicts = false; if ($inputs || $outputs) { - $available_artifacts = BuildStepImplementation::loadAvailableArtifacts( - $plan, - $step, - null); + $available_artifacts = + HarbormasterBuildStepImplementation::loadAvailableArtifacts( + $plan, + $step, + null); list($inputs_ui, $has_conflicts) = $this->buildArtifactList( $inputs, diff --git a/src/applications/harbormaster/controller/HarbormasterStepAddController.php b/src/applications/harbormaster/controller/HarbormasterStepAddController.php --- a/src/applications/harbormaster/controller/HarbormasterStepAddController.php +++ b/src/applications/harbormaster/controller/HarbormasterStepAddController.php @@ -26,7 +26,8 @@ throw new Exception("Build plan not found!"); } - $implementations = BuildStepImplementation::getImplementations(); + $implementations = + HarbormasterBuildStepImplementation::getImplementations(); $cancel_uri = $this->getApplicationURI('plan/'.$plan->getID().'/'); diff --git a/src/applications/harbormaster/step/CommandBuildStepImplementation.php b/src/applications/harbormaster/step/CommandBuildStepImplementation.php --- a/src/applications/harbormaster/step/CommandBuildStepImplementation.php +++ b/src/applications/harbormaster/step/CommandBuildStepImplementation.php @@ -1,7 +1,7 @@ setAncestorClass('BuildStepImplementation') + ->setAncestorClass('HarbormasterBuildStepImplementation') ->setConcreteOnly(true) ->selectAndLoadSymbols(); return ipull($symbols, 'name'); diff --git a/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php b/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php --- a/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php +++ b/src/applications/harbormaster/step/HarbormasterHTTPRequestBuildStepImplementation.php @@ -1,7 +1,7 @@ className; diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php --- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php +++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStep.php @@ -52,7 +52,8 @@ static $implementations = null; if ($implementations === null) { - $implementations = BuildStepImplementation::getImplementations(); + $implementations = + HarbormasterBuildStepImplementation::getImplementations(); } $class = $this->className;