Page MenuHomePhabricator
Files F15419486

D10541.id25325.diff
No OneTemporary
Actions

D10541.id25325.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
@@ -68,6 +68,8 @@
'ArcanistDifferentialRevisionHash' => 'differential/constants/ArcanistDifferentialRevisionHash.php',
'ArcanistDifferentialRevisionStatus' => 'differential/constants/ArcanistDifferentialRevisionStatus.php',
'ArcanistDownloadWorkflow' => 'workflow/ArcanistDownloadWorkflow.php',
+ 'ArcanistElseIfUsageXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistElseIfUsageXHPASTLinterRule.php',
+ 'ArcanistEmptyBlockStatementXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistEmptyBlockStatementXHPASTLinterRule.php',
'ArcanistEventType' => 'events/constant/ArcanistEventType.php',
'ArcanistExportWorkflow' => 'workflow/ArcanistExportWorkflow.php',
'ArcanistExternalLinter' => 'lint/linter/ArcanistExternalLinter.php',
@@ -104,6 +106,7 @@
'ArcanistJscsLinter' => 'lint/linter/ArcanistJscsLinter.php',
'ArcanistJscsLinterTestCase' => 'lint/linter/__tests__/ArcanistJscsLinterTestCase.php',
'ArcanistLandWorkflow' => 'workflow/ArcanistLandWorkflow.php',
+ 'ArcanistLanguageConstructParenthesesXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistLanguageConstructParenthesesXHPASTLinterRule.php',
'ArcanistLesscLinter' => 'lint/linter/ArcanistLesscLinter.php',
'ArcanistLesscLinterTestCase' => 'lint/linter/__tests__/ArcanistLesscLinterTestCase.php',
'ArcanistLiberateWorkflow' => 'workflow/ArcanistLiberateWorkflow.php',
@@ -123,6 +126,7 @@
'ArcanistMercurialParserTestCase' => 'repository/parser/__tests__/ArcanistMercurialParserTestCase.php',
'ArcanistMergeConflictLinter' => 'lint/linter/ArcanistMergeConflictLinter.php',
'ArcanistMergeConflictLinterTestCase' => 'lint/linter/__tests__/ArcanistMergeConflictLinterTestCase.php',
+ 'ArcanistNamingConventionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistNamingConventionXHPASTLinterRule.php',
'ArcanistNoEffectException' => 'exception/usage/ArcanistNoEffectException.php',
'ArcanistNoEngineException' => 'exception/usage/ArcanistNoEngineException.php',
'ArcanistNoLintLinter' => 'lint/linter/ArcanistNoLintLinter.php',
@@ -144,6 +148,7 @@
'ArcanistPhutilTestTerminatedException' => 'unit/engine/phutil/testcase/ArcanistPhutilTestTerminatedException.php',
'ArcanistPhutilXHPASTLinter' => 'lint/linter/ArcanistPhutilXHPASTLinter.php',
'ArcanistPhutilXHPASTLinterTestCase' => 'lint/linter/__tests__/ArcanistPhutilXHPASTLinterTestCase.php',
+ 'ArcanistPlusOperatorOnStringsXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistPlusOperatorOnStringsXHPASTLinterRule.php',
'ArcanistPuppetLintLinter' => 'lint/linter/ArcanistPuppetLintLinter.php',
'ArcanistPuppetLintLinterTestCase' => 'lint/linter/__tests__/ArcanistPuppetLintLinterTestCase.php',
'ArcanistPyFlakesLinter' => 'lint/linter/ArcanistPyFlakesLinter.php',
@@ -157,6 +162,7 @@
'ArcanistRubyLinter' => 'lint/linter/ArcanistRubyLinter.php',
'ArcanistRubyLinterTestCase' => 'lint/linter/__tests__/ArcanistRubyLinterTestCase.php',
'ArcanistScriptAndRegexLinter' => 'lint/linter/ArcanistScriptAndRegexLinter.php',
+ 'ArcanistSemicolonSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistSemicolonSpacingXHPASTLinterRule.php',
'ArcanistSetConfigWorkflow' => 'workflow/ArcanistSetConfigWorkflow.php',
'ArcanistSettings' => 'configuration/ArcanistSettings.php',
'ArcanistShellCompleteWorkflow' => 'workflow/ArcanistShellCompleteWorkflow.php',
@@ -170,6 +176,7 @@
'ArcanistSummaryLintRenderer' => 'lint/renderer/ArcanistSummaryLintRenderer.php',
'ArcanistSvnHookPreCommitWorkflow' => 'workflow/ArcanistSvnHookPreCommitWorkflow.php',
'ArcanistTasksWorkflow' => 'workflow/ArcanistTasksWorkflow.php',
+ 'ArcanistTautologicalExpressionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistTautologicalExpressionXHPASTLinterRule.php',
'ArcanistTestCase' => 'infrastructure/testing/ArcanistTestCase.php',
'ArcanistTestResultParser' => 'unit/engine/ArcanistTestResultParser.php',
'ArcanistTextLinter' => 'lint/linter/ArcanistTextLinter.php',
@@ -195,6 +202,7 @@
'ArcanistXHPASTLintSwitchHook' => 'lint/linter/xhpast/ArcanistXHPASTLintSwitchHook.php',
'ArcanistXHPASTLintTestSwitchHook' => 'lint/linter/__tests__/ArcanistXHPASTLintTestSwitchHook.php',
'ArcanistXHPASTLinter' => 'lint/linter/ArcanistXHPASTLinter.php',
+ 'ArcanistXHPASTLinterRule' => 'lint/linter/xhpast/ArcanistXHPASTLinterRule.php',
'ArcanistXHPASTLinterTestCase' => 'lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php',
'ArcanistXMLLinter' => 'lint/linter/ArcanistXMLLinter.php',
'ArcanistXMLLinterTestCase' => 'lint/linter/__tests__/ArcanistXMLLinterTestCase.php',
@@ -262,6 +270,8 @@
'ArcanistDifferentialCommitMessageParserException' => 'Exception',
'ArcanistDifferentialDependencyGraph' => 'AbstractDirectedGraph',
'ArcanistDownloadWorkflow' => 'ArcanistWorkflow',
+ 'ArcanistElseIfUsageXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
+ 'ArcanistEmptyBlockStatementXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
'ArcanistEventType' => 'PhutilEventType',
'ArcanistExportWorkflow' => 'ArcanistWorkflow',
'ArcanistExternalLinter' => 'ArcanistFutureLinter',
@@ -295,6 +305,7 @@
'ArcanistJscsLinter' => 'ArcanistExternalLinter',
'ArcanistJscsLinterTestCase' => 'ArcanistArcanistLinterTestCase',
'ArcanistLandWorkflow' => 'ArcanistWorkflow',
+ 'ArcanistLanguageConstructParenthesesXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
'ArcanistLesscLinter' => 'ArcanistExternalLinter',
'ArcanistLesscLinterTestCase' => 'ArcanistArcanistLinterTestCase',
'ArcanistLiberateWorkflow' => 'ArcanistWorkflow',
@@ -306,6 +317,7 @@
'ArcanistMercurialParserTestCase' => 'ArcanistTestCase',
'ArcanistMergeConflictLinter' => 'ArcanistLinter',
'ArcanistMergeConflictLinterTestCase' => 'ArcanistArcanistLinterTestCase',
+ 'ArcanistNamingConventionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
'ArcanistNoEffectException' => 'ArcanistUsageException',
'ArcanistNoEngineException' => 'ArcanistUsageException',
'ArcanistNoLintLinter' => 'ArcanistLinter',
@@ -326,6 +338,7 @@
'ArcanistPhutilTestTerminatedException' => 'Exception',
'ArcanistPhutilXHPASTLinter' => 'ArcanistBaseXHPASTLinter',
'ArcanistPhutilXHPASTLinterTestCase' => 'ArcanistArcanistLinterTestCase',
+ 'ArcanistPlusOperatorOnStringsXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
'ArcanistPuppetLintLinter' => 'ArcanistExternalLinter',
'ArcanistPuppetLintLinterTestCase' => 'ArcanistArcanistLinterTestCase',
'ArcanistPyFlakesLinter' => 'ArcanistExternalLinter',
@@ -338,6 +351,7 @@
'ArcanistRubyLinter' => 'ArcanistExternalLinter',
'ArcanistRubyLinterTestCase' => 'ArcanistArcanistLinterTestCase',
'ArcanistScriptAndRegexLinter' => 'ArcanistLinter',
+ 'ArcanistSemicolonSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
'ArcanistSetConfigWorkflow' => 'ArcanistWorkflow',
'ArcanistShellCompleteWorkflow' => 'ArcanistWorkflow',
'ArcanistSingleLintEngine' => 'ArcanistLintEngine',
@@ -350,6 +364,7 @@
'ArcanistSummaryLintRenderer' => 'ArcanistLintRenderer',
'ArcanistSvnHookPreCommitWorkflow' => 'ArcanistWorkflow',
'ArcanistTasksWorkflow' => 'ArcanistWorkflow',
+ 'ArcanistTautologicalExpressionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
'ArcanistTestCase' => 'ArcanistPhutilTestCase',
'ArcanistTextLinter' => 'ArcanistLinter',
'ArcanistTextLinterTestCase' => 'ArcanistArcanistLinterTestCase',
diff --git a/src/lint/linter/ArcanistXHPASTLinter.php b/src/lint/linter/ArcanistXHPASTLinter.php
--- a/src/lint/linter/ArcanistXHPASTLinter.php
+++ b/src/lint/linter/ArcanistXHPASTLinter.php
@@ -13,7 +13,6 @@
const LINT_PHP_SHORT_TAG = 6;
const LINT_PHP_ECHO_TAG = 7;
const LINT_PHP_CLOSE_TAG = 8;
- const LINT_NAMING_CONVENTIONS = 9;
const LINT_IMPLICIT_CONSTRUCTOR = 10;
const LINT_DYNAMIC_DEFINE = 12;
const LINT_STATIC_THIS = 13;
@@ -23,8 +22,6 @@
const LINT_EXIT_EXPRESSION = 17;
const LINT_COMMENT_STYLE = 18;
const LINT_CLASS_FILENAME_MISMATCH = 19;
- const LINT_TAUTOLOGICAL_EXPRESSION = 20;
- const LINT_PLUS_OPERATOR_ON_STRINGS = 21;
const LINT_DUPLICATE_KEYS_IN_ARRAY = 22;
const LINT_REUSED_ITERATORS = 23;
const LINT_BRACE_FORMATTING = 24;
@@ -41,12 +38,8 @@
const LINT_REUSED_ITERATOR_REFERENCE = 39;
const LINT_KEYWORD_CASING = 40;
const LINT_DOUBLE_QUOTE = 41;
- const LINT_ELSEIF_USAGE = 42;
- const LINT_SEMICOLON_SPACING = 43;
const LINT_CONCATENATION_OPERATOR = 44;
const LINT_PHP_COMPATIBILITY = 45;
- const LINT_LANGUAGE_CONSTRUCT_PAREN = 46;
- const LINT_EMPTY_STATEMENT = 47;
private $naminghook;
private $switchhook;
@@ -71,7 +64,6 @@
self::LINT_PHP_SHORT_TAG => 'Use of Short Tag "<?"',
self::LINT_PHP_ECHO_TAG => 'Use of Echo Tag "<?="',
self::LINT_PHP_CLOSE_TAG => 'Use of Close Tag "?>"',
- self::LINT_NAMING_CONVENTIONS => 'Naming Conventions',
self::LINT_IMPLICIT_CONSTRUCTOR => 'Implicit Constructor',
self::LINT_DYNAMIC_DEFINE => 'Dynamic define()',
self::LINT_STATIC_THIS => 'Use of $this in Static Context',
@@ -81,8 +73,6 @@
self::LINT_EXIT_EXPRESSION => 'Exit Used as Expression',
self::LINT_COMMENT_STYLE => 'Comment Style',
self::LINT_CLASS_FILENAME_MISMATCH => 'Class-Filename Mismatch',
- self::LINT_TAUTOLOGICAL_EXPRESSION => 'Tautological Expression',
- self::LINT_PLUS_OPERATOR_ON_STRINGS => 'Not String Concatenation',
self::LINT_DUPLICATE_KEYS_IN_ARRAY => 'Duplicate Keys in Array',
self::LINT_REUSED_ITERATORS => 'Reuse of Iterator Variable',
self::LINT_BRACE_FORMATTING => 'Brace placement',
@@ -99,12 +89,8 @@
self::LINT_REUSED_ITERATOR_REFERENCE => 'Reuse of Iterator References',
self::LINT_KEYWORD_CASING => 'Keyword Conventions',
self::LINT_DOUBLE_QUOTE => 'Unnecessary Double Quotes',
- self::LINT_ELSEIF_USAGE => 'ElseIf Usage',
- self::LINT_SEMICOLON_SPACING => 'Semicolon Spacing',
self::LINT_CONCATENATION_OPERATOR => 'Concatenation Spacing',
self::LINT_PHP_COMPATIBILITY => 'PHP Compatibility',
- self::LINT_LANGUAGE_CONSTRUCT_PAREN => 'Language Construct Parentheses',
- self::LINT_EMPTY_STATEMENT => 'Empty Block Statement',
);
}
@@ -124,7 +110,6 @@
return array(
self::LINT_TODO_COMMENT => $disabled,
self::LINT_UNABLE_TO_PARSE => $warning,
- self::LINT_NAMING_CONVENTIONS => $warning,
self::LINT_PREG_QUOTE_MISUSE => $advice,
self::LINT_BRACE_FORMATTING => $warning,
self::LINT_PARENTHESES_SPACING => $warning,
@@ -139,10 +124,7 @@
self::LINT_REUSED_ITERATOR_REFERENCE => $warning,
self::LINT_KEYWORD_CASING => $warning,
self::LINT_DOUBLE_QUOTE => $advice,
- self::LINT_ELSEIF_USAGE => $advice,
- self::LINT_SEMICOLON_SPACING => $advice,
self::LINT_CONCATENATION_OPERATOR => $warning,
- self::LINT_LANGUAGE_CONSTRUCT_PAREN => $warning,
self::LINT_EMPTY_STATEMENT => $advice,
);
}
@@ -214,63 +196,13 @@
$root = $tree->getRootNode();
- $method_codes = array(
- 'lintStrstrUsedForCheck' => self::LINT_SLOWNESS,
- 'lintStrposUsedForStart' => self::LINT_SLOWNESS,
- 'lintImplicitFallthrough' => self::LINT_IMPLICIT_FALLTHROUGH,
- 'lintBraceFormatting' => self::LINT_BRACE_FORMATTING,
- 'lintTautologicalExpressions' => self::LINT_TAUTOLOGICAL_EXPRESSION,
- 'lintCommentSpaces' => self::LINT_COMMENT_SPACING,
- 'lintHashComments' => self::LINT_COMMENT_STYLE,
- 'lintReusedIterators' => self::LINT_REUSED_ITERATORS,
- 'lintReusedIteratorReferences' => self::LINT_REUSED_ITERATOR_REFERENCE,
- 'lintVariableVariables' => self::LINT_VARIABLE_VARIABLE,
- 'lintUndeclaredVariables' => array(
- self::LINT_EXTRACT_USE,
- self::LINT_REUSED_AS_ITERATOR,
- self::LINT_UNDECLARED_VARIABLE,
- ),
- 'lintPHPTagUse' => array(
- self::LINT_PHP_SHORT_TAG,
- self::LINT_PHP_ECHO_TAG,
- self::LINT_PHP_OPEN_TAG,
- self::LINT_PHP_CLOSE_TAG,
- ),
- 'lintNamingConventions' => self::LINT_NAMING_CONVENTIONS,
- 'lintSurpriseConstructors' => self::LINT_IMPLICIT_CONSTRUCTOR,
- 'lintParenthesesShouldHugExpressions' => self::LINT_PARENTHESES_SPACING,
- 'lintSpaceAfterControlStatementKeywords' =>
- self::LINT_CONTROL_STATEMENT_SPACING,
- 'lintSpaceAroundBinaryOperators' => self::LINT_BINARY_EXPRESSION_SPACING,
- 'lintDynamicDefines' => self::LINT_DYNAMIC_DEFINE,
- 'lintUseOfThisInStaticMethods' => self::LINT_STATIC_THIS,
- 'lintPregQuote' => self::LINT_PREG_QUOTE_MISUSE,
- 'lintExitExpressions' => self::LINT_EXIT_EXPRESSION,
- 'lintArrayIndexWhitespace' => self::LINT_ARRAY_INDEX_SPACING,
- 'lintTODOComments' => self::LINT_TODO_COMMENT,
- 'lintPrimaryDeclarationFilenameMatch' =>
- self::LINT_CLASS_FILENAME_MISMATCH,
- 'lintPlusOperatorOnStrings' => self::LINT_PLUS_OPERATOR_ON_STRINGS,
- 'lintDuplicateKeysInArray' => self::LINT_DUPLICATE_KEYS_IN_ARRAY,
- 'lintClosingCallParen' => self::LINT_CLOSING_CALL_PAREN,
- 'lintClosingDeclarationParen' => self::LINT_CLOSING_DECL_PAREN,
- 'lintKeywordCasing' => self::LINT_KEYWORD_CASING,
- 'lintStrings' => self::LINT_DOUBLE_QUOTE,
- 'lintElseIfStatements' => self::LINT_ELSEIF_USAGE,
- 'lintSemicolons' => self::LINT_SEMICOLON_SPACING,
- 'lintSpaceAroundConcatenationOperators' =>
- self::LINT_CONCATENATION_OPERATOR,
- 'lintPHPCompatibility' => self::LINT_PHP_COMPATIBILITY,
- 'lintLanguageConstructParentheses' => self::LINT_LANGUAGE_CONSTRUCT_PAREN,
- 'lintEmptyBlockStatements' => self::LINT_EMPTY_STATEMENT,
- );
+ $rules = id(new PhutilSymbolLoader())
+ ->setAncestorClass('ArcanistXHPASTLinterRule')
+ ->loadObjects();
- foreach ($method_codes as $method => $codes) {
- foreach ((array)$codes as $code) {
- if ($this->isCodeEnabled($code)) {
- call_user_func(array($this, $method), $root);
- break;
- }
+ foreach ($rules as $rule) {
+ if ($this->isCodeEnabled($rule->getIdentifer())) {
+ $rule->process($root);
}
}
}
@@ -848,64 +780,6 @@
}
}
- private function lintTautologicalExpressions(XHPASTNode $root) {
- $expressions = $root->selectDescendantsOfType('n_BINARY_EXPRESSION');
-
- static $operators = array(
- '-' => true,
- '/' => true,
- '-=' => true,
- '/=' => true,
- '<=' => true,
- '<' => true,
- '==' => true,
- '===' => true,
- '!=' => true,
- '!==' => true,
- '>=' => true,
- '>' => true,
- );
-
- static $logical = array(
- '||' => true,
- '&&' => true,
- );
-
- foreach ($expressions as $expr) {
- $operator = $expr->getChildByIndex(1)->getConcreteString();
- if (!empty($operators[$operator])) {
- $left = $expr->getChildByIndex(0)->getSemanticString();
- $right = $expr->getChildByIndex(2)->getSemanticString();
-
- if ($left === $right) {
- $this->raiseLintAtNode(
- $expr,
- self::LINT_TAUTOLOGICAL_EXPRESSION,
- 'Both sides of this expression are identical, so it always '.
- 'evaluates to a constant.');
- }
- }
-
- if (!empty($logical[$operator])) {
- $left = $expr->getChildByIndex(0)->getSemanticString();
- $right = $expr->getChildByIndex(2)->getSemanticString();
-
- // NOTE: These will be null to indicate "could not evaluate".
- $left = $this->evaluateStaticBoolean($left);
- $right = $this->evaluateStaticBoolean($right);
-
- if (($operator === '||' && ($left === true || $right === true)) ||
- ($operator === '&&' && ($left === false || $right === false))) {
- $this->raiseLintAtNode(
- $expr,
- self::LINT_TAUTOLOGICAL_EXPRESSION,
- 'The logical value of this expression is static. Did you forget '.
- 'to remove some debugging code?');
- }
- }
- }
- }
-
/**
* Statically evaluate a boolean value from an XHP tree.
*
@@ -1632,259 +1506,7 @@
}
}
- private function lintNamingConventions(XHPASTNode $root) {
- // We're going to build up a list of <type, name, token, error> tuples
- // and then try to instantiate a hook class which has the opportunity to
- // override us.
- $names = array();
-
- $classes = $root->selectDescendantsOfType('n_CLASS_DECLARATION');
- foreach ($classes as $class) {
- $name_token = $class->getChildByIndex(1);
- $name_string = $name_token->getConcreteString();
-
- $names[] = array(
- 'class',
- $name_string,
- $name_token,
- ArcanistXHPASTLintNamingHook::isUpperCamelCase($name_string)
- ? null
- : 'Follow naming conventions: classes should be named using '.
- 'UpperCamelCase.',
- );
- }
-
- $ifaces = $root->selectDescendantsOfType('n_INTERFACE_DECLARATION');
- foreach ($ifaces as $iface) {
- $name_token = $iface->getChildByIndex(1);
- $name_string = $name_token->getConcreteString();
- $names[] = array(
- 'interface',
- $name_string,
- $name_token,
- ArcanistXHPASTLintNamingHook::isUpperCamelCase($name_string)
- ? null
- : 'Follow naming conventions: interfaces should be named using '.
- 'UpperCamelCase.',
- );
- }
-
-
- $functions = $root->selectDescendantsOfType('n_FUNCTION_DECLARATION');
- foreach ($functions as $function) {
- $name_token = $function->getChildByIndex(2);
- if ($name_token->getTypeName() === 'n_EMPTY') {
- // Unnamed closure.
- continue;
- }
- $name_string = $name_token->getConcreteString();
- $names[] = array(
- 'function',
- $name_string,
- $name_token,
- ArcanistXHPASTLintNamingHook::isLowercaseWithUnderscores(
- ArcanistXHPASTLintNamingHook::stripPHPFunction($name_string))
- ? null
- : 'Follow naming conventions: functions should be named using '.
- 'lowercase_with_underscores.',
- );
- }
-
-
- $methods = $root->selectDescendantsOfType('n_METHOD_DECLARATION');
- foreach ($methods as $method) {
- $name_token = $method->getChildByIndex(2);
- $name_string = $name_token->getConcreteString();
- $names[] = array(
- 'method',
- $name_string,
- $name_token,
- ArcanistXHPASTLintNamingHook::isLowerCamelCase(
- ArcanistXHPASTLintNamingHook::stripPHPFunction($name_string))
- ? null
- : 'Follow naming conventions: methods should be named using '.
- 'lowerCamelCase.',
- );
- }
-
- $param_tokens = array();
-
- $params = $root->selectDescendantsOfType('n_DECLARATION_PARAMETER_LIST');
- foreach ($params as $param_list) {
- foreach ($param_list->getChildren() as $param) {
- $name_token = $param->getChildByIndex(1);
- if ($name_token->getTypeName() === 'n_VARIABLE_REFERENCE') {
- $name_token = $name_token->getChildOfType(0, 'n_VARIABLE');
- }
- $param_tokens[$name_token->getID()] = true;
- $name_string = $name_token->getConcreteString();
-
- $names[] = array(
- 'parameter',
- $name_string,
- $name_token,
- ArcanistXHPASTLintNamingHook::isLowercaseWithUnderscores(
- ArcanistXHPASTLintNamingHook::stripPHPVariable($name_string))
- ? null
- : 'Follow naming conventions: parameters should be named using '.
- 'lowercase_with_underscores.',
- );
- }
- }
-
-
- $constants = $root->selectDescendantsOfType(
- 'n_CLASS_CONSTANT_DECLARATION_LIST');
- foreach ($constants as $constant_list) {
- foreach ($constant_list->getChildren() as $constant) {
- $name_token = $constant->getChildByIndex(0);
- $name_string = $name_token->getConcreteString();
- $names[] = array(
- 'constant',
- $name_string,
- $name_token,
- ArcanistXHPASTLintNamingHook::isUppercaseWithUnderscores($name_string)
- ? null
- : 'Follow naming conventions: class constants should be named '.
- 'using UPPERCASE_WITH_UNDERSCORES.',
- );
- }
- }
-
- $member_tokens = array();
-
- $props = $root->selectDescendantsOfType('n_CLASS_MEMBER_DECLARATION_LIST');
- foreach ($props as $prop_list) {
- foreach ($prop_list->getChildren() as $token_id => $prop) {
- if ($prop->getTypeName() === 'n_CLASS_MEMBER_MODIFIER_LIST') {
- continue;
- }
-
- $name_token = $prop->getChildByIndex(0);
- $member_tokens[$name_token->getID()] = true;
-
- $name_string = $name_token->getConcreteString();
- $names[] = array(
- 'member',
- $name_string,
- $name_token,
- ArcanistXHPASTLintNamingHook::isLowerCamelCase(
- ArcanistXHPASTLintNamingHook::stripPHPVariable($name_string))
- ? null
- : 'Follow naming conventions: class properties should be named '.
- 'using lowerCamelCase.',
- );
- }
- }
-
- $superglobal_map = array_fill_keys(
- $this->getSuperGlobalNames(),
- true);
-
-
- $fdefs = $root->selectDescendantsOfType('n_FUNCTION_DECLARATION');
- $mdefs = $root->selectDescendantsOfType('n_METHOD_DECLARATION');
- $defs = $fdefs->add($mdefs);
-
- foreach ($defs as $def) {
- $globals = $def->selectDescendantsOfType('n_GLOBAL_DECLARATION_LIST');
- $globals = $globals->selectDescendantsOfType('n_VARIABLE');
-
- $globals_map = array();
- foreach ($globals as $global) {
- $global_string = $global->getConcreteString();
- $globals_map[$global_string] = true;
- $names[] = array(
- 'user',
- $global_string,
- $global,
-
- // No advice for globals, but hooks have an option to provide some.
- null);
- }
-
- // Exclude access of static properties, since lint will be raised at
- // their declaration if they're invalid and they may not conform to
- // variable rules. This is slightly overbroad (includes the entire
- // rhs of a "Class::..." token) to cover cases like "Class:$x[0]". These
- // variables are simply made exempt from naming conventions.
- $exclude_tokens = array();
- $statics = $def->selectDescendantsOfType('n_CLASS_STATIC_ACCESS');
- foreach ($statics as $static) {
- $rhs = $static->getChildByIndex(1);
- $rhs_vars = $def->selectDescendantsOfType('n_VARIABLE');
- foreach ($rhs_vars as $var) {
- $exclude_tokens[$var->getID()] = true;
- }
- }
-
- $vars = $def->selectDescendantsOfType('n_VARIABLE');
- foreach ($vars as $token_id => $var) {
- if (isset($member_tokens[$token_id])) {
- continue;
- }
- if (isset($param_tokens[$token_id])) {
- continue;
- }
- if (isset($exclude_tokens[$token_id])) {
- continue;
- }
- $var_string = $var->getConcreteString();
-
- // Awkward artifact of "$o->{$x}".
- $var_string = trim($var_string, '{}');
-
- if (isset($superglobal_map[$var_string])) {
- continue;
- }
- if (isset($globals_map[$var_string])) {
- continue;
- }
-
- $names[] = array(
- 'variable',
- $var_string,
- $var,
- ArcanistXHPASTLintNamingHook::isLowercaseWithUnderscores(
- ArcanistXHPASTLintNamingHook::stripPHPVariable($var_string))
- ? null
- : 'Follow naming conventions: variables should be named using '.
- 'lowercase_with_underscores.',
- );
- }
- }
-
- $engine = $this->getEngine();
- $working_copy = $engine->getWorkingCopy();
-
- if ($working_copy) {
- // If a naming hook is configured, give it a chance to override the
- // default results for all the symbol names.
- $hook_class = $this->naminghook
- ? $this->naminghook
- : $working_copy->getProjectConfig('lint.xhpast.naminghook');
- if ($hook_class) {
- $hook_obj = newv($hook_class, array());
- foreach ($names as $k => $name_attrs) {
- list($type, $name, $token, $default) = $name_attrs;
- $result = $hook_obj->lintSymbolName($type, $name, $default);
- $names[$k][3] = $result;
- }
- }
- }
-
- // Raise anything we're left with.
- foreach ($names as $k => $name_attrs) {
- list($type, $name, $token, $result) = $name_attrs;
- if ($result) {
- $this->raiseLintAtNode(
- $token,
- self::LINT_NAMING_CONVENTIONS,
- $result);
- }
- }
- }
private function lintSurpriseConstructors(XHPASTNode $root) {
$classes = $root->selectDescendantsOfType('n_CLASS_DECLARATION');
@@ -2348,26 +1970,7 @@
"it declares. Rename the file to '{$rename}'.");
}
- private function lintPlusOperatorOnStrings(XHPASTNode $root) {
- $binops = $root->selectDescendantsOfType('n_BINARY_EXPRESSION');
- foreach ($binops as $binop) {
- $op = $binop->getChildByIndex(1);
- if ($op->getConcreteString() !== '+') {
- continue;
- }
- $left = $binop->getChildByIndex(0);
- $right = $binop->getChildByIndex(2);
- if (($left->getTypeName() === 'n_STRING_SCALAR') ||
- ($right->getTypeName() === 'n_STRING_SCALAR')) {
- $this->raiseLintAtNode(
- $binop,
- self::LINT_PLUS_OPERATOR_ON_STRINGS,
- "In PHP, '.' is the string concatenation operator, not '+'. This ".
- "expression uses '+' with a string literal as an operand.");
- }
- }
- }
/**
* Finds duplicate keys in array initializers, as in
@@ -2620,100 +2223,6 @@
}
}
- protected function lintElseIfStatements(XHPASTNode $root) {
- $tokens = $root->selectTokensOfType('T_ELSEIF');
-
- foreach ($tokens as $token) {
- $this->raiseLintAtToken(
- $token,
- self::LINT_ELSEIF_USAGE,
- pht('Usage of `else if` is preferred over `elseif`.'),
- 'else if');
- }
- }
-
- protected function lintSemicolons(XHPASTNode $root) {
- $tokens = $root->selectTokensOfType(';');
-
- foreach ($tokens as $token) {
- $prev = $token->getPrevToken();
-
- if ($prev->isAnyWhitespace()) {
- $this->raiseLintAtToken(
- $prev,
- self::LINT_SEMICOLON_SPACING,
- pht('Space found before semicolon.'),
- '');
- }
- }
- }
-
- protected function lintLanguageConstructParentheses(XHPASTNode $root) {
- $nodes = $root->selectDescendantsOfTypes(array(
- 'n_INCLUDE_FILE',
- 'n_ECHO_LIST',
- ));
-
- foreach ($nodes as $node) {
- $child = head($node->getChildren());
-
- if ($child->getTypeName() === 'n_PARENTHETICAL_EXPRESSION') {
- list($before, $after) = $child->getSurroundingNonsemanticTokens();
-
- $replace = preg_replace(
- '/^\((.*)\)$/',
- '$1',
- $child->getConcreteString());
-
- if (!$before) {
- $replace = ' '.$replace;
- }
-
- $this->raiseLintAtNode(
- $child,
- self::LINT_LANGUAGE_CONSTRUCT_PAREN,
- pht('Language constructs do not require parentheses.'),
- $replace);
- }
- }
- }
-
- protected function lintEmptyBlockStatements(XHPASTNode $root) {
- $nodes = $root->selectDescendantsOfType('n_STATEMENT_LIST');
-
- foreach ($nodes as $node) {
- $tokens = $node->getTokens();
- $token = head($tokens);
-
- if (count($tokens) <= 2) {
- continue;
- }
-
- // Safety check... if the first token isn't an opening brace then
- // there's nothing to do here.
- if ($token->getTypeName() != '{') {
- continue;
- }
-
- $only_whitespace = true;
- for ($token = $token->getNextToken();
- $token && $token->getTypeName() != '}';
- $token = $token->getNextToken()) {
- $only_whitespace = $only_whitespace && $token->isAnyWhitespace();
- }
-
- if (count($tokens) > 2 && $only_whitespace) {
- $this->raiseLintAtNode(
- $node,
- self::LINT_EMPTY_STATEMENT,
- pht(
- "Braces for an empty block statement shouldn't ".
- "contain only whitespace."),
- '{}');
- }
- }
- }
-
public function getSuperGlobalNames() {
return array(
'$GLOBALS',
diff --git a/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php b/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php
new file mode 100644
--- /dev/null
+++ b/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php
@@ -0,0 +1,37 @@
+<?php
+
+abstract class ArcanistXHPASTLinterRule {
+
+ public final function getIdentifier() {
+ $class = new ReflectionClass($this);
+
+ $const = $class->getConstant('ID');
+ if ($const === false) {
+ throw new Exception(
+ pht(
+ '%s class "%s" must define an ID property.',
+ __CLASS__,
+ get_class($this)));
+ }
+
+ if (!is_int($const)) {
+ throw new Exception(
+ pht(
+ '%s class "%s" has an invalid ID property. '.
+ 'ID must be an integer.',
+ __CLASS__,
+ get_class($this)));
+ }
+
+ return $const;
+ }
+
+ public abstract function getLintName();
+
+ public function getLintSeverity() {
+ return ArcanistLintSeverity::SEVERITY_ERROR;
+ }
+
+ public abstract function process(XHPASTNode $root);
+
+}
diff --git a/src/lint/linter/xhpast/rules/ArcanistElseIfUsageXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistElseIfUsageXHPASTLinterRule.php
new file mode 100644
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistElseIfUsageXHPASTLinterRule.php
@@ -0,0 +1,27 @@
+<?php
+
+final class ArcanistElseIfUsageXHPASTLinterRule
+ extends ArcanistXHPASTLinterRule {
+
+ const ID = 42;
+
+ public function getLintName() {
+ return pht('ElseIf Usage');
+ }
+
+ public function getLintSeverity() {
+ return ArcanistLintSeverity::SEVERITY_ADVICE;
+ }
+
+ public function process(XHPASTNode $root) {
+ $tokens = $root->selectTokensOfType('T_ELSEIF');
+
+ foreach ($tokens as $token) {
+ $this->raiseLintAtToken(
+ $token,
+ pht('Usage of `else if` is preferred over `elseif`.'),
+ 'else if');
+ }
+ }
+
+}
diff --git a/src/lint/linter/xhpast/rules/ArcanistEmptyBlockStatementXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistEmptyBlockStatementXHPASTLinterRule.php
new file mode 100644
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistEmptyBlockStatementXHPASTLinterRule.php
@@ -0,0 +1,51 @@
+<?php
+
+final class ArcanistEmptyBlockStatementXHPASTLinterRule
+ extends ArcanistXHPASTLinterRule {
+
+ const ID = 47;
+
+ public function getLintName() {
+ return pht('Empty Block Statement');
+ }
+
+ public function getLintSeverity() {
+ return ArcanistLintSeverity::SEVERITY_ADVICE;
+ }
+
+ public function process(XHPASTNode $root) {
+ $nodes = $root->selectDescendantsOfType('n_STATEMENT_LIST');
+
+ foreach ($nodes as $node) {
+ $tokens = $node->getTokens();
+ $token = head($tokens);
+
+ if (count($tokens) <= 2) {
+ continue;
+ }
+
+ // Safety check... if the first token isn't an opening brace then
+ // there's nothing to do here.
+ if ($token->getTypeName() != '{') {
+ continue;
+ }
+
+ $only_whitespace = true;
+ for ($token = $token->getNextToken();
+ $token && $token->getTypeName() != '}';
+ $token = $token->getNextToken()) {
+ $only_whitespace = $only_whitespace && $token->isAnyWhitespace();
+ }
+
+ if (count($tokens) > 2 && $only_whitespace) {
+ $this->raiseLintAtNode(
+ $node,
+ pht(
+ "Braces for an empty block statement shouldn't ".
+ "contain only whitespace."),
+ '{}');
+ }
+ }
+ }
+
+}
diff --git a/src/lint/linter/xhpast/rules/ArcanistLanguageConstructParenthesesXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistLanguageConstructParenthesesXHPASTLinterRule.php
new file mode 100644
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistLanguageConstructParenthesesXHPASTLinterRule.php
@@ -0,0 +1,45 @@
+<?php
+
+final class ArcanistLanguageConstructParenthesesXHPASTLinterRule
+ extends ArcanistXHPASTLinterRule {
+
+ const ID = 46;
+
+ public function getLintName() {
+ return pht('Language Construct Parentheses');
+ }
+
+ public function getLintSeverity() {
+ return ArcanistLintSeverity::SEVERITY_WARNING;
+ }
+
+ public function process(XHPASTNode $root) {
+ $nodes = $root->selectDescendantsOfTypes(array(
+ 'n_INCLUDE_FILE',
+ 'n_ECHO_LIST',
+ ));
+
+ foreach ($nodes as $node) {
+ $child = head($node->getChildren());
+
+ if ($child->getTypeName() === 'n_PARENTHETICAL_EXPRESSION') {
+ list($before, $after) = $child->getSurroundingNonsemanticTokens();
+
+ $replace = preg_replace(
+ '/^\((.*)\)$/',
+ '$1',
+ $child->getConcreteString());
+
+ if (!$before) {
+ $replace = ' '.$replace;
+ }
+
+ $this->raiseLintAtNode(
+ $child,
+ pht('Language constructs do not require parentheses.'),
+ $replace);
+ }
+ }
+ }
+
+}
diff --git a/src/lint/linter/xhpast/rules/ArcanistNamingConventionXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistNamingConventionXHPASTLinterRule.php
new file mode 100644
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistNamingConventionXHPASTLinterRule.php
@@ -0,0 +1,270 @@
+<?php
+
+final class ArcanistNamingConventionXHPASTLinterRule
+ extends ArcanistXHPASTLinterRule {
+
+ const ID = 9;
+
+ public function getLintName() {
+ return pht('Naming Convetions');
+ }
+
+ public function getLintSeverity() {
+ return ArcanistLintSeverity::SEVERITY_WARNING;
+ }
+
+ public function process(XHPASTNode $root) {
+ // We're going to build up a list of <type, name, token, error> tuples
+ // and then try to instantiate a hook class which has the opportunity to
+ // override us.
+ $names = array();
+
+ $classes = $root->selectDescendantsOfType('n_CLASS_DECLARATION');
+ foreach ($classes as $class) {
+ $name_token = $class->getChildByIndex(1);
+ $name_string = $name_token->getConcreteString();
+
+ $names[] = array(
+ 'class',
+ $name_string,
+ $name_token,
+ ArcanistXHPASTLintNamingHook::isUpperCamelCase($name_string)
+ ? null
+ : 'Follow naming conventions: classes should be named using '.
+ 'UpperCamelCase.',
+ );
+ }
+
+ $ifaces = $root->selectDescendantsOfType('n_INTERFACE_DECLARATION');
+ foreach ($ifaces as $iface) {
+ $name_token = $iface->getChildByIndex(1);
+ $name_string = $name_token->getConcreteString();
+ $names[] = array(
+ 'interface',
+ $name_string,
+ $name_token,
+ ArcanistXHPASTLintNamingHook::isUpperCamelCase($name_string)
+ ? null
+ : 'Follow naming conventions: interfaces should be named using '.
+ 'UpperCamelCase.',
+ );
+ }
+
+
+ $functions = $root->selectDescendantsOfType('n_FUNCTION_DECLARATION');
+ foreach ($functions as $function) {
+ $name_token = $function->getChildByIndex(2);
+ if ($name_token->getTypeName() === 'n_EMPTY') {
+ // Unnamed closure.
+ continue;
+ }
+ $name_string = $name_token->getConcreteString();
+ $names[] = array(
+ 'function',
+ $name_string,
+ $name_token,
+ ArcanistXHPASTLintNamingHook::isLowercaseWithUnderscores(
+ ArcanistXHPASTLintNamingHook::stripPHPFunction($name_string))
+ ? null
+ : 'Follow naming conventions: functions should be named using '.
+ 'lowercase_with_underscores.',
+ );
+ }
+
+
+ $methods = $root->selectDescendantsOfType('n_METHOD_DECLARATION');
+ foreach ($methods as $method) {
+ $name_token = $method->getChildByIndex(2);
+ $name_string = $name_token->getConcreteString();
+ $names[] = array(
+ 'method',
+ $name_string,
+ $name_token,
+ ArcanistXHPASTLintNamingHook::isLowerCamelCase(
+ ArcanistXHPASTLintNamingHook::stripPHPFunction($name_string))
+ ? null
+ : 'Follow naming conventions: methods should be named using '.
+ 'lowerCamelCase.',
+ );
+ }
+
+ $param_tokens = array();
+
+ $params = $root->selectDescendantsOfType('n_DECLARATION_PARAMETER_LIST');
+ foreach ($params as $param_list) {
+ foreach ($param_list->getChildren() as $param) {
+ $name_token = $param->getChildByIndex(1);
+ if ($name_token->getTypeName() === 'n_VARIABLE_REFERENCE') {
+ $name_token = $name_token->getChildOfType(0, 'n_VARIABLE');
+ }
+ $param_tokens[$name_token->getID()] = true;
+ $name_string = $name_token->getConcreteString();
+
+ $names[] = array(
+ 'parameter',
+ $name_string,
+ $name_token,
+ ArcanistXHPASTLintNamingHook::isLowercaseWithUnderscores(
+ ArcanistXHPASTLintNamingHook::stripPHPVariable($name_string))
+ ? null
+ : 'Follow naming conventions: parameters should be named using '.
+ 'lowercase_with_underscores.',
+ );
+ }
+ }
+
+
+ $constants = $root->selectDescendantsOfType(
+ 'n_CLASS_CONSTANT_DECLARATION_LIST');
+ foreach ($constants as $constant_list) {
+ foreach ($constant_list->getChildren() as $constant) {
+ $name_token = $constant->getChildByIndex(0);
+ $name_string = $name_token->getConcreteString();
+ $names[] = array(
+ 'constant',
+ $name_string,
+ $name_token,
+ ArcanistXHPASTLintNamingHook::isUppercaseWithUnderscores($name_string)
+ ? null
+ : 'Follow naming conventions: class constants should be named '.
+ 'using UPPERCASE_WITH_UNDERSCORES.',
+ );
+ }
+ }
+
+ $member_tokens = array();
+
+ $props = $root->selectDescendantsOfType('n_CLASS_MEMBER_DECLARATION_LIST');
+ foreach ($props as $prop_list) {
+ foreach ($prop_list->getChildren() as $token_id => $prop) {
+ if ($prop->getTypeName() === 'n_CLASS_MEMBER_MODIFIER_LIST') {
+ continue;
+ }
+
+ $name_token = $prop->getChildByIndex(0);
+ $member_tokens[$name_token->getID()] = true;
+
+ $name_string = $name_token->getConcreteString();
+ $names[] = array(
+ 'member',
+ $name_string,
+ $name_token,
+ ArcanistXHPASTLintNamingHook::isLowerCamelCase(
+ ArcanistXHPASTLintNamingHook::stripPHPVariable($name_string))
+ ? null
+ : 'Follow naming conventions: class properties should be named '.
+ 'using lowerCamelCase.',
+ );
+ }
+ }
+
+ $superglobal_map = array_fill_keys(
+ $this->getSuperGlobalNames(),
+ true);
+
+
+ $fdefs = $root->selectDescendantsOfType('n_FUNCTION_DECLARATION');
+ $mdefs = $root->selectDescendantsOfType('n_METHOD_DECLARATION');
+ $defs = $fdefs->add($mdefs);
+
+ foreach ($defs as $def) {
+ $globals = $def->selectDescendantsOfType('n_GLOBAL_DECLARATION_LIST');
+ $globals = $globals->selectDescendantsOfType('n_VARIABLE');
+
+ $globals_map = array();
+ foreach ($globals as $global) {
+ $global_string = $global->getConcreteString();
+ $globals_map[$global_string] = true;
+ $names[] = array(
+ 'user',
+ $global_string,
+ $global,
+
+ // No advice for globals, but hooks have an option to provide some.
+ null);
+ }
+
+ // Exclude access of static properties, since lint will be raised at
+ // their declaration if they're invalid and they may not conform to
+ // variable rules. This is slightly overbroad (includes the entire
+ // rhs of a "Class::..." token) to cover cases like "Class:$x[0]". These
+ // variables are simply made exempt from naming conventions.
+ $exclude_tokens = array();
+ $statics = $def->selectDescendantsOfType('n_CLASS_STATIC_ACCESS');
+ foreach ($statics as $static) {
+ $rhs = $static->getChildByIndex(1);
+ $rhs_vars = $def->selectDescendantsOfType('n_VARIABLE');
+ foreach ($rhs_vars as $var) {
+ $exclude_tokens[$var->getID()] = true;
+ }
+ }
+
+ $vars = $def->selectDescendantsOfType('n_VARIABLE');
+ foreach ($vars as $token_id => $var) {
+ if (isset($member_tokens[$token_id])) {
+ continue;
+ }
+ if (isset($param_tokens[$token_id])) {
+ continue;
+ }
+ if (isset($exclude_tokens[$token_id])) {
+ continue;
+ }
+
+ $var_string = $var->getConcreteString();
+
+ // Awkward artifact of "$o->{$x}".
+ $var_string = trim($var_string, '{}');
+
+ if (isset($superglobal_map[$var_string])) {
+ continue;
+ }
+ if (isset($globals_map[$var_string])) {
+ continue;
+ }
+
+ $names[] = array(
+ 'variable',
+ $var_string,
+ $var,
+ ArcanistXHPASTLintNamingHook::isLowercaseWithUnderscores(
+ ArcanistXHPASTLintNamingHook::stripPHPVariable($var_string))
+ ? null
+ : 'Follow naming conventions: variables should be named using '.
+ 'lowercase_with_underscores.',
+ );
+ }
+ }
+
+ $engine = $this->getEngine();
+ $working_copy = $engine->getWorkingCopy();
+
+ if ($working_copy) {
+ // If a naming hook is configured, give it a chance to override the
+ // default results for all the symbol names.
+ $hook_class = $this->naminghook
+ ? $this->naminghook
+ : $working_copy->getProjectConfig('lint.xhpast.naminghook');
+ if ($hook_class) {
+ $hook_obj = newv($hook_class, array());
+ foreach ($names as $k => $name_attrs) {
+ list($type, $name, $token, $default) = $name_attrs;
+ $result = $hook_obj->lintSymbolName($type, $name, $default);
+ $names[$k][3] = $result;
+ }
+ }
+ }
+
+ // Raise anything we're left with.
+ foreach ($names as $k => $name_attrs) {
+ list($type, $name, $token, $result) = $name_attrs;
+ if ($result) {
+ $this->raiseLintAtNode(
+ $token,
+ self::LINT_NAMING_CONVENTIONS,
+ $result);
+ }
+ }
+ }
+
+}
diff --git a/src/lint/linter/xhpast/rules/ArcanistPlusOperatorOnStringsXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistPlusOperatorOnStringsXHPASTLinterRule.php
new file mode 100644
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistPlusOperatorOnStringsXHPASTLinterRule.php
@@ -0,0 +1,32 @@
+<?php
+
+final class ArcanistPlusOperatorOnStringsXHPASTLinterRule
+ extends ArcanistXHPASTLinterRule {
+
+ const ID = 21;
+
+ public function getLintName() {
+ return pht('Not String Concatenation');
+ }
+
+ public function process(XHPASTNode $root) {
+ $binops = $root->selectDescendantsOfType('n_BINARY_EXPRESSION');
+ foreach ($binops as $binop) {
+ $op = $binop->getChildByIndex(1);
+ if ($op->getConcreteString() !== '+') {
+ continue;
+ }
+
+ $left = $binop->getChildByIndex(0);
+ $right = $binop->getChildByIndex(2);
+ if (($left->getTypeName() === 'n_STRING_SCALAR') ||
+ ($right->getTypeName() === 'n_STRING_SCALAR')) {
+ $this->raiseLintAtNode(
+ $binop,
+ "In PHP, '.' is the string concatenation operator, not '+'. This ".
+ "expression uses '+' with a string literal as an operand.");
+ }
+ }
+ }
+
+}
diff --git a/src/lint/linter/xhpast/rules/ArcanistSemicolonSpacingXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistSemicolonSpacingXHPASTLinterRule.php
new file mode 100644
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistSemicolonSpacingXHPASTLinterRule.php
@@ -0,0 +1,31 @@
+<?php
+
+final class ArcanistSemicolonSpacingXHPASTLinterRule
+ extends ArcanistXHPASTLinterRule {
+
+ const ID = 43;
+
+ public function getLintName() {
+ return pht('Semicolon Spacing');
+ }
+
+ public function getLintSeverity() {
+ return ArcanistLintSeverity::SEVERITY_ADVICE;
+ }
+
+ public function process(XHPASTNode $root) {
+ $tokens = $root->selectTokensOfType(';');
+
+ foreach ($tokens as $token) {
+ $prev = $token->getPrevToken();
+
+ if ($prev->isAnyWhitespace()) {
+ $this->raiseLintAtToken(
+ $prev,
+ pht('Space found before semicolon.'),
+ '');
+ }
+ }
+ }
+
+}
diff --git a/src/lint/linter/xhpast/rules/ArcanistTautologicalExpressionXHPASTLinterRule.php b/src/lint/linter/xhpast/rules/ArcanistTautologicalExpressionXHPASTLinterRule.php
new file mode 100644
--- /dev/null
+++ b/src/lint/linter/xhpast/rules/ArcanistTautologicalExpressionXHPASTLinterRule.php
@@ -0,0 +1,68 @@
+<?php
+
+final class ArcanistTautologicalExpressionXHPASTLinterRule
+ extends ArcanistXHPASTLinterRule {
+
+ const ID = 20;
+
+ public function getLintName() {
+ return pht('Tautological Expression');
+ }
+
+ public function process(XHPASTNode $root) {
+ $expressions = $root->selectDescendantsOfType('n_BINARY_EXPRESSION');
+
+ static $operators = array(
+ '-' => true,
+ '/' => true,
+ '-=' => true,
+ '/=' => true,
+ '<=' => true,
+ '<' => true,
+ '==' => true,
+ '===' => true,
+ '!=' => true,
+ '!==' => true,
+ '>=' => true,
+ '>' => true,
+ );
+
+ static $logical = array(
+ '||' => true,
+ '&&' => true,
+ );
+
+ foreach ($expressions as $expr) {
+ $operator = $expr->getChildByIndex(1)->getConcreteString();
+ if (!empty($operators[$operator])) {
+ $left = $expr->getChildByIndex(0)->getSemanticString();
+ $right = $expr->getChildByIndex(2)->getSemanticString();
+
+ if ($left === $right) {
+ $this->raiseLintAtNode(
+ $expr,
+ 'Both sides of this expression are identical, so it always '.
+ 'evaluates to a constant.');
+ }
+ }
+
+ if (!empty($logical[$operator])) {
+ $left = $expr->getChildByIndex(0)->getSemanticString();
+ $right = $expr->getChildByIndex(2)->getSemanticString();
+
+ // NOTE: These will be null to indicate "could not evaluate".
+ $left = $this->evaluateStaticBoolean($left);
+ $right = $this->evaluateStaticBoolean($right);
+
+ if (($operator === '||' && ($left === true || $right === true)) ||
+ ($operator === '&&' && ($left === false || $right === false))) {
+ $this->raiseLintAtNode(
+ $expr,
+ 'The logical value of this expression is static. Did you forget '.
+ 'to remove some debugging code?');
+ }
+ }
+ }
+ }
+
+}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 22, 6:28 AM (2 w, 6 h ago)
Storage Engine
amazon-s3
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
phabricator/secure/ry/jl/xzuack7z5xpcybru
Default Alt Text
D10541.id25325.diff (47 KB)

Event Timeline

Phabricator · Built by Phacility