Page MenuHomePhabricator
Files F14026344

D9197.diff
No OneTemporary
Actions

D9197.diff
View Options

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
@@ -192,7 +192,6 @@
'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 @@
'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
--- a/src/lint/engine/PhutilLintEngine.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Lint engine which enforces libphutil rules.
- */
-final class PhutilLintEngine extends ArcanistLintEngine {
-
- public function buildLinters() {
- $linters = array();
-
- $paths = $this->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,
- );
- }
-}

File Metadata

Mime Type
text/plain
Expires
Sat, Nov 9, 1:04 AM (4 d, 20 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6751589
Default Alt Text
D9197.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility