diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index b0599c10..38515e26 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -30,6 +30,7 @@ phutil_register_library_map(array( 'ArcanistCSharpLinter' => 'lint/linter/ArcanistCSharpLinter.php', 'ArcanistCallConduitWorkflow' => 'workflow/ArcanistCallConduitWorkflow.php', 'ArcanistCapabilityNotSupportedException' => 'workflow/exception/ArcanistCapabilityNotSupportedException.php', + 'ArcanistCheckstyleXMLLintRenderer' => 'lint/renderer/ArcanistCheckstyleXMLLintRenderer.php', 'ArcanistChmodLinter' => 'lint/linter/ArcanistChmodLinter.php', 'ArcanistChooseInvalidRevisionException' => 'exception/ArcanistChooseInvalidRevisionException.php', 'ArcanistChooseNoRevisionsException' => 'exception/ArcanistChooseNoRevisionsException.php', @@ -42,10 +43,12 @@ phutil_register_library_map(array( 'ArcanistCommentRemover' => 'parser/ArcanistCommentRemover.php', 'ArcanistCommentRemoverTestCase' => 'parser/__tests__/ArcanistCommentRemoverTestCase.php', 'ArcanistCommitWorkflow' => 'workflow/ArcanistCommitWorkflow.php', + 'ArcanistCompilerLikeLintRenderer' => 'lint/renderer/ArcanistCompilerLikeLintRenderer.php', 'ArcanistConduitLinter' => 'lint/linter/ArcanistConduitLinter.php', 'ArcanistConfiguration' => 'configuration/ArcanistConfiguration.php', 'ArcanistConfigurationDrivenLintEngine' => 'lint/engine/ArcanistConfigurationDrivenLintEngine.php', 'ArcanistConfigurationManager' => 'configuration/ArcanistConfigurationManager.php', + 'ArcanistConsoleLintRenderer' => 'lint/renderer/ArcanistConsoleLintRenderer.php', 'ArcanistCoverWorkflow' => 'workflow/ArcanistCoverWorkflow.php', 'ArcanistCppcheckLinter' => 'lint/linter/ArcanistCppcheckLinter.php', 'ArcanistCppcheckLinterTestCase' => 'lint/linter/__tests__/ArcanistCppcheckLinterTestCase.php', @@ -93,6 +96,7 @@ phutil_register_library_map(array( 'ArcanistJSHintLinterTestCase' => 'lint/linter/__tests__/ArcanistJSHintLinterTestCase.php', 'ArcanistJSONLintLinter' => 'lint/linter/ArcanistJSONLintLinter.php', 'ArcanistJSONLintLinterTestCase' => 'lint/linter/__tests__/ArcanistJSONLintLinterTestCase.php', + 'ArcanistJSONLintRenderer' => 'lint/renderer/ArcanistJSONLintRenderer.php', 'ArcanistJSONLinter' => 'lint/linter/ArcanistJSONLinter.php', 'ArcanistJSONLinterTestCase' => 'lint/linter/__tests__/ArcanistJSONLinterTestCase.php', 'ArcanistJscsLinter' => 'lint/linter/ArcanistJscsLinter.php', @@ -101,18 +105,12 @@ phutil_register_library_map(array( 'ArcanistLesscLinter' => 'lint/linter/ArcanistLesscLinter.php', 'ArcanistLesscLinterTestCase' => 'lint/linter/__tests__/ArcanistLesscLinterTestCase.php', 'ArcanistLiberateWorkflow' => 'workflow/ArcanistLiberateWorkflow.php', - 'ArcanistLintCheckstyleXMLRenderer' => 'lint/renderer/ArcanistLintCheckstyleXMLRenderer.php', - 'ArcanistLintConsoleRenderer' => 'lint/renderer/ArcanistLintConsoleRenderer.php', 'ArcanistLintEngine' => 'lint/engine/ArcanistLintEngine.php', - 'ArcanistLintJSONRenderer' => 'lint/renderer/ArcanistLintJSONRenderer.php', - 'ArcanistLintLikeCompilerRenderer' => 'lint/renderer/ArcanistLintLikeCompilerRenderer.php', 'ArcanistLintMessage' => 'lint/ArcanistLintMessage.php', - 'ArcanistLintNoneRenderer' => 'lint/renderer/ArcanistLintNoneRenderer.php', 'ArcanistLintPatcher' => 'lint/ArcanistLintPatcher.php', 'ArcanistLintRenderer' => 'lint/renderer/ArcanistLintRenderer.php', 'ArcanistLintResult' => 'lint/ArcanistLintResult.php', 'ArcanistLintSeverity' => 'lint/ArcanistLintSeverity.php', - 'ArcanistLintSummaryRenderer' => 'lint/renderer/ArcanistLintSummaryRenderer.php', 'ArcanistLintWorkflow' => 'workflow/ArcanistLintWorkflow.php', 'ArcanistLinter' => 'lint/linter/ArcanistLinter.php', 'ArcanistLinterTestCase' => 'lint/linter/__tests__/ArcanistLinterTestCase.php', @@ -127,6 +125,7 @@ phutil_register_library_map(array( 'ArcanistNoEngineException' => 'exception/usage/ArcanistNoEngineException.php', 'ArcanistNoLintLinter' => 'lint/linter/ArcanistNoLintLinter.php', 'ArcanistNoLintTestCaseMisnamed' => 'lint/linter/__tests__/ArcanistNoLintTestCase.php', + 'ArcanistNoneLintRenderer' => 'lint/renderer/ArcanistNoneLintRenderer.php', 'ArcanistPEP8Linter' => 'lint/linter/ArcanistPEP8Linter.php', 'ArcanistPEP8LinterTestCase' => 'lint/linter/__tests__/ArcanistPEP8LinterTestCase.php', 'ArcanistPHPCSLinterTestCase' => 'lint/linter/__tests__/ArcanistPHPCSLinterTestCase.php', @@ -164,6 +163,7 @@ phutil_register_library_map(array( 'ArcanistStopWorkflow' => 'workflow/ArcanistStopWorkflow.php', 'ArcanistSubversionAPI' => 'repository/api/ArcanistSubversionAPI.php', 'ArcanistSubversionHookAPI' => 'repository/hookapi/ArcanistSubversionHookAPI.php', + 'ArcanistSummaryLintRenderer' => 'lint/renderer/ArcanistSummaryLintRenderer.php', 'ArcanistSvnHookPreCommitWorkflow' => 'workflow/ArcanistSvnHookPreCommitWorkflow.php', 'ArcanistTasksWorkflow' => 'workflow/ArcanistTasksWorkflow.php', 'ArcanistTestCase' => 'infrastructure/testing/ArcanistTestCase.php', @@ -231,6 +231,7 @@ phutil_register_library_map(array( 'ArcanistCSharpLinter' => 'ArcanistLinter', 'ArcanistCallConduitWorkflow' => 'ArcanistWorkflow', 'ArcanistCapabilityNotSupportedException' => 'Exception', + 'ArcanistCheckstyleXMLLintRenderer' => 'ArcanistLintRenderer', 'ArcanistChmodLinter' => 'ArcanistLinter', 'ArcanistChooseInvalidRevisionException' => 'Exception', 'ArcanistChooseNoRevisionsException' => 'Exception', @@ -242,8 +243,10 @@ phutil_register_library_map(array( 'ArcanistCoffeeLintLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistCommentRemoverTestCase' => 'ArcanistTestCase', 'ArcanistCommitWorkflow' => 'ArcanistWorkflow', + 'ArcanistCompilerLikeLintRenderer' => 'ArcanistLintRenderer', 'ArcanistConduitLinter' => 'ArcanistLinter', 'ArcanistConfigurationDrivenLintEngine' => 'ArcanistLintEngine', + 'ArcanistConsoleLintRenderer' => 'ArcanistLintRenderer', 'ArcanistCoverWorkflow' => 'ArcanistWorkflow', 'ArcanistCppcheckLinter' => 'ArcanistExternalLinter', 'ArcanistCppcheckLinterTestCase' => 'ArcanistArcanistLinterTestCase', @@ -280,6 +283,7 @@ phutil_register_library_map(array( 'ArcanistJSHintLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistJSONLintLinter' => 'ArcanistExternalLinter', 'ArcanistJSONLintLinterTestCase' => 'ArcanistArcanistLinterTestCase', + 'ArcanistJSONLintRenderer' => 'ArcanistLintRenderer', 'ArcanistJSONLinter' => 'ArcanistLinter', 'ArcanistJSONLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistJscsLinter' => 'ArcanistExternalLinter', @@ -288,12 +292,6 @@ phutil_register_library_map(array( 'ArcanistLesscLinter' => 'ArcanistExternalLinter', 'ArcanistLesscLinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistLiberateWorkflow' => 'ArcanistWorkflow', - 'ArcanistLintCheckstyleXMLRenderer' => 'ArcanistLintRenderer', - 'ArcanistLintConsoleRenderer' => 'ArcanistLintRenderer', - 'ArcanistLintJSONRenderer' => 'ArcanistLintRenderer', - 'ArcanistLintLikeCompilerRenderer' => 'ArcanistLintRenderer', - 'ArcanistLintNoneRenderer' => 'ArcanistLintRenderer', - 'ArcanistLintSummaryRenderer' => 'ArcanistLintRenderer', 'ArcanistLintWorkflow' => 'ArcanistWorkflow', 'ArcanistLinterTestCase' => 'ArcanistPhutilTestCase', 'ArcanistLintersWorkflow' => 'ArcanistWorkflow', @@ -306,6 +304,7 @@ phutil_register_library_map(array( 'ArcanistNoEngineException' => 'ArcanistUsageException', 'ArcanistNoLintLinter' => 'ArcanistLinter', 'ArcanistNoLintTestCaseMisnamed' => 'ArcanistLinterTestCase', + 'ArcanistNoneLintRenderer' => 'ArcanistLintRenderer', 'ArcanistPEP8Linter' => 'ArcanistExternalLinter', 'ArcanistPEP8LinterTestCase' => 'ArcanistArcanistLinterTestCase', 'ArcanistPHPCSLinterTestCase' => 'ArcanistArcanistLinterTestCase', @@ -340,6 +339,7 @@ phutil_register_library_map(array( 'ArcanistStopWorkflow' => 'ArcanistPhrequentWorkflow', 'ArcanistSubversionAPI' => 'ArcanistRepositoryAPI', 'ArcanistSubversionHookAPI' => 'ArcanistHookAPI', + 'ArcanistSummaryLintRenderer' => 'ArcanistLintRenderer', 'ArcanistSvnHookPreCommitWorkflow' => 'ArcanistWorkflow', 'ArcanistTasksWorkflow' => 'ArcanistWorkflow', 'ArcanistTestCase' => 'ArcanistPhutilTestCase', diff --git a/src/lint/renderer/ArcanistLintCheckstyleXMLRenderer.php b/src/lint/renderer/ArcanistCheckstyleXMLLintRenderer.php similarity index 95% rename from src/lint/renderer/ArcanistLintCheckstyleXMLRenderer.php rename to src/lint/renderer/ArcanistCheckstyleXMLLintRenderer.php index 30a91485..b4705ad5 100644 --- a/src/lint/renderer/ArcanistLintCheckstyleXMLRenderer.php +++ b/src/lint/renderer/ArcanistCheckstyleXMLLintRenderer.php @@ -3,7 +3,7 @@ /** * Shows lint messages to the user. */ -final class ArcanistLintCheckstyleXMLRenderer extends ArcanistLintRenderer { +final class ArcanistCheckstyleXMLLintRenderer extends ArcanistLintRenderer { private $writer; diff --git a/src/lint/renderer/ArcanistLintLikeCompilerRenderer.php b/src/lint/renderer/ArcanistCompilerLikeLintRenderer.php similarity index 91% rename from src/lint/renderer/ArcanistLintLikeCompilerRenderer.php rename to src/lint/renderer/ArcanistCompilerLikeLintRenderer.php index 5ffce5ff..0a14ebee 100644 --- a/src/lint/renderer/ArcanistLintLikeCompilerRenderer.php +++ b/src/lint/renderer/ArcanistCompilerLikeLintRenderer.php @@ -3,7 +3,7 @@ /** * Shows lint messages to the user. */ -final class ArcanistLintLikeCompilerRenderer extends ArcanistLintRenderer { +final class ArcanistCompilerLikeLintRenderer extends ArcanistLintRenderer { public function renderLintResult(ArcanistLintResult $result) { $lines = array(); diff --git a/src/lint/renderer/ArcanistLintConsoleRenderer.php b/src/lint/renderer/ArcanistConsoleLintRenderer.php similarity index 99% rename from src/lint/renderer/ArcanistLintConsoleRenderer.php rename to src/lint/renderer/ArcanistConsoleLintRenderer.php index c083abd0..25316c34 100644 --- a/src/lint/renderer/ArcanistLintConsoleRenderer.php +++ b/src/lint/renderer/ArcanistConsoleLintRenderer.php @@ -3,7 +3,7 @@ /** * Shows lint messages to the user. */ -final class ArcanistLintConsoleRenderer extends ArcanistLintRenderer { +final class ArcanistConsoleLintRenderer extends ArcanistLintRenderer { private $showAutofixPatches = false; diff --git a/src/lint/renderer/ArcanistLintJSONRenderer.php b/src/lint/renderer/ArcanistJSONLintRenderer.php similarity index 92% rename from src/lint/renderer/ArcanistLintJSONRenderer.php rename to src/lint/renderer/ArcanistJSONLintRenderer.php index 7170bdc2..04432344 100644 --- a/src/lint/renderer/ArcanistLintJSONRenderer.php +++ b/src/lint/renderer/ArcanistJSONLintRenderer.php @@ -3,7 +3,7 @@ /** * Shows lint messages to the user. */ -final class ArcanistLintJSONRenderer extends ArcanistLintRenderer { +final class ArcanistJSONLintRenderer extends ArcanistLintRenderer { const LINES_OF_CONTEXT = 3; diff --git a/src/lint/renderer/ArcanistLintNoneRenderer.php b/src/lint/renderer/ArcanistNoneLintRenderer.php similarity index 71% rename from src/lint/renderer/ArcanistLintNoneRenderer.php rename to src/lint/renderer/ArcanistNoneLintRenderer.php index 3e047bed..ce74e395 100644 --- a/src/lint/renderer/ArcanistLintNoneRenderer.php +++ b/src/lint/renderer/ArcanistNoneLintRenderer.php @@ -1,6 +1,6 @@ getMessages(); diff --git a/src/workflow/ArcanistLintWorkflow.php b/src/workflow/ArcanistLintWorkflow.php index 912a708b..396e3ed8 100644 --- a/src/workflow/ArcanistLintWorkflow.php +++ b/src/workflow/ArcanistLintWorkflow.php @@ -424,30 +424,30 @@ EOTEXT switch ($this->getArgument('output')) { case 'json': - $renderer = new ArcanistLintJSONRenderer(); + $renderer = new ArcanistJSONLintRenderer(); $prompt_patches = false; $apply_patches = $this->getArgument('apply-patches'); break; case 'summary': - $renderer = new ArcanistLintSummaryRenderer(); + $renderer = new ArcanistSummaryLintRenderer(); break; case 'none': $prompt_patches = false; $apply_patches = $this->getArgument('apply-patches'); - $renderer = new ArcanistLintNoneRenderer(); + $renderer = new ArcanistNoneLintRenderer(); break; case 'compiler': - $renderer = new ArcanistLintLikeCompilerRenderer(); + $renderer = new ArcanistCompilerLikeLintRenderer(); $prompt_patches = false; $apply_patches = $this->getArgument('apply-patches'); break; case 'xml': - $renderer = new ArcanistLintCheckstyleXMLRenderer(); + $renderer = new ArcanistCheckstyleXMLLintRenderer(); $prompt_patches = false; $apply_patches = $this->getArgument('apply-patches'); break; default: - $renderer = new ArcanistLintConsoleRenderer(); + $renderer = new ArcanistConsoleLintRenderer(); $renderer->setShowAutofixPatches($prompt_autofix_patches); break; } @@ -539,7 +539,7 @@ EOTEXT if ($failed) { if ($failed instanceof ArcanistNoEffectException) { - if ($renderer instanceof ArcanistLintNoneRenderer) { + if ($renderer instanceof ArcanistNoneLintRenderer) { return 0; } } diff --git a/src/workflow/ArcanistSvnHookPreCommitWorkflow.php b/src/workflow/ArcanistSvnHookPreCommitWorkflow.php index 136bec2e..41dabb18 100644 --- a/src/workflow/ArcanistSvnHookPreCommitWorkflow.php +++ b/src/workflow/ArcanistSvnHookPreCommitWorkflow.php @@ -217,7 +217,7 @@ EOTEXT "errors to disable lint for that file.\n\n"); echo phutil_console_wrap($msg); - $renderer = new ArcanistLintConsoleRenderer(); + $renderer = new ArcanistConsoleLintRenderer(); foreach ($failures as $result) { echo $renderer->renderLintResult($result); }