From 615fc0a7f8ea0808332424137dbe9e798b83e85b Mon Sep 17 00:00:00 2001 From: Joshua Spence Date: Mon, 19 May 2014 07:50:35 -0700 Subject: [PATCH] Remove the `PhutilLintEngine` class. Summary: After D9057 and D9064 this class is no longer used. Test Plan: N/A Reviewers: epriestley, #blessed_reviewers Reviewed By: epriestley, #blessed_reviewers Subscribers: epriestley, Korvin Differential Revision: https://secure.phabricator.com/D9197 --- src/__phutil_library_map__.php | 2 - src/lint/engine/PhutilLintEngine.php | 84 ---------------------------- 2 files changed, 86 deletions(-) delete mode 100644 src/lint/engine/PhutilLintEngine.php diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index f9a006ab..fb4b787c 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -192,7 +192,6 @@ phutil_register_library_map(array( 'PHPUnitTestEngineTestCase' => 'unit/engine/__tests__/PHPUnitTestEngineTestCase.php', 'PhpunitResultParser' => 'unit/engine/PhpunitResultParser.php', 'PhpunitTestEngine' => 'unit/engine/PhpunitTestEngine.php', - 'PhutilLintEngine' => 'lint/engine/PhutilLintEngine.php', 'PhutilUnitTestEngine' => 'unit/engine/PhutilUnitTestEngine.php', 'PhutilUnitTestEngineTestCase' => 'unit/engine/__tests__/PhutilUnitTestEngineTestCase.php', 'PytestTestEngine' => 'unit/engine/PytestTestEngine.php', @@ -351,7 +350,6 @@ phutil_register_library_map(array( 'PHPUnitTestEngineTestCase' => 'ArcanistTestCase', 'PhpunitResultParser' => 'ArcanistBaseTestResultParser', 'PhpunitTestEngine' => 'ArcanistBaseUnitTestEngine', - 'PhutilLintEngine' => 'ArcanistLintEngine', 'PhutilUnitTestEngine' => 'ArcanistBaseUnitTestEngine', 'PhutilUnitTestEngineTestCase' => 'ArcanistTestCase', 'PytestTestEngine' => 'ArcanistBaseUnitTestEngine', diff --git a/src/lint/engine/PhutilLintEngine.php b/src/lint/engine/PhutilLintEngine.php deleted file mode 100644 index 29666332..00000000 --- a/src/lint/engine/PhutilLintEngine.php +++ /dev/null @@ -1,84 +0,0 @@ -getPaths(); - - $linters[] = id(new ArcanistPhutilLibraryLinter())->setPaths($paths); - - // Remaining linters operate on file contents and ignore removed files. - foreach ($paths as $key => $path) { - if (!$this->pathExists($path)) { - unset($paths[$key]); - } - if (preg_match('@^externals/@', $path)) { - // Third-party stuff lives in /externals/; don't run lint engines - // against it. - unset($paths[$key]); - } - if (preg_match('(\\.lint-test$)', $path)) { - // Don't try to lint these, since they're tests for linters and - // often have intentional lint errors. - unset($paths[$key]); - } - } - - $linters[] = id(new ArcanistFilenameLinter())->setPaths($paths); - - // Skip directories and lint only regular files in remaining linters. - foreach ($paths as $key => $path) { - if ($this->getCommitHookMode()) { - continue; - } - if (!is_file($this->getFilePathOnDisk($path))) { - unset($paths[$key]); - } - } - - $linters[] = id(new ArcanistGeneratedLinter())->setPaths($paths); - $linters[] = id(new ArcanistNoLintLinter())->setPaths($paths); - $linters[] = id(new ArcanistTextLinter())->setPaths($paths); - $linters[] = id(new ArcanistSpellingLinter())->setPaths($paths); - - $php_paths = preg_grep('/\.php$/', $paths); - - $xhpast_linter = id(new ArcanistXHPASTLinter()) - ->setCustomSeverityMap($this->getXHPASTSeverityMap()) - ->setPaths($php_paths); - $linters[] = $xhpast_linter; - - $linters[] = id(new ArcanistPhutilXHPASTLinter()) - ->setPaths($php_paths); - - $merge_conflict_linter = id(new ArcanistMergeConflictLinter()); - - foreach ($paths as $path) { - $merge_conflict_linter->addPath($path); - $merge_conflict_linter->addData($path, $this->loadData($path)); - } - - $linters[] = $merge_conflict_linter; - - return $linters; - } - - private function getXHPASTSeverityMap() { - $error = ArcanistLintSeverity::SEVERITY_ERROR; - $warning = ArcanistLintSeverity::SEVERITY_WARNING; - $advice = ArcanistLintSeverity::SEVERITY_ADVICE; - - return array( - ArcanistXHPASTLinter::LINT_PHP_53_FEATURES => $error, - ArcanistXHPASTLinter::LINT_PHP_54_FEATURES => $error, - ArcanistXHPASTLinter::LINT_COMMENT_SPACING => $error, - ArcanistXHPASTLinter::LINT_RAGGED_CLASSTREE_EDGE => $warning, - ArcanistXHPASTLinter::LINT_TODO_COMMENT => $advice, - ); - } -}