D14010.id33882.diff
No OneTemporary
Actions

Size

156 KB

Referenced Files

None

Subscribers

None

D14010.id33882.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
	@@ -10,20 +10,27 @@
	'__library_version__' => 2,
	'class' => array(
	'ArcanistAliasFunctionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistAliasFunctionXHPASTLinterRule.php',
	+ 'ArcanistAliasFunctionXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistAliasFunctionXHPASTLinterRuleTestCase.php',
	'ArcanistAliasWorkflow' => 'workflow/ArcanistAliasWorkflow.php',
	'ArcanistAmendWorkflow' => 'workflow/ArcanistAmendWorkflow.php',
	'ArcanistAnoidWorkflow' => 'workflow/ArcanistAnoidWorkflow.php',
	'ArcanistArrayIndexSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistArrayIndexSpacingXHPASTLinterRule.php',
	+ 'ArcanistArrayIndexSpacingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistArrayIndexSpacingXHPASTLinterRuleTestCase.php',
	'ArcanistArraySeparatorXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistArraySeparatorXHPASTLinterRule.php',
	+ 'ArcanistArraySeparatorXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistArraySeparatorXHPASTLinterRuleTestCase.php',
	'ArcanistArrayValueXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistArrayValueXHPASTLinterRule.php',
	+ 'ArcanistArrayValueXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistArrayValueXHPASTLinterRuleTestCase.php',
	'ArcanistBackoutWorkflow' => 'workflow/ArcanistBackoutWorkflow.php',
	'ArcanistBaseCommitParser' => 'parser/ArcanistBaseCommitParser.php',
	'ArcanistBaseCommitParserTestCase' => 'parser/__tests__/ArcanistBaseCommitParserTestCase.php',
	'ArcanistBaseXHPASTLinter' => 'lint/linter/ArcanistBaseXHPASTLinter.php',
	'ArcanistBinaryExpressionSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistBinaryExpressionSpacingXHPASTLinterRule.php',
	+ 'ArcanistBinaryExpressionSpacingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistBinaryExpressionSpacingXHPASTLinterRuleTestCase.php',
	'ArcanistBlacklistedFunctionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistBlacklistedFunctionXHPASTLinterRule.php',
	+ 'ArcanistBlacklistedFunctionXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistBlacklistedFunctionXHPASTLinterRuleTestCase.php',
	'ArcanistBookmarkWorkflow' => 'workflow/ArcanistBookmarkWorkflow.php',
	'ArcanistBraceFormattingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistBraceFormattingXHPASTLinterRule.php',
	+ 'ArcanistBraceFormattingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistBraceFormattingXHPASTLinterRuleTestCase.php',
	'ArcanistBranchWorkflow' => 'workflow/ArcanistBranchWorkflow.php',
	'ArcanistBritishTestCase' => 'configuration/__tests__/ArcanistBritishTestCase.php',
	'ArcanistBrowseWorkflow' => 'workflow/ArcanistBrowseWorkflow.php',
	@@ -34,14 +41,18 @@
	'ArcanistCSharpLinter' => 'lint/linter/ArcanistCSharpLinter.php',
	'ArcanistCallConduitWorkflow' => 'workflow/ArcanistCallConduitWorkflow.php',
	'ArcanistCallParenthesesXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistCallParenthesesXHPASTLinterRule.php',
	+ 'ArcanistCallParenthesesXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistCallParenthesesXHPASTLinterRuleTestCase.php',
	'ArcanistCallTimePassByReferenceXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistCallTimePassByReferenceXHPASTLinterRule.php',
	+ 'ArcanistCallTimePassByReferenceXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistCallTimePassByReferenceXHPASTLinterRuleTestCase.php',
	'ArcanistCapabilityNotSupportedException' => 'workflow/exception/ArcanistCapabilityNotSupportedException.php',
	'ArcanistCastSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistCastSpacingXHPASTLinterRule.php',
	+ 'ArcanistCastSpacingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistCastSpacingXHPASTLinterRuleTestCase.php',
	'ArcanistCheckstyleXMLLintRenderer' => 'lint/renderer/ArcanistCheckstyleXMLLintRenderer.php',
	'ArcanistChmodLinter' => 'lint/linter/ArcanistChmodLinter.php',
	'ArcanistChmodLinterTestCase' => 'lint/linter/__tests__/ArcanistChmodLinterTestCase.php',
	'ArcanistClassFilenameMismatchXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistClassFilenameMismatchXHPASTLinterRule.php',
	'ArcanistClassNameLiteralXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistClassNameLiteralXHPASTLinterRule.php',
	+ 'ArcanistClassNameLiteralXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistClassNameLiteralXHPASTLinterRuleTestCase.php',
	'ArcanistCloseRevisionWorkflow' => 'workflow/ArcanistCloseRevisionWorkflow.php',
	'ArcanistCloseWorkflow' => 'workflow/ArcanistCloseWorkflow.php',
	'ArcanistClosureLinter' => 'lint/linter/ArcanistClosureLinter.php',
	@@ -52,25 +63,31 @@
	'ArcanistCommentRemoverTestCase' => 'parser/__tests__/ArcanistCommentRemoverTestCase.php',
	'ArcanistCommentSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistCommentSpacingXHPASTLinterRule.php',
	'ArcanistCommentStyleXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistCommentStyleXHPASTLinterRule.php',
	+ 'ArcanistCommentStyleXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistCommentStyleXHPASTLinterRuleTestCase.php',
	'ArcanistCommitWorkflow' => 'workflow/ArcanistCommitWorkflow.php',
	'ArcanistCompilerLintRenderer' => 'lint/renderer/ArcanistCompilerLintRenderer.php',
	'ArcanistComposerLinter' => 'lint/linter/ArcanistComposerLinter.php',
	'ArcanistComprehensiveLintEngine' => 'lint/engine/ArcanistComprehensiveLintEngine.php',
	'ArcanistConcatenationOperatorXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistConcatenationOperatorXHPASTLinterRule.php',
	+ 'ArcanistConcatenationOperatorXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistConcatenationOperatorXHPASTLinterRuleTestCase.php',
	'ArcanistConfiguration' => 'configuration/ArcanistConfiguration.php',
	'ArcanistConfigurationDrivenLintEngine' => 'lint/engine/ArcanistConfigurationDrivenLintEngine.php',
	'ArcanistConfigurationDrivenUnitTestEngine' => 'unit/engine/ArcanistConfigurationDrivenUnitTestEngine.php',
	'ArcanistConfigurationManager' => 'configuration/ArcanistConfigurationManager.php',
	'ArcanistConsoleLintRenderer' => 'lint/renderer/ArcanistConsoleLintRenderer.php',
	'ArcanistConstructorParenthesesXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistConstructorParenthesesXHPASTLinterRule.php',
	+ 'ArcanistConstructorParenthesesXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistConstructorParenthesesXHPASTLinterRuleTestCase.php',
	'ArcanistControlStatementSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistControlStatementSpacingXHPASTLinterRule.php',
	+ 'ArcanistControlStatementSpacingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistControlStatementSpacingXHPASTLinterRuleTestCase.php',
	'ArcanistCoverWorkflow' => 'workflow/ArcanistCoverWorkflow.php',
	'ArcanistCppcheckLinter' => 'lint/linter/ArcanistCppcheckLinter.php',
	'ArcanistCppcheckLinterTestCase' => 'lint/linter/__tests__/ArcanistCppcheckLinterTestCase.php',
	'ArcanistCpplintLinter' => 'lint/linter/ArcanistCpplintLinter.php',
	'ArcanistCpplintLinterTestCase' => 'lint/linter/__tests__/ArcanistCpplintLinterTestCase.php',
	'ArcanistDeclarationParenthesesXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistDeclarationParenthesesXHPASTLinterRule.php',
	+ 'ArcanistDeclarationParenthesesXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistDeclarationParenthesesXHPASTLinterRuleTestCase.php',
	'ArcanistDefaultParametersXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistDefaultParametersXHPASTLinterRule.php',
	+ 'ArcanistDefaultParametersXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistDefaultParametersXHPASTLinterRuleTestCase.php',
	'ArcanistDiffChange' => 'parser/diff/ArcanistDiffChange.php',
	'ArcanistDiffChangeType' => 'parser/diff/ArcanistDiffChangeType.php',
	'ArcanistDiffHunk' => 'parser/diff/ArcanistDiffHunk.php',
	@@ -85,18 +102,26 @@
	'ArcanistDifferentialRevisionHash' => 'differential/constants/ArcanistDifferentialRevisionHash.php',
	'ArcanistDifferentialRevisionStatus' => 'differential/constants/ArcanistDifferentialRevisionStatus.php',
	'ArcanistDoubleQuoteXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistDoubleQuoteXHPASTLinterRule.php',
	+ 'ArcanistDoubleQuoteXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistDoubleQuoteXHPASTLinterRuleTestCase.php',
	'ArcanistDownloadWorkflow' => 'workflow/ArcanistDownloadWorkflow.php',
	'ArcanistDuplicateKeysInArrayXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistDuplicateKeysInArrayXHPASTLinterRule.php',
	+ 'ArcanistDuplicateKeysInArrayXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistDuplicateKeysInArrayXHPASTLinterRuleTestCase.php',
	'ArcanistDuplicateSwitchCaseXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistDuplicateSwitchCaseXHPASTLinterRule.php',
	+ 'ArcanistDuplicateSwitchCaseXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistDuplicateSwitchCaseXHPASTLinterRuleTestCase.php',
	'ArcanistDynamicDefineXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistDynamicDefineXHPASTLinterRule.php',
	+ 'ArcanistDynamicDefineXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistDynamicDefineXHPASTLinterRuleTestCase.php',
	'ArcanistElseIfUsageXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistElseIfUsageXHPASTLinterRule.php',
	+ 'ArcanistElseIfUsageXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistElseIfUsageXHPASTLinterRuleTestCase.php',
	'ArcanistEmptyStatementXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistEmptyStatementXHPASTLinterRule.php',
	+ 'ArcanistEmptyStatementXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistEmptyStatementXHPASTLinterRuleTestCase.php',
	'ArcanistEventType' => 'events/constant/ArcanistEventType.php',
	'ArcanistExitExpressionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistExitExpressionXHPASTLinterRule.php',
	+ 'ArcanistExitExpressionXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistExitExpressionXHPASTLinterRuleTestCase.php',
	'ArcanistExportWorkflow' => 'workflow/ArcanistExportWorkflow.php',
	'ArcanistExternalLinter' => 'lint/linter/ArcanistExternalLinter.php',
	'ArcanistExternalLinterTestCase' => 'lint/linter/__tests__/ArcanistExternalLinterTestCase.php',
	'ArcanistExtractUseXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistExtractUseXHPASTLinterRule.php',
	+ 'ArcanistExtractUseXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistExtractUseXHPASTLinterRuleTestCase.php',
	'ArcanistFeatureWorkflow' => 'workflow/ArcanistFeatureWorkflow.php',
	'ArcanistFileDataRef' => 'upload/ArcanistFileDataRef.php',
	'ArcanistFileUploader' => 'upload/ArcanistFileUploader.php',
	@@ -106,12 +131,14 @@
	'ArcanistFlake8Linter' => 'lint/linter/ArcanistFlake8Linter.php',
	'ArcanistFlake8LinterTestCase' => 'lint/linter/__tests__/ArcanistFlake8LinterTestCase.php',
	'ArcanistFormattedStringXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistFormattedStringXHPASTLinterRule.php',
	+ 'ArcanistFormattedStringXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistFormattedStringXHPASTLinterRuleTestCase.php',
	'ArcanistFutureLinter' => 'lint/linter/ArcanistFutureLinter.php',
	'ArcanistGeneratedLinter' => 'lint/linter/ArcanistGeneratedLinter.php',
	'ArcanistGeneratedLinterTestCase' => 'lint/linter/__tests__/ArcanistGeneratedLinterTestCase.php',
	'ArcanistGetConfigWorkflow' => 'workflow/ArcanistGetConfigWorkflow.php',
	'ArcanistGitAPI' => 'repository/api/ArcanistGitAPI.php',
	'ArcanistGlobalVariableXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistGlobalVariableXHPASTLinterRule.php',
	+ 'ArcanistGlobalVariableXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistGlobalVariableXHPASTLinterRuleTestCase.php',
	'ArcanistGoLintLinter' => 'lint/linter/ArcanistGoLintLinter.php',
	'ArcanistGoLintLinterTestCase' => 'lint/linter/__tests__/ArcanistGoLintLinterTestCase.php',
	'ArcanistGoTestResultParser' => 'unit/parser/ArcanistGoTestResultParser.php',
	@@ -124,14 +151,22 @@
	'ArcanistHgProxyServer' => 'hgdaemon/ArcanistHgProxyServer.php',
	'ArcanistHgServerChannel' => 'hgdaemon/ArcanistHgServerChannel.php',
	'ArcanistImplicitConstructorXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistImplicitConstructorXHPASTLinterRule.php',
	+ 'ArcanistImplicitConstructorXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistImplicitConstructorXHPASTLinterRuleTestCase.php',
	'ArcanistImplicitFallthroughXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistImplicitFallthroughXHPASTLinterRule.php',
	+ 'ArcanistImplicitFallthroughXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistImplicitFallthroughXHPASTLinterRuleTestCase.php',
	'ArcanistImplicitVisibilityXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistImplicitVisibilityXHPASTLinterRule.php',
	+ 'ArcanistImplicitVisibilityXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistImplicitVisibilityXHPASTLinterRuleTestCase.php',
	'ArcanistInlineHTMLXHPASTLinterRule' => 'lint/linter/ArcanistInlineHTMLXHPASTLinterRule.php',
	+ 'ArcanistInlineHTMLXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInlineHTMLXHPASTLinterRuleTestCase.php',
	'ArcanistInnerFunctionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInnerFunctionXHPASTLinterRule.php',
	+ 'ArcanistInnerFunctionXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInnerFunctionXHPASTLinterRuleTestCase.php',
	'ArcanistInstallCertificateWorkflow' => 'workflow/ArcanistInstallCertificateWorkflow.php',
	'ArcanistInstanceOfOperatorXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInstanceOfOperatorXHPASTLinterRule.php',
	+ 'ArcanistInstanceOfOperatorXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInstanceOfOperatorXHPASTLinterRuleTestCase.php',
	'ArcanistInvalidDefaultParameterXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInvalidDefaultParameterXHPASTLinterRule.php',
	+ 'ArcanistInvalidDefaultParameterXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInvalidDefaultParameterXHPASTLinterRuleTestCase.php',
	'ArcanistInvalidModifiersXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistInvalidModifiersXHPASTLinterRule.php',
	+ 'ArcanistInvalidModifiersXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistInvalidModifiersXHPASTLinterRuleTestCase.php',
	'ArcanistJSHintLinter' => 'lint/linter/ArcanistJSHintLinter.php',
	'ArcanistJSHintLinterTestCase' => 'lint/linter/__tests__/ArcanistJSHintLinterTestCase.php',
	'ArcanistJSONLintLinter' => 'lint/linter/ArcanistJSONLintLinter.php',
	@@ -142,9 +177,12 @@
	'ArcanistJscsLinter' => 'lint/linter/ArcanistJscsLinter.php',
	'ArcanistJscsLinterTestCase' => 'lint/linter/__tests__/ArcanistJscsLinterTestCase.php',
	'ArcanistKeywordCasingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistKeywordCasingXHPASTLinterRule.php',
	+ 'ArcanistKeywordCasingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistKeywordCasingXHPASTLinterRuleTestCase.php',
	'ArcanistLambdaFuncFunctionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistLambdaFuncFunctionXHPASTLinterRule.php',
	+ 'ArcanistLambdaFuncFunctionXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistLambdaFuncFunctionXHPASTLinterRuleTestCase.php',
	'ArcanistLandWorkflow' => 'workflow/ArcanistLandWorkflow.php',
	'ArcanistLanguageConstructParenthesesXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistLanguageConstructParenthesesXHPASTLinterRule.php',
	+ 'ArcanistLanguageConstructParenthesesXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistLanguageConstructParenthesesXHPASTLinterRuleTestCase.php',
	'ArcanistLesscLinter' => 'lint/linter/ArcanistLesscLinter.php',
	'ArcanistLesscLinterTestCase' => 'lint/linter/__tests__/ArcanistLesscLinterTestCase.php',
	'ArcanistLiberateWorkflow' => 'workflow/ArcanistLiberateWorkflow.php',
	@@ -157,12 +195,17 @@
	'ArcanistLintSeverity' => 'lint/ArcanistLintSeverity.php',
	'ArcanistLintWorkflow' => 'workflow/ArcanistLintWorkflow.php',
	'ArcanistLinter' => 'lint/linter/ArcanistLinter.php',
	+ 'ArcanistLinterRule' => 'lint/linter/ArcanistLinterRule.php',
	+ 'ArcanistLinterRuleTestCase' => 'lint/linter/__tests__/ArcanistLinterRuleTestCase.php',
	'ArcanistLinterTestCase' => 'lint/linter/__tests__/ArcanistLinterTestCase.php',
	'ArcanistLintersWorkflow' => 'workflow/ArcanistLintersWorkflow.php',
	'ArcanistListAssignmentXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistListAssignmentXHPASTLinterRule.php',
	+ 'ArcanistListAssignmentXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistListAssignmentXHPASTLinterRuleTestCase.php',
	'ArcanistListWorkflow' => 'workflow/ArcanistListWorkflow.php',
	'ArcanistLogicalOperatorsXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistLogicalOperatorsXHPASTLinterRule.php',
	+ 'ArcanistLogicalOperatorsXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistLogicalOperatorsXHPASTLinterRuleTestCase.php',
	'ArcanistLowercaseFunctionsXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistLowercaseFunctionsXHPASTLinterRule.php',
	+ 'ArcanistLowercaseFunctionsXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistLowercaseFunctionsXHPASTLinterRuleTestCase.php',
	'ArcanistMercurialAPI' => 'repository/api/ArcanistMercurialAPI.php',
	'ArcanistMercurialParser' => 'repository/parser/ArcanistMercurialParser.php',
	'ArcanistMercurialParserTestCase' => 'repository/parser/__tests__/ArcanistMercurialParserTestCase.php',
	@@ -170,24 +213,35 @@
	'ArcanistMergeConflictLinterTestCase' => 'lint/linter/__tests__/ArcanistMergeConflictLinterTestCase.php',
	'ArcanistMissingLinterException' => 'lint/linter/exception/ArcanistMissingLinterException.php',
	'ArcanistModifierOrderingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistModifierOrderingXHPASTLinterRule.php',
	+ 'ArcanistModifierOrderingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistModifierOrderingXHPASTLinterRuleTestCase.php',
	'ArcanistNamingConventionsXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistNamingConventionsXHPASTLinterRule.php',
	+ 'ArcanistNamingConventionsXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistNamingConventionsXHPASTLinterRuleTestCase.php',
	'ArcanistNewlineAfterOpenTagXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistNewlineAfterOpenTagXHPASTLinterRule.php',
	+ 'ArcanistNewlineAfterOpenTagXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistNewlineAfterOpenTagXHPASTLinterRuleTestCase.php',
	'ArcanistNoEffectException' => 'exception/usage/ArcanistNoEffectException.php',
	'ArcanistNoEngineException' => 'exception/usage/ArcanistNoEngineException.php',
	'ArcanistNoLintLinter' => 'lint/linter/ArcanistNoLintLinter.php',
	'ArcanistNoLintLinterTestCase' => 'lint/linter/__tests__/ArcanistNoLintLinterTestCase.php',
	'ArcanistNoParentScopeXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistNoParentScopeXHPASTLinterRule.php',
	+ 'ArcanistNoParentScopeXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistNoParentScopeXHPASTLinterRuleTestCase.php',
	'ArcanistNoneLintRenderer' => 'lint/renderer/ArcanistNoneLintRenderer.php',
	'ArcanistObjectOperatorSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistObjectOperatorSpacingXHPASTLinterRule.php',
	+ 'ArcanistObjectOperatorSpacingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistObjectOperatorSpacingXHPASTLinterRuleTestCase.php',
	'ArcanistPEP8Linter' => 'lint/linter/ArcanistPEP8Linter.php',
	'ArcanistPEP8LinterTestCase' => 'lint/linter/__tests__/ArcanistPEP8LinterTestCase.php',
	'ArcanistPHPCloseTagXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistPHPCloseTagXHPASTLinterRule.php',
	'ArcanistPHPCompatibilityXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistPHPCompatibilityXHPASTLinterRule.php',
	+ 'ArcanistPHPCompatibilityXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistPHPCompatibilityXHPASTLinterRuleTestCase.php',
	'ArcanistPHPEchoTagXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistPHPEchoTagXHPASTLinterRule.php',
	+ 'ArcanistPHPEchoTagXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistPHPEchoTagXHPASTLinterRuleTestCase.php',
	'ArcanistPHPOpenTagXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistPHPOpenTagXHPASTLinterRule.php',
	+ 'ArcanistPHPOpenTagXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistPHPOpenTagXHPASTLinterRuleTestCase.php',
	'ArcanistPHPShortTagXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistPHPShortTagXHPASTLinterRule.php',
	+ 'ArcanistPHPShortTagXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistPHPShortTagXHPASTLinterRuleTestCase.php',
	'ArcanistParenthesesSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistParenthesesSpacingXHPASTLinterRule.php',
	+ 'ArcanistParenthesesSpacingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistParenthesesSpacingXHPASTLinterRuleTestCase.php',
	'ArcanistParseStrUseXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistParseStrUseXHPASTLinterRule.php',
	+ 'ArcanistParseStrUseXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistParseStrUseXHPASTLinterRuleTestCase.php',
	'ArcanistPasteWorkflow' => 'workflow/ArcanistPasteWorkflow.php',
	'ArcanistPatchWorkflow' => 'workflow/ArcanistPatchWorkflow.php',
	'ArcanistPhpLinter' => 'lint/linter/ArcanistPhpLinter.php',
	@@ -200,7 +254,9 @@
	'ArcanistPhutilXHPASTLinter' => 'lint/linter/ArcanistPhutilXHPASTLinter.php',
	'ArcanistPhutilXHPASTLinterTestCase' => 'lint/linter/__tests__/ArcanistPhutilXHPASTLinterTestCase.php',
	'ArcanistPlusOperatorOnStringsXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistPlusOperatorOnStringsXHPASTLinterRule.php',
	+ 'ArcanistPlusOperatorOnStringsXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistPlusOperatorOnStringsXHPASTLinterRuleTestCase.php',
	'ArcanistPregQuoteMisuseXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistPregQuoteMisuseXHPASTLinterRule.php',
	+ 'ArcanistPregQuoteMisuseXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistPregQuoteMisuseXHPASTLinterRuleTestCase.php',
	'ArcanistPuppetLintLinter' => 'lint/linter/ArcanistPuppetLintLinter.php',
	'ArcanistPuppetLintLinterTestCase' => 'lint/linter/__tests__/ArcanistPuppetLintLinterTestCase.php',
	'ArcanistPyFlakesLinter' => 'lint/linter/ArcanistPyFlakesLinter.php',
	@@ -211,8 +267,11 @@
	'ArcanistRepositoryAPIMiscTestCase' => 'repository/api/__tests__/ArcanistRepositoryAPIMiscTestCase.php',
	'ArcanistRepositoryAPIStateTestCase' => 'repository/api/__tests__/ArcanistRepositoryAPIStateTestCase.php',
	'ArcanistReusedAsIteratorXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistReusedAsIteratorXHPASTLinterRule.php',
	+ 'ArcanistReusedAsIteratorXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistReusedAsIteratorXHPASTLinterRuleTestCase.php',
	'ArcanistReusedIteratorReferenceXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistReusedIteratorReferenceXHPASTLinterRule.php',
	+ 'ArcanistReusedIteratorReferenceXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistReusedIteratorReferenceXHPASTLinterRuleTestCase.php',
	'ArcanistReusedIteratorXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistReusedIteratorXHPASTLinterRule.php',
	+ 'ArcanistReusedIteratorXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistReusedIteratorXHPASTLinterRuleTestCase.php',
	'ArcanistRevertWorkflow' => 'workflow/ArcanistRevertWorkflow.php',
	'ArcanistRuboCopLinter' => 'lint/linter/ArcanistRuboCopLinter.php',
	'ArcanistRuboCopLinterTestCase' => 'lint/linter/__tests__/ArcanistRuboCopLinterTestCase.php',
	@@ -220,35 +279,47 @@
	'ArcanistRubyLinterTestCase' => 'lint/linter/__tests__/ArcanistRubyLinterTestCase.php',
	'ArcanistScriptAndRegexLinter' => 'lint/linter/ArcanistScriptAndRegexLinter.php',
	'ArcanistSelfMemberReferenceXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistSelfMemberReferenceXHPASTLinterRule.php',
	+ 'ArcanistSelfMemberReferenceXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistSelfMemberReferenceXHPASTLinterRuleTestCase.php',
	'ArcanistSemicolonSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistSemicolonSpacingXHPASTLinterRule.php',
	+ 'ArcanistSemicolonSpacingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistSemicolonSpacingXHPASTLinterRuleTestCase.php',
	'ArcanistSetConfigWorkflow' => 'workflow/ArcanistSetConfigWorkflow.php',
	'ArcanistSettings' => 'configuration/ArcanistSettings.php',
	'ArcanistShellCompleteWorkflow' => 'workflow/ArcanistShellCompleteWorkflow.php',
	'ArcanistSingleLintEngine' => 'lint/engine/ArcanistSingleLintEngine.php',
	'ArcanistSlownessXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistSlownessXHPASTLinterRule.php',
	+ 'ArcanistSlownessXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistSlownessXHPASTLinterRuleTestCase.php',
	'ArcanistSpellingLinter' => 'lint/linter/ArcanistSpellingLinter.php',
	'ArcanistSpellingLinterTestCase' => 'lint/linter/__tests__/ArcanistSpellingLinterTestCase.php',
	'ArcanistStartWorkflow' => 'workflow/ArcanistStartWorkflow.php',
	'ArcanistStaticThisXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistStaticThisXHPASTLinterRule.php',
	+ 'ArcanistStaticThisXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistStaticThisXHPASTLinterRuleTestCase.php',
	'ArcanistStopWorkflow' => 'workflow/ArcanistStopWorkflow.php',
	'ArcanistSubversionAPI' => 'repository/api/ArcanistSubversionAPI.php',
	'ArcanistSummaryLintRenderer' => 'lint/renderer/ArcanistSummaryLintRenderer.php',
	'ArcanistSyntaxErrorXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistSyntaxErrorXHPASTLinterRule.php',
	+ 'ArcanistSyntaxErrorXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/ArcanistSyntaxErrorXHPASTLinterRuleTestCase.php',
	'ArcanistTasksWorkflow' => 'workflow/ArcanistTasksWorkflow.php',
	'ArcanistTautologicalExpressionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistTautologicalExpressionXHPASTLinterRule.php',
	+ 'ArcanistTautologicalExpressionXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistTautologicalExpressionXHPASTLinterRuleTestCase.php',
	'ArcanistTestResultParser' => 'unit/parser/ArcanistTestResultParser.php',
	'ArcanistTestXHPASTLintSwitchHook' => 'lint/linter/__tests__/ArcanistTestXHPASTLintSwitchHook.php',
	'ArcanistTextLinter' => 'lint/linter/ArcanistTextLinter.php',
	'ArcanistTextLinterTestCase' => 'lint/linter/__tests__/ArcanistTextLinterTestCase.php',
	'ArcanistTimeWorkflow' => 'workflow/ArcanistTimeWorkflow.php',
	'ArcanistToStringExceptionXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistToStringExceptionXHPASTLinterRule.php',
	+ 'ArcanistToStringExceptionXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistToStringExceptionXHPASTLinterRuleTestCase.php',
	'ArcanistTodoCommentXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistTodoCommentXHPASTLinterRule.php',
	+ 'ArcanistTodoCommentXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistTodoCommentXHPASTLinterRuleTestCase.php',
	'ArcanistTodoWorkflow' => 'workflow/ArcanistTodoWorkflow.php',
	'ArcanistUSEnglishTranslation' => 'internationalization/ArcanistUSEnglishTranslation.php',
	'ArcanistUnableToParseXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnableToParseXHPASTLinterRule.php',
	+ 'ArcanistUnableToParseXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnableToParseXHPASTLinterRuleTestCase.php',
	'ArcanistUnaryPostfixExpressionSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnaryPostfixExpressionSpacingXHPASTLinterRule.php',
	+ 'ArcanistUnaryPostfixExpressionSpacingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/ArcanistUnaryPostfixExpressionSpacingXHPASTLinterRuleTestCase.php',
	'ArcanistUnaryPrefixExpressionSpacingXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnaryPrefixExpressionSpacingXHPASTLinterRule.php',
	+ 'ArcanistUnaryPrefixExpressionSpacingXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnaryPrefixExpressionSpacingXHPASTLinterRuleTestCase.php',
	'ArcanistUndeclaredVariableXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUndeclaredVariableXHPASTLinterRule.php',
	+ 'ArcanistUndeclaredVariableXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUndeclaredVariableXHPASTLinterRuleTestCase.php',
	'ArcanistUnitConsoleRenderer' => 'unit/renderer/ArcanistUnitConsoleRenderer.php',
	'ArcanistUnitRenderer' => 'unit/renderer/ArcanistUnitRenderer.php',
	'ArcanistUnitTestEngine' => 'unit/engine/ArcanistUnitTestEngine.php',
	@@ -257,13 +328,17 @@
	'ArcanistUnitTestableLintEngine' => 'lint/engine/ArcanistUnitTestableLintEngine.php',
	'ArcanistUnitWorkflow' => 'workflow/ArcanistUnitWorkflow.php',
	'ArcanistUnnecessaryFinalModifierXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnnecessaryFinalModifierXHPASTLinterRule.php',
	+ 'ArcanistUnnecessaryFinalModifierXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnnecessaryFinalModifierXHPASTLinterRuleTestCase.php',
	'ArcanistUnnecessarySemicolonXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUnnecessarySemicolonXHPASTLinterRule.php',
	+ 'ArcanistUnnecessarySemicolonXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySemicolonXHPASTLinterRuleTestCase.php',
	'ArcanistUpgradeWorkflow' => 'workflow/ArcanistUpgradeWorkflow.php',
	'ArcanistUploadWorkflow' => 'workflow/ArcanistUploadWorkflow.php',
	'ArcanistUsageException' => 'exception/ArcanistUsageException.php',
	'ArcanistUselessOverridingMethodXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistUselessOverridingMethodXHPASTLinterRule.php',
	+ 'ArcanistUselessOverridingMethodXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistUselessOverridingMethodXHPASTLinterRuleTestCase.php',
	'ArcanistUserAbortException' => 'exception/usage/ArcanistUserAbortException.php',
	'ArcanistVariableVariableXHPASTLinterRule' => 'lint/linter/xhpast/rules/ArcanistVariableVariableXHPASTLinterRule.php',
	+ 'ArcanistVariableVariableXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistVariableVariableXHPASTLinterRuleTestCase.php',
	'ArcanistVersionWorkflow' => 'workflow/ArcanistVersionWorkflow.php',
	'ArcanistWhichWorkflow' => 'workflow/ArcanistWhichWorkflow.php',
	'ArcanistWorkflow' => 'workflow/ArcanistWorkflow.php',
	@@ -273,7 +348,7 @@
	'ArcanistXHPASTLintSwitchHook' => 'lint/linter/xhpast/ArcanistXHPASTLintSwitchHook.php',
	'ArcanistXHPASTLinter' => 'lint/linter/ArcanistXHPASTLinter.php',
	'ArcanistXHPASTLinterRule' => 'lint/linter/xhpast/ArcanistXHPASTLinterRule.php',
	- 'ArcanistXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/__tests__/ArcanistXHPASTLinterRuleTestCase.php',
	+ 'ArcanistXHPASTLinterRuleTestCase' => 'lint/linter/xhpast/rules/__tests__/ArcanistXHPASTLinterRuleTestCase.php',
	'ArcanistXHPASTLinterTestCase' => 'lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php',
	'ArcanistXMLLinter' => 'lint/linter/ArcanistXMLLinter.php',
	'ArcanistXMLLinterTestCase' => 'lint/linter/__tests__/ArcanistXMLLinterTestCase.php',
	@@ -295,20 +370,27 @@
	'function' => array(),
	'xmap' => array(
	'ArcanistAliasFunctionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistAliasFunctionXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistAliasWorkflow' => 'ArcanistWorkflow',
	'ArcanistAmendWorkflow' => 'ArcanistWorkflow',
	'ArcanistAnoidWorkflow' => 'ArcanistWorkflow',
	'ArcanistArrayIndexSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistArrayIndexSpacingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistArraySeparatorXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistArraySeparatorXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistArrayValueXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistArrayValueXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistBackoutWorkflow' => 'ArcanistWorkflow',
	'ArcanistBaseCommitParser' => 'Phobject',
	'ArcanistBaseCommitParserTestCase' => 'PhutilTestCase',
	'ArcanistBaseXHPASTLinter' => 'ArcanistFutureLinter',
	'ArcanistBinaryExpressionSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistBinaryExpressionSpacingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistBlacklistedFunctionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistBlacklistedFunctionXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistBookmarkWorkflow' => 'ArcanistFeatureWorkflow',
	'ArcanistBraceFormattingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistBraceFormattingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistBranchWorkflow' => 'ArcanistFeatureWorkflow',
	'ArcanistBritishTestCase' => 'PhutilTestCase',
	'ArcanistBrowseWorkflow' => 'ArcanistWorkflow',
	@@ -319,14 +401,18 @@
	'ArcanistCSharpLinter' => 'ArcanistLinter',
	'ArcanistCallConduitWorkflow' => 'ArcanistWorkflow',
	'ArcanistCallParenthesesXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistCallParenthesesXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistCallTimePassByReferenceXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistCallTimePassByReferenceXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistCapabilityNotSupportedException' => 'Exception',
	'ArcanistCastSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistCastSpacingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistCheckstyleXMLLintRenderer' => 'ArcanistLintRenderer',
	'ArcanistChmodLinter' => 'ArcanistLinter',
	'ArcanistChmodLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistClassFilenameMismatchXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	'ArcanistClassNameLiteralXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistClassNameLiteralXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistCloseRevisionWorkflow' => 'ArcanistWorkflow',
	'ArcanistCloseWorkflow' => 'ArcanistWorkflow',
	'ArcanistClosureLinter' => 'ArcanistExternalLinter',
	@@ -337,25 +423,31 @@
	'ArcanistCommentRemoverTestCase' => 'PhutilTestCase',
	'ArcanistCommentSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	'ArcanistCommentStyleXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistCommentStyleXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistCommitWorkflow' => 'ArcanistWorkflow',
	'ArcanistCompilerLintRenderer' => 'ArcanistLintRenderer',
	'ArcanistComposerLinter' => 'ArcanistLinter',
	'ArcanistComprehensiveLintEngine' => 'ArcanistLintEngine',
	'ArcanistConcatenationOperatorXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistConcatenationOperatorXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistConfiguration' => 'Phobject',
	'ArcanistConfigurationDrivenLintEngine' => 'ArcanistLintEngine',
	'ArcanistConfigurationDrivenUnitTestEngine' => 'ArcanistUnitTestEngine',
	'ArcanistConfigurationManager' => 'Phobject',
	'ArcanistConsoleLintRenderer' => 'ArcanistLintRenderer',
	'ArcanistConstructorParenthesesXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistConstructorParenthesesXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistControlStatementSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistControlStatementSpacingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistCoverWorkflow' => 'ArcanistWorkflow',
	'ArcanistCppcheckLinter' => 'ArcanistExternalLinter',
	'ArcanistCppcheckLinterTestCase' => 'ArcanistExternalLinterTestCase',
	'ArcanistCpplintLinter' => 'ArcanistExternalLinter',
	'ArcanistCpplintLinterTestCase' => 'ArcanistExternalLinterTestCase',
	'ArcanistDeclarationParenthesesXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistDeclarationParenthesesXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistDefaultParametersXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistDefaultParametersXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistDiffChange' => 'Phobject',
	'ArcanistDiffChangeType' => 'Phobject',
	'ArcanistDiffHunk' => 'Phobject',
	@@ -370,18 +462,26 @@
	'ArcanistDifferentialRevisionHash' => 'Phobject',
	'ArcanistDifferentialRevisionStatus' => 'Phobject',
	'ArcanistDoubleQuoteXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistDoubleQuoteXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistDownloadWorkflow' => 'ArcanistWorkflow',
	'ArcanistDuplicateKeysInArrayXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistDuplicateKeysInArrayXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistDuplicateSwitchCaseXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistDuplicateSwitchCaseXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistDynamicDefineXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistDynamicDefineXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistElseIfUsageXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistElseIfUsageXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistEmptyStatementXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistEmptyStatementXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistEventType' => 'PhutilEventType',
	'ArcanistExitExpressionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistExitExpressionXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistExportWorkflow' => 'ArcanistWorkflow',
	'ArcanistExternalLinter' => 'ArcanistFutureLinter',
	'ArcanistExternalLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistExtractUseXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistExtractUseXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistFeatureWorkflow' => 'ArcanistWorkflow',
	'ArcanistFileDataRef' => 'Phobject',
	'ArcanistFileUploader' => 'Phobject',
	@@ -391,12 +491,14 @@
	'ArcanistFlake8Linter' => 'ArcanistExternalLinter',
	'ArcanistFlake8LinterTestCase' => 'ArcanistExternalLinterTestCase',
	'ArcanistFormattedStringXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistFormattedStringXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistFutureLinter' => 'ArcanistLinter',
	'ArcanistGeneratedLinter' => 'ArcanistLinter',
	'ArcanistGeneratedLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistGetConfigWorkflow' => 'ArcanistWorkflow',
	'ArcanistGitAPI' => 'ArcanistRepositoryAPI',
	'ArcanistGlobalVariableXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistGlobalVariableXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistGoLintLinter' => 'ArcanistExternalLinter',
	'ArcanistGoLintLinterTestCase' => 'ArcanistExternalLinterTestCase',
	'ArcanistGoTestResultParser' => 'ArcanistTestResultParser',
	@@ -409,14 +511,22 @@
	'ArcanistHgProxyServer' => 'Phobject',
	'ArcanistHgServerChannel' => 'PhutilProtocolChannel',
	'ArcanistImplicitConstructorXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistImplicitConstructorXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistImplicitFallthroughXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistImplicitFallthroughXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistImplicitVisibilityXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistImplicitVisibilityXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistInlineHTMLXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistInlineHTMLXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistInnerFunctionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistInnerFunctionXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistInstallCertificateWorkflow' => 'ArcanistWorkflow',
	'ArcanistInstanceOfOperatorXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistInstanceOfOperatorXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistInvalidDefaultParameterXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistInvalidDefaultParameterXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistInvalidModifiersXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistInvalidModifiersXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistJSHintLinter' => 'ArcanistExternalLinter',
	'ArcanistJSHintLinterTestCase' => 'ArcanistExternalLinterTestCase',
	'ArcanistJSONLintLinter' => 'ArcanistExternalLinter',
	@@ -427,9 +537,12 @@
	'ArcanistJscsLinter' => 'ArcanistExternalLinter',
	'ArcanistJscsLinterTestCase' => 'ArcanistExternalLinterTestCase',
	'ArcanistKeywordCasingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistKeywordCasingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistLambdaFuncFunctionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistLambdaFuncFunctionXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistLandWorkflow' => 'ArcanistWorkflow',
	'ArcanistLanguageConstructParenthesesXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistLanguageConstructParenthesesXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistLesscLinter' => 'ArcanistExternalLinter',
	'ArcanistLesscLinterTestCase' => 'ArcanistExternalLinterTestCase',
	'ArcanistLiberateWorkflow' => 'ArcanistWorkflow',
	@@ -442,12 +555,17 @@
	'ArcanistLintSeverity' => 'Phobject',
	'ArcanistLintWorkflow' => 'ArcanistWorkflow',
	'ArcanistLinter' => 'Phobject',
	+ 'ArcanistLinterRule' => 'Phobject',
	+ 'ArcanistLinterRuleTestCase' => 'ArcanistLinterTestCase',
	'ArcanistLinterTestCase' => 'PhutilTestCase',
	'ArcanistLintersWorkflow' => 'ArcanistWorkflow',
	'ArcanistListAssignmentXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistListAssignmentXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistListWorkflow' => 'ArcanistWorkflow',
	'ArcanistLogicalOperatorsXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistLogicalOperatorsXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistLowercaseFunctionsXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistLowercaseFunctionsXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistMercurialAPI' => 'ArcanistRepositoryAPI',
	'ArcanistMercurialParser' => 'Phobject',
	'ArcanistMercurialParserTestCase' => 'PhutilTestCase',
	@@ -455,24 +573,35 @@
	'ArcanistMergeConflictLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistMissingLinterException' => 'Exception',
	'ArcanistModifierOrderingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistModifierOrderingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistNamingConventionsXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistNamingConventionsXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistNewlineAfterOpenTagXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistNewlineAfterOpenTagXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistNoEffectException' => 'ArcanistUsageException',
	'ArcanistNoEngineException' => 'ArcanistUsageException',
	'ArcanistNoLintLinter' => 'ArcanistLinter',
	'ArcanistNoLintLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistNoParentScopeXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistNoParentScopeXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistNoneLintRenderer' => 'ArcanistLintRenderer',
	'ArcanistObjectOperatorSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistObjectOperatorSpacingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistPEP8Linter' => 'ArcanistExternalLinter',
	'ArcanistPEP8LinterTestCase' => 'ArcanistExternalLinterTestCase',
	'ArcanistPHPCloseTagXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	'ArcanistPHPCompatibilityXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistPHPCompatibilityXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistPHPEchoTagXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistPHPEchoTagXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistPHPOpenTagXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistPHPOpenTagXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistPHPShortTagXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistPHPShortTagXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistParenthesesSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistParenthesesSpacingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistParseStrUseXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistParseStrUseXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistPasteWorkflow' => 'ArcanistWorkflow',
	'ArcanistPatchWorkflow' => 'ArcanistWorkflow',
	'ArcanistPhpLinter' => 'ArcanistExternalLinter',
	@@ -485,7 +614,9 @@
	'ArcanistPhutilXHPASTLinter' => 'ArcanistBaseXHPASTLinter',
	'ArcanistPhutilXHPASTLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistPlusOperatorOnStringsXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistPlusOperatorOnStringsXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistPregQuoteMisuseXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistPregQuoteMisuseXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistPuppetLintLinter' => 'ArcanistExternalLinter',
	'ArcanistPuppetLintLinterTestCase' => 'ArcanistExternalLinterTestCase',
	'ArcanistPyFlakesLinter' => 'ArcanistExternalLinter',
	@@ -496,8 +627,11 @@
	'ArcanistRepositoryAPIMiscTestCase' => 'PhutilTestCase',
	'ArcanistRepositoryAPIStateTestCase' => 'PhutilTestCase',
	'ArcanistReusedAsIteratorXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistReusedAsIteratorXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistReusedIteratorReferenceXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistReusedIteratorReferenceXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistReusedIteratorXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistReusedIteratorXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistRevertWorkflow' => 'ArcanistWorkflow',
	'ArcanistRuboCopLinter' => 'ArcanistExternalLinter',
	'ArcanistRuboCopLinterTestCase' => 'ArcanistExternalLinterTestCase',
	@@ -505,35 +639,47 @@
	'ArcanistRubyLinterTestCase' => 'ArcanistExternalLinterTestCase',
	'ArcanistScriptAndRegexLinter' => 'ArcanistLinter',
	'ArcanistSelfMemberReferenceXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistSelfMemberReferenceXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistSemicolonSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistSemicolonSpacingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistSetConfigWorkflow' => 'ArcanistWorkflow',
	'ArcanistSettings' => 'Phobject',
	'ArcanistShellCompleteWorkflow' => 'ArcanistWorkflow',
	'ArcanistSingleLintEngine' => 'ArcanistLintEngine',
	'ArcanistSlownessXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistSlownessXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistSpellingLinter' => 'ArcanistLinter',
	'ArcanistSpellingLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistStartWorkflow' => 'ArcanistPhrequentWorkflow',
	'ArcanistStaticThisXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistStaticThisXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistStopWorkflow' => 'ArcanistPhrequentWorkflow',
	'ArcanistSubversionAPI' => 'ArcanistRepositoryAPI',
	'ArcanistSummaryLintRenderer' => 'ArcanistLintRenderer',
	'ArcanistSyntaxErrorXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistSyntaxErrorXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistTasksWorkflow' => 'ArcanistWorkflow',
	'ArcanistTautologicalExpressionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistTautologicalExpressionXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistTestResultParser' => 'Phobject',
	'ArcanistTestXHPASTLintSwitchHook' => 'ArcanistXHPASTLintSwitchHook',
	'ArcanistTextLinter' => 'ArcanistLinter',
	'ArcanistTextLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistTimeWorkflow' => 'ArcanistPhrequentWorkflow',
	'ArcanistToStringExceptionXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistToStringExceptionXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistTodoCommentXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistTodoCommentXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistTodoWorkflow' => 'ArcanistWorkflow',
	'ArcanistUSEnglishTranslation' => 'PhutilTranslation',
	'ArcanistUnableToParseXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistUnableToParseXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistUnaryPostfixExpressionSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistUnaryPostfixExpressionSpacingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistUnaryPrefixExpressionSpacingXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistUnaryPrefixExpressionSpacingXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistUndeclaredVariableXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistUndeclaredVariableXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistUnitConsoleRenderer' => 'ArcanistUnitRenderer',
	'ArcanistUnitRenderer' => 'Phobject',
	'ArcanistUnitTestEngine' => 'Phobject',
	@@ -542,13 +688,17 @@
	'ArcanistUnitTestableLintEngine' => 'ArcanistLintEngine',
	'ArcanistUnitWorkflow' => 'ArcanistWorkflow',
	'ArcanistUnnecessaryFinalModifierXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistUnnecessaryFinalModifierXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistUnnecessarySemicolonXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistUnnecessarySemicolonXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistUpgradeWorkflow' => 'ArcanistWorkflow',
	'ArcanistUploadWorkflow' => 'ArcanistWorkflow',
	'ArcanistUsageException' => 'Exception',
	'ArcanistUselessOverridingMethodXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistUselessOverridingMethodXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistUserAbortException' => 'ArcanistUsageException',
	'ArcanistVariableVariableXHPASTLinterRule' => 'ArcanistXHPASTLinterRule',
	+ 'ArcanistVariableVariableXHPASTLinterRuleTestCase' => 'ArcanistXHPASTLinterRuleTestCase',
	'ArcanistVersionWorkflow' => 'ArcanistWorkflow',
	'ArcanistWhichWorkflow' => 'ArcanistWorkflow',
	'ArcanistWorkflow' => 'Phobject',
	@@ -557,8 +707,8 @@
	'ArcanistXHPASTLintNamingHookTestCase' => 'PhutilTestCase',
	'ArcanistXHPASTLintSwitchHook' => 'Phobject',
	'ArcanistXHPASTLinter' => 'ArcanistBaseXHPASTLinter',
	- 'ArcanistXHPASTLinterRule' => 'Phobject',
	- 'ArcanistXHPASTLinterRuleTestCase' => 'PhutilTestCase',
	+ 'ArcanistXHPASTLinterRule' => 'ArcanistLinterRule',
	+ 'ArcanistXHPASTLinterRuleTestCase' => 'ArcanistLinterRuleTestCase',
	'ArcanistXHPASTLinterTestCase' => 'ArcanistLinterTestCase',
	'ArcanistXMLLinter' => 'ArcanistLinter',
	'ArcanistXMLLinterTestCase' => 'ArcanistLinterTestCase',
	diff --git a/src/lint/linter/ArcanistLinter.php b/src/lint/linter/ArcanistLinter.php
	--- a/src/lint/linter/ArcanistLinter.php
	+++ b/src/lint/linter/ArcanistLinter.php
	@@ -28,7 +28,7 @@
	private $customSeverityRules = array();


	-/* -( Human Readable Information )---------------------------------------- */
	+/* -( Human Readable Information )----------------------------------------- */


	/**
	@@ -419,7 +419,7 @@
	$line,
	$char,
	$code,
	- $desc,
	+ $description,
	$original = null,
	$replacement = null) {

	@@ -430,7 +430,7 @@
	->setCode($this->getLintMessageFullCode($code))
	->setSeverity($this->getLintMessageSeverity($code))
	->setName($this->getLintMessageName($code))
	- ->setDescription($desc)
	+ ->setDescription($description)
	->setOriginalText($original)
	->setReplacementText($replacement);

	@@ -444,7 +444,7 @@
	final public function raiseLintAtOffset(
	$offset,
	$code,
	- $desc,
	+ $description,
	$original = null,
	$replacement = null) {

	@@ -461,7 +461,7 @@
	$line + 1,
	$char + 1,
	$code,
	- $desc,
	+ $description,
	$original,
	$replacement);
	}
	diff --git a/src/lint/linter/ArcanistLinterRule.php b/src/lint/linter/ArcanistLinterRule.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/ArcanistLinterRule.php
	@@ -0,0 +1,100 @@
	+<?php
	+
	+abstract class ArcanistLinterRule extends Phobject {
	+
	+ protected $linter = null;
	+ private $lintID = null;
	+
	+ final public function getLintID() {
	+ if ($this->lintID === null) {
	+ $class = new ReflectionClass($this);
	+
	+ $const = $class->getConstant('ID');
	+ if ($const === false) {
	+ throw new Exception(
	+ pht(
	+ '`%s` class `%s` must define an ID constant.',
	+ __CLASS__,
	+ get_class($this)));
	+ }
	+
	+ if (!is_int($const)) {
	+ throw new Exception(
	+ pht(
	+ '`%s` class `%s` has an invalid ID constant. '.
	+ 'ID must be an integer.',
	+ __CLASS__,
	+ get_class($this)));
	+ }
	+
	+ $this->lintID = $const;
	+ }
	+
	+ return $this->lintID;
	+ }
	+
	+ abstract public function getLintName();
	+
	+ public function getLintSeverity() {
	+ return ArcanistLintSeverity::SEVERITY_ERROR;
	+ }
	+
	+ public function getLinterConfigurationOptions() {
	+ return array();
	+ }
	+
	+ public function setLinterConfigurationValue($key, $value) {}
	+
	+ // abstract public function process();
	+
	+ final public function setLinter(ArcanistLinter $linter) {
	+ $this->linter = $linter;
	+ return $this;
	+ }
	+
	+
	+/* -( Proxied Methods )---------------------------------------------------- */
	+
	+
	+ final public function getActivePath() {
	+ return $this->linter->getActivePath();
	+ }
	+
	+ final public function getOtherLocation($offset, $path = null) {
	+ return $this->linter->getOtherLocation($offset, $path);
	+ }
	+
	+ final public function raiseLintAtLine(
	+ $line,
	+ $char,
	+ $description,
	+ $original = null,
	+ $replacement = null) {
	+
	+ return $this->linter->raiseLintAtLine(
	+ $line,
	+ $char,
	+ $description,
	+ $original,
	+ $replacement);
	+ }
	+
	+ final public function raiseLintAtPath($description) {
	+ return $this->linter->raiseLintAtPath($this->getLintID(), $description);
	+ }
	+
	+ final public function raiseLintAtOffset(
	+ $offset,
	+ $description,
	+ $original = null,
	+ $replacement = null) {
	+
	+ return $this->linter->raiseLintAtOffset(
	+ $offset,
	+ $this->getLintID(),
	+ $description,
	+ $original,
	+ $replacement);
	+ }
	+
	+}
	diff --git a/src/lint/linter/ArcanistSpellingLinter.php b/src/lint/linter/ArcanistSpellingLinter.php
	--- a/src/lint/linter/ArcanistSpellingLinter.php
	+++ b/src/lint/linter/ArcanistSpellingLinter.php
	@@ -78,12 +78,14 @@
	$this->exactWordRules = array_merge(
	$this->exactWordRules,
	array($misspelling => $correction));
	+ return $this;
	}

	public function addPartialWordRule($misspelling, $correction) {
	$this->partialWordRules = array_merge(
	$this->partialWordRules,
	array($misspelling => $correction));
	+ return $this;
	}

	public function getLintSeverityMap() {
	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
	@@ -23,6 +23,12 @@
	}
	}

	+ public function setRules(array $rules) {
	+ assert_instances_of($rules, 'ArcanistXHPASTLinterRule');
	+ $this->rules = $rules;
	+ return $this;
	+ }
	+
	public function getInfoName() {
	return pht('XHPAST Lint');
	}
	diff --git a/src/lint/linter/__tests__/ArcanistLinterRuleTestCase.php b/src/lint/linter/__tests__/ArcanistLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/__tests__/ArcanistLinterRuleTestCase.php
	@@ -0,0 +1,29 @@
	+<?php
	+
	+/**
	+ * Facilitates implementation of test cases for @{class:ArcanistLinterRule}s.
	+ */
	+abstract class ArcanistLinterRuleTestCase extends ArcanistLinterTestCase {
	+
	+ protected function getLinter() {
	+ throw new PhutilMethodNotImplementedException();
	+ }
	+
	+ /**
	+ * Returns an instance of the linter rule being tested.
	+ *
	+ * @return ArcanistLinterRule
	+ */
	+ final protected function getLinterRule() {
	+ $class = get_class($this);
	+ $matches = null;
	+
	+ if (!preg_match('/^(\w+LinterRule)TestCase$/', $class, $matches) \|\|
	+ !is_subclass_of($matches[1], 'ArcanistLinterRule')) {
	+ throw new Exception(pht('Unable to infer linter rule class name.'));
	+ }
	+
	+ return newv($matches[1], array());
	+ }
	+
	+}
	diff --git a/src/lint/linter/__tests__/ArcanistLinterTestCase.php b/src/lint/linter/__tests__/ArcanistLinterTestCase.php
	--- a/src/lint/linter/__tests__/ArcanistLinterTestCase.php
	+++ b/src/lint/linter/__tests__/ArcanistLinterTestCase.php
	@@ -10,7 +10,7 @@
	*
	* @return ArcanistLinter
	*/
	- final protected function getLinter() {
	+ protected function getLinter() {
	$matches = null;
	if (!preg_match('/^(\w+Linter)TestCase$/', get_class($this), $matches) \|\|
	!is_subclass_of($matches[1], 'ArcanistLinter')) {
	@@ -26,13 +26,8 @@
	* Executes all tests from the specified subdirectory. If a linter is not
	* explicitly specified, it will be inferred from the name of the test class.
	*/
	- public function executeTestsInDirectory(
	- $root,
	- ArcanistLinter $linter = null) {
	-
	- if (!$linter) {
	- $linter = $this->getLinter();
	- }
	+ protected function executeTestsInDirectory($root) {
	+ $linter = $this->getLinter();

	$files = id(new FileFinder($root))
	->withType('f')
	diff --git a/src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php b/src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php
	--- a/src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php
	+++ b/src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php
	@@ -2,14 +2,14 @@

	final class ArcanistSpellingLinterTestCase extends ArcanistLinterTestCase {

	- public function testLinter() {
	- $linter = new ArcanistSpellingLinter();
	- $linter->addPartialWordRule('supermn', 'superman');
	- $linter->addExactWordRule('batmn', 'batman');
	+ protected function getLinter() {
	+ return parent::getLinter()
	+ ->addPartialWordRule('supermn', 'superman')
	+ ->addExactWordRule('batmn', 'batman');
	+ }

	- $this->executeTestsInDirectory(
	- dirname(__FILE__).'/spelling/',
	- $linter);
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/spelling/');
	}

	public function testFixLetterCase() {
	diff --git a/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php b/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php
	--- a/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php
	+++ b/src/lint/linter/xhpast/ArcanistXHPASTLinterRule.php
	@@ -1,9 +1,6 @@
	<?php

	-abstract class ArcanistXHPASTLinterRule extends Phobject {
	-
	- private $linter = null;
	- private $lintID = null;
	+abstract class ArcanistXHPASTLinterRule extends ArcanistLinterRule {

	protected $version;
	protected $windowsVersion;
	@@ -15,40 +12,6 @@
	->execute();
	}

	- final public function getLintID() {
	- if ($this->lintID === null) {
	- $class = new ReflectionClass($this);
	-
	- $const = $class->getConstant('ID');
	- if ($const === false) {
	- throw new Exception(
	- pht(
	- '`%s` class `%s` must define an ID constant.',
	- __CLASS__,
	- get_class($this)));
	- }
	-
	- if (!is_int($const)) {
	- throw new Exception(
	- pht(
	- '`%s` class `%s` has an invalid ID constant. '.
	- 'ID must be an integer.',
	- __CLASS__,
	- get_class($this)));
	- }
	-
	- $this->lintID = $const;
	- }
	-
	- return $this->lintID;
	- }
	-
	- abstract public function getLintName();
	-
	- public function getLintSeverity() {
	- return ArcanistLintSeverity::SEVERITY_ERROR;
	- }
	-
	public function getLinterConfigurationOptions() {
	return array(
	'xhpast.php-version' => array(
	@@ -59,7 +22,7 @@
	'type' => 'optional string',
	'help' => pht('PHP version to target on Windows.'),
	),
	- );
	+ ) + parent::getLinterConfigurationOptions();
	}

	public function setLinterConfigurationValue($key, $value) {
	@@ -71,95 +34,68 @@
	case 'xhpast.php-version.windows':
	$this->windowsVersion = $value;
	return;
	- }
	- }
	-
	- abstract public function process(XHPASTNode $root);
	-
	- final public function setLinter(ArcanistXHPASTLinter $linter) {
	- $this->linter = $linter;
	- return $this;
	- }

	- /**
	- * Statically evaluate a boolean value from an XHP tree.
	- *
	- * TODO: Improve this and move it to XHPAST proper?
	- *
	- * @param string The "semantic string" of a single value.
	- * @return mixed `true` or `false` if the value could be evaluated
	- * statically; `null` if static evaluation was not possible.
	- */
	- protected function evaluateStaticBoolean($string) {
	- switch (strtolower($string)) {
	- case '0':
	- case 'null':
	- case 'false':
	- return false;
	- case '1':
	- case 'true':
	- return true;
	+ default:
	+ return parent::setLinterConfigurationValue($key, $value);
	}
	- return null;
	}

	- protected function getConcreteVariableString(XHPASTNode $var) {
	- $concrete = $var->getConcreteString();
	- // Strip off curly braces as in `$obj->{$property}`.
	- $concrete = trim($concrete, '{}');
	- return $concrete;
	- }
	+ abstract public function process(XHPASTNode $root);

	- // These methods are proxied to the @{class:ArcanistLinter}.

	- final public function getActivePath() {
	- return $this->linter->getActivePath();
	- }
	+/* -( Proxied Methods )---------------------------------------------------- */

	- final public function getOtherLocation($offset, $path = null) {
	- return $this->linter->getOtherLocation($offset, $path);
	- }

	final protected function raiseLintAtNode(
	XHPASTNode $node,
	- $desc,
	+ $description,
	$replace = null) {

	return $this->linter->raiseLintAtNode(
	$node,
	$this->getLintID(),
	- $desc,
	- $replace);
	- }
	-
	- final public function raiseLintAtOffset(
	- $offset,
	- $desc,
	- $text = null,
	- $replace = null) {
	-
	- return $this->linter->raiseLintAtOffset(
	- $offset,
	- $this->getLintID(),
	- $desc,
	- $text,
	+ $description,
	$replace);
	}

	final protected function raiseLintAtToken(
	XHPASTToken $token,
	- $desc,
	+ $description,
	$replace = null) {

	return $this->linter->raiseLintAtToken(
	$token,
	$this->getLintID(),
	- $desc,
	+ $description,
	$replace);
	}

	+
	/* -( Utility )------------------------------------------------------------ */

	+
	+ /**
	+ * Statically evaluate a boolean value from an XHP tree.
	+ *
	+ * TODO: Improve this and move it to XHPAST proper?
	+ *
	+ * @param string The "semantic string" of a single value.
	+ * @return mixed `true` or `false` if the value could be evaluated
	+ * statically; `null` if static evaluation was not possible.
	+ */
	+ protected function evaluateStaticBoolean($string) {
	+ switch (strtolower($string)) {
	+ case '0':
	+ case 'null':
	+ case 'false':
	+ return false;
	+ case '1':
	+ case 'true':
	+ return true;
	+ }
	+ return null;
	+ }
	+
	/**
	* Retrieve all anonymous closure(s).
	*
	@@ -182,6 +118,13 @@
	return AASTNodeList::newFromTreeAndNodes($root->getTree(), $nodes);
	}

	+ protected function getConcreteVariableString(XHPASTNode $var) {
	+ $concrete = $var->getConcreteString();
	+ // Strip off curly braces as in `$obj->{$property}`.
	+ $concrete = trim($concrete, '{}');
	+ return $concrete;
	+ }
	+
	/**
	* Retrieve all calls to some specified function(s).
	*
	diff --git a/src/lint/linter/xhpast/__tests__/ArcanistXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/__tests__/ArcanistXHPASTLinterRuleTestCase.php
	deleted file mode 100644
	--- a/src/lint/linter/xhpast/__tests__/ArcanistXHPASTLinterRuleTestCase.php
	+++ /dev/null
	@@ -1,10 +0,0 @@
	-<?php
	-
	-final class ArcanistXHPASTLinterRuleTestCase extends PhutilTestCase {
	-
	- public function testLoadAllRules() {
	- ArcanistXHPASTLinterRule::loadAllRules();
	- $this->assertTrue(true);
	- }
	-
	-}
	diff --git a/src/lint/linter/xhpast/rules/ArcanistSyntaxErrorXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/ArcanistSyntaxErrorXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/ArcanistSyntaxErrorXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistSyntaxErrorXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/syntax/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/ArcanistUnaryPostfixExpressionSpacingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/ArcanistUnaryPostfixExpressionSpacingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/ArcanistUnaryPostfixExpressionSpacingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistUnaryPostfixExpressionSpacingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/unary-postfix-expression-spacing/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistAliasFunctionXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistAliasFunctionXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistAliasFunctionXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistAliasFunctionXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/alias-function/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistArrayIndexSpacingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistArrayIndexSpacingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistArrayIndexSpacingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistArrayIndexSpacingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/array-index-spacing/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistArraySeparatorXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistArraySeparatorXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistArraySeparatorXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistArraySeparatorXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/array-separator/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistArrayValueXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistArrayValueXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistArrayValueXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistArrayValueXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/array-value/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistBinaryExpressionSpacingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistBinaryExpressionSpacingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistBinaryExpressionSpacingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistBinaryExpressionSpacingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/binary-expression-spacing/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistBlacklistedFunctionXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistBlacklistedFunctionXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistBlacklistedFunctionXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistBlacklistedFunctionXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/blacklisted/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistBraceFormattingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistBraceFormattingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistBraceFormattingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistBraceFormattingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/brace-formatting/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistCallParenthesesXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistCallParenthesesXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistCallParenthesesXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistCallParenthesesXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/call-parentheses/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistCallTimePassByReferenceXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistCallTimePassByReferenceXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistCallTimePassByReferenceXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistCallTimePassByReferenceXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/pass-by-reference/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistCastSpacingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistCastSpacingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistCastSpacingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistCastSpacingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/cast-spacing/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistClassNameLiteralXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistClassNameLiteralXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistClassNameLiteralXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistClassNameLiteralXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/class-name-literal/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistCommentStyleXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistCommentStyleXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistCommentStyleXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistCommentStyleXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/comment-style/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistConcatenationOperatorXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistConcatenationOperatorXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistConcatenationOperatorXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistConcatenationOperatorXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/concatenation-operator/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistConstructorParenthesesXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistConstructorParenthesesXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistConstructorParenthesesXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistConstructorParenthesesXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/constructor-parentheses/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistControlStatementSpacingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistControlStatementSpacingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistControlStatementSpacingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistControlStatementSpacingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/control-statement-spacing/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistDeclarationParenthesesXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistDeclarationParenthesesXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistDeclarationParenthesesXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistDeclarationParenthesesXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/declaration-parentheses/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistDefaultParametersXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistDefaultParametersXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistDefaultParametersXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistDefaultParametersXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/default-parameters/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistDoubleQuoteXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistDoubleQuoteXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistDoubleQuoteXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistDoubleQuoteXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/double-quote/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistDuplicateKeysInArrayXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistDuplicateKeysInArrayXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistDuplicateKeysInArrayXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistDuplicateKeysInArrayXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/duplicate-array-keys/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistDuplicateSwitchCaseXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistDuplicateSwitchCaseXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistDuplicateSwitchCaseXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistDuplicateSwitchCaseXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/duplicate-switch-case/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistDynamicDefineXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistDynamicDefineXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistDynamicDefineXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistDynamicDefineXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/dynamic-define/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistElseIfUsageXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistElseIfUsageXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistElseIfUsageXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistElseIfUsageXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/elseif/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistEmptyStatementXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistEmptyStatementXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistEmptyStatementXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistEmptyStatementXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/empty-statement/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistExitExpressionXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistExitExpressionXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistExitExpressionXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistExitExpressionXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/exit-expression/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistExtractUseXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistExtractUseXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistExtractUseXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistExtractUseXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/extract-use/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistFormattedStringXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistFormattedStringXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistFormattedStringXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistFormattedStringXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/formatted-string/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistGlobalVariableXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistGlobalVariableXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistGlobalVariableXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistGlobalVariableXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/global-variable/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistImplicitConstructorXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistImplicitConstructorXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistImplicitConstructorXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistImplicitConstructorXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/implicit-constructor/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistImplicitFallthroughXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistImplicitFallthroughXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistImplicitFallthroughXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistImplicitFallthroughXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/implicit-fallthrough/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistImplicitVisibilityXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistImplicitVisibilityXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistImplicitVisibilityXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistImplicitVisibilityXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/implicit-visibility/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistInlineHTMLXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistInlineHTMLXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistInlineHTMLXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistInlineHTMLXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/inline-html/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistInnerFunctionXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistInnerFunctionXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistInnerFunctionXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistInnerFunctionXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/inner-function/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistInstanceOfOperatorXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistInstanceOfOperatorXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistInstanceOfOperatorXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistInstanceOfOperatorXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/instanceof-operator/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistInvalidDefaultParameterXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistInvalidDefaultParameterXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistInvalidDefaultParameterXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistInvalidDefaultParameterXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/invalid-default-parameter/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistInvalidModifiersXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistInvalidModifiersXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistInvalidModifiersXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistInvalidModifiersXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/invalid-modifiers/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistKeywordCasingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistKeywordCasingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistKeywordCasingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistKeywordCasingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/keyword-casing/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistLambdaFuncFunctionXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistLambdaFuncFunctionXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistLambdaFuncFunctionXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistLambdaFuncFunctionXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/lambda-func-function/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistLanguageConstructParenthesesXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistLanguageConstructParenthesesXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistLanguageConstructParenthesesXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistLanguageConstructParenthesesXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/language-construct-parentheses/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistListAssignmentXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistListAssignmentXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistListAssignmentXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistListAssignmentXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/list-assignment/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistLogicalOperatorsXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistLogicalOperatorsXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistLogicalOperatorsXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistLogicalOperatorsXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/logical-operators/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistLowercaseFunctionsXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistLowercaseFunctionsXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistLowercaseFunctionsXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistLowercaseFunctionsXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/lowercase-functions/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistModifierOrderingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistModifierOrderingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistModifierOrderingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistModifierOrderingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/modifier-ordering/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistNamingConventionsXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistNamingConventionsXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistNamingConventionsXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistNamingConventionsXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/naming-conventions/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistNewlineAfterOpenTagXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistNewlineAfterOpenTagXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistNewlineAfterOpenTagXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistNewlineAfterOpenTagXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/newline-after-open-tag/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistNoParentScopeXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistNoParentScopeXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistNoParentScopeXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistNoParentScopeXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/no-parent-scope/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistObjectOperatorSpacingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistObjectOperatorSpacingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistObjectOperatorSpacingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistObjectOperatorSpacingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/object-operator-spacing/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPCompatibilityXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPCompatibilityXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPCompatibilityXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistPHPCompatibilityXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/compatibility/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPEchoTagXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPEchoTagXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPEchoTagXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistPHPEchoTagXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/php-echo-tag/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPOpenTagXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPOpenTagXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPOpenTagXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistPHPOpenTagXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/php-open-tag/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPShortTagXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPShortTagXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistPHPShortTagXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistPHPShortTagXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/php-short-tag/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistParenthesesSpacingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistParenthesesSpacingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistParenthesesSpacingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistParenthesesSpacingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/parentheses-spacing/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistParseStrUseXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistParseStrUseXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistParseStrUseXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistParseStrUseXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/parse_str-use/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistPlusOperatorOnStringsXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistPlusOperatorOnStringsXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistPlusOperatorOnStringsXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistPlusOperatorOnStringsXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/plus-operator-on-strings/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistPregQuoteMisuseXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistPregQuoteMisuseXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistPregQuoteMisuseXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistPregQuoteMisuseXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/preg-quote-misuse/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistReusedAsIteratorXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistReusedAsIteratorXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistReusedAsIteratorXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistReusedAsIteratorXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/reused-as-iterator/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistReusedIteratorReferenceXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistReusedIteratorReferenceXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistReusedIteratorReferenceXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistReusedIteratorReferenceXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/reused-iterator-reference/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistReusedIteratorXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistReusedIteratorXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistReusedIteratorXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistReusedIteratorXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/reused-iterator/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistSelfMemberReferenceXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistSelfMemberReferenceXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistSelfMemberReferenceXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistSelfMemberReferenceXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/self-member-reference/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistSemicolonSpacingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistSemicolonSpacingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistSemicolonSpacingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistSemicolonSpacingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/semicolon-spacing/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistSlownessXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistSlownessXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistSlownessXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistSlownessXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/slowness/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistStaticThisXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistStaticThisXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistStaticThisXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistStaticThisXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/static-this/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistTautologicalExpressionXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistTautologicalExpressionXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistTautologicalExpressionXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistTautologicalExpressionXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/tautological-expression/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistToStringExceptionXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistToStringExceptionXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistToStringExceptionXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistToStringExceptionXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/tostring-exception/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistTodoCommentXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistTodoCommentXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistTodoCommentXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistTodoCommentXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/todo-comment/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistUnableToParseXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistUnableToParseXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistUnableToParseXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistUnableToParseXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/parse/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistUnaryPrefixExpressionSpacingXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistUnaryPrefixExpressionSpacingXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistUnaryPrefixExpressionSpacingXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistUnaryPrefixExpressionSpacingXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/unary-prefix-expression-spacing/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistUndeclaredVariableXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistUndeclaredVariableXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistUndeclaredVariableXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistUndeclaredVariableXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/undeclared-variable/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistUnnecessaryFinalModifierXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistUnnecessaryFinalModifierXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistUnnecessaryFinalModifierXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistUnnecessaryFinalModifierXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/unnecessary-final-modifier/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySemicolonXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySemicolonXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistUnnecessarySemicolonXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistUnnecessarySemicolonXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/unnecessary-semicolon/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistUselessOverridingMethodXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistUselessOverridingMethodXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistUselessOverridingMethodXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,11 @@
	+<?php
	+
	+final class ArcanistUselessOverridingMethodXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(
	+ dirname(__FILE__).'/useless-overriding-method/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistVariableVariableXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistVariableVariableXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistVariableVariableXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,10 @@
	+<?php
	+
	+final class ArcanistVariableVariableXHPASTLinterRuleTestCase
	+ extends ArcanistXHPASTLinterRuleTestCase {
	+
	+ public function testLinter() {
	+ $this->executeTestsInDirectory(dirname(__FILE__).'/variable-variable/');
	+ }
	+
	+}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/ArcanistXHPASTLinterRuleTestCase.php b/src/lint/linter/xhpast/rules/__tests__/ArcanistXHPASTLinterRuleTestCase.php
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/ArcanistXHPASTLinterRuleTestCase.php
	@@ -0,0 +1,15 @@
	+<?php
	+
	+/**
	+ * Facilitates implementation of test cases for
	+ * @{class:ArcanistXHPASTLinterRule}s.
	+ */
	+abstract class ArcanistXHPASTLinterRuleTestCase
	+ extends ArcanistLinterRuleTestCase {
	+
	+ final protected function getLinter() {
	+ return id(new ArcanistXHPASTLinter())
	+ ->setRules(array($this->getLinterRule()));
	+ }
	+
	+}
	diff --git a/src/lint/linter/__tests__/xhpast/alias-functions.lint-test b/src/lint/linter/xhpast/rules/__tests__/alias-function/alias-functions.lint-test
	rename from src/lint/linter/__tests__/xhpast/alias-functions.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/alias-function/alias-functions.lint-test
	--- a/src/lint/linter/__tests__/xhpast/alias-functions.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/alias-function/alias-functions.lint-test
	@@ -1,17 +1,15 @@
	<?php
	-
	$x = array();
	sizeof($x);
	die();
	-sizeOf($x); // fixme
	+sizeOf($x);
	~~~~~~~~~~
	+advice:3:1
	advice:4:1
	advice:5:1
	-advice:6:1
	~~~~~~~~~~
	<?php
	-
	$x = array();
	count($x);
	exit();
	-sizeof($x); // fixme
	+count($x);
	diff --git a/src/lint/linter/__tests__/xhpast/array-index.lint-test b/src/lint/linter/xhpast/rules/__tests__/array-index-spacing/array-index.lint-test
	rename from src/lint/linter/__tests__/xhpast/array-index.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/array-index-spacing/array-index.lint-test
	--- a/src/lint/linter/__tests__/xhpast/array-index.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/array-index-spacing/array-index.lint-test
	@@ -1,18 +1,14 @@
	<?php
	-
	$a []= 1;
	$a[] = 1;
	$a[]=1;
	$a [] = 1;
	~~~~~~~~~~
	-warning:3:3
	-warning:3:6
	-warning:5:5
	-warning:6:3
	+warning:2:3
	+warning:5:3
	~~~~~~~~~~
	<?php
	-
	-$a[] = 1;
	-$a[] = 1;
	+$a[]= 1;
	$a[] = 1;
	+$a[]=1;
	$a[] = 1;
	diff --git a/src/lint/linter/__tests__/xhpast/array-comma.lint-test b/src/lint/linter/xhpast/rules/__tests__/array-separator/array-comma.lint-test
	rename from src/lint/linter/__tests__/xhpast/array-comma.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/array-separator/array-comma.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/array-value.lint-test b/src/lint/linter/xhpast/rules/__tests__/array-value/array-value.lint-test
	rename from src/lint/linter/__tests__/xhpast/array-value.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/array-value/array-value.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/array-index.lint-test b/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/array-index.lint-test
	rename from src/lint/linter/__tests__/xhpast/array-index.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/array-index.lint-test
	--- a/src/lint/linter/__tests__/xhpast/array-index.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/array-index.lint-test
	@@ -5,14 +5,12 @@
	$a[]=1;
	$a [] = 1;
	~~~~~~~~~~
	-warning:3:3
	warning:3:6
	warning:5:5
	-warning:6:3
	~~~~~~~~~~
	<?php

	+$a [] = 1;
	$a[] = 1;
	$a[] = 1;
	-$a[] = 1;
	-$a[] = 1;
	+$a [] = 1;
	diff --git a/src/lint/linter/__tests__/xhpast/space-around-more-operators.lint-test b/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/space-around-more-operators.lint-test
	rename from src/lint/linter/__tests__/xhpast/space-around-more-operators.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/space-around-more-operators.lint-test
	--- a/src/lint/linter/__tests__/xhpast/space-around-more-operators.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/space-around-more-operators.lint-test
	@@ -1,14 +1,4 @@
	<?php
	-
	-$a.$b;
	-$a . $b;
	-$a. $b;
	-$a .$b;
	-$a.
	-$b;
	-$a. // This should be okay.
	-$b;
	-
	array($x => $y);
	array($x=>$y);
	array($x =>$y);
	@@ -25,26 +15,12 @@
	$x=>$y,
	);
	~~~~~~~~~~
	-warning:4:3
	-warning:4:5
	-warning:5:4
	-warning:6:3
	-warning:13:9
	-warning:14:10
	-warning:15:9
	-warning:25:5
	+warning:3:9
	+warning:4:10
	+warning:5:9
	+warning:15:5
	~~~~~~~~~~
	<?php
	-
	-$a.$b;
	-$a.$b;
	-$a.$b;
	-$a.$b;
	-$a.
	-$b;
	-$a. // This should be okay.
	-$b;
	-
	array($x => $y);
	array($x => $y);
	array($x => $y);
	diff --git a/src/lint/linter/__tests__/xhpast/space-around-operators.lint-test b/src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/space-around-operators.lint-test
	rename from src/lint/linter/__tests__/xhpast/space-around-operators.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/binary-expression-spacing/space-around-operators.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/blacklisted.lint-test b/src/lint/linter/xhpast/rules/__tests__/blacklisted/blacklisted.lint-test
	rename from src/lint/linter/__tests__/xhpast/blacklisted.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/blacklisted/blacklisted.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/creative-brace-use.lint-test b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/creative-brace-use.lint-test
	rename from src/lint/linter/__tests__/xhpast/creative-brace-use.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/brace-formatting/creative-brace-use.lint-test
	--- a/src/lint/linter/__tests__/xhpast/creative-brace-use.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/creative-brace-use.lint-test
	@@ -39,9 +39,7 @@

	declare(ticks = 1);
	~~~~~~~~~~
	-advice:3:14
	warning:7:13
	-advice:8:1
	warning:12:7
	warning:15:20
	warning:18:10
	@@ -58,9 +56,13 @@
	~~~~~~~~~~
	<?php

	-function f() {}
	+function f() {
	+
	+}

	-function g() {}
	+function g() {
	+
	+}

	if (1) {}

	diff --git a/src/lint/linter/__tests__/xhpast/space-after-control-keywords.lint-test b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/space-after-control-keywords.lint-test
	rename from src/lint/linter/__tests__/xhpast/space-after-control-keywords.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/brace-formatting/space-after-control-keywords.lint-test
	--- a/src/lint/linter/__tests__/xhpast/space-after-control-keywords.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/brace-formatting/space-after-control-keywords.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	if($x) {}
	else{}
	for(;;) {}
	@@ -26,34 +25,23 @@

	try {} catch(Exception $ex) {}
	~~~~~~~~~~
	-warning:3:1
	-warning:3:10
	-warning:4:1
	-warning:5:1
	-warning:6:1
	-warning:7:1
	-warning:8:1
	-warning:8:6
	-warning:9:1
	-warning:10:11
	-warning:11:16
	-warning:14:3
	-warning:15:3
	-warning:25:3
	-warning:27:8
	+warning:2:10
	+warning:9:11
	+warning:10:16
	~~~~~~~~~~
	<?php
	-
	-if ($x) {} else {}
	-for (;;) {}
	-foreach ($x as $y) {}
	-while ($x) {}
	-do {} while ($x);
	-switch ($x) {}
	+if($x) {} else{}
	+for(;;) {}
	+foreach($x as $y) {}
	+while($x) {}
	+do{} while($x);
	+switch($x) {}
	if ($x) {} else if ($y) {} else if ($z) {}

	-if ($x) {}
	-if ($x) {}
	+if ($x) {}
	+if
	+
	+($x) {}
	if ($x) {
	echo 100;
	} else {
	@@ -61,6 +49,6 @@
	}
	do {
	echo 1;
	-} while (true);
	+} while(true);

	-try {} catch (Exception $ex) {}
	+try {} catch(Exception $ex) {}
	diff --git a/src/lint/linter/xhpast/rules/__tests__/call-parentheses/array-formatting.lint-test b/src/lint/linter/xhpast/rules/__tests__/call-parentheses/array-formatting.lint-test
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/call-parentheses/array-formatting.lint-test
	@@ -0,0 +1,13 @@
	+<?php
	+array ( 1, 2, 3 );
	+list ( $x, $y ) = array();
	+[ 1, 2 , 3 ];
	+~~~~~~~~~~
	+warning:2:6
	+warning:3:5
	+warning:3:14
	+~~~~~~~~~~
	+<?php
	+array( 1, 2, 3 );
	+list( $x, $y) = array();
	+[ 1, 2 , 3 ];
	diff --git a/src/lint/linter/__tests__/xhpast/call-parens-hug-closing.lint-test b/src/lint/linter/xhpast/rules/__tests__/call-parentheses/call-parens-hug-closing.lint-test
	rename from src/lint/linter/__tests__/xhpast/call-parens-hug-closing.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/call-parentheses/call-parens-hug-closing.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/cast-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/cast-spacing/cast-spacing.lint-test
	rename from src/lint/linter/__tests__/xhpast/cast-spacing.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/cast-spacing/cast-spacing.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/class-name-literal.lint-test b/src/lint/linter/xhpast/rules/__tests__/class-name-literal/class-name-literal.lint-test
	rename from src/lint/linter/__tests__/xhpast/class-name-literal.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/class-name-literal/class-name-literal.lint-test
	--- a/src/lint/linter/__tests__/xhpast/class-name-literal.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/class-name-literal/class-name-literal.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	class MyClass {
	public function someMethod() {
	return 'MyClass';
	@@ -12,12 +11,10 @@
	}
	}
	~~~~~~~~~~
	-error:3:7
	-advice:5:12
	-advice:9:10
	+advice:4:12
	+advice:8:10
	~~~~~~~~~~
	<?php
	-
	class MyClass {
	public function someMethod() {
	return __CLASS__;
	diff --git a/src/lint/linter/__tests__/xhpast/hash-comments.lint-test b/src/lint/linter/xhpast/rules/__tests__/comment-style/hash-comments.lint-test
	rename from src/lint/linter/__tests__/xhpast/hash-comments.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/comment-style/hash-comments.lint-test
	--- a/src/lint/linter/__tests__/xhpast/hash-comments.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/comment-style/hash-comments.lint-test
	@@ -25,11 +25,7 @@
	error:4:1
	error:6:1
	error:7:11
	-advice:14:1
	-advice:15:1
	error:16:1
	-advice:19:1
	-advice:20:1
	~~~~~~~~~~
	<?php

	@@ -44,12 +40,12 @@
	/**
	* yes
	*/
	-// #yes
	-/* #yes*/
	+//#yes
	+/#yes/
	//
	//
	/////////////////// yes
	-/* no */
	-/** no */
	+/no /
	+/*no /
	/** yes */
	/** yes **/
	diff --git a/src/lint/linter/__tests__/xhpast/conditional-usage.lint-test b/src/lint/linter/xhpast/rules/__tests__/compatibility/conditional-usage.lint-test
	rename from src/lint/linter/__tests__/xhpast/conditional-usage.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/compatibility/conditional-usage.lint-test
	--- a/src/lint/linter/__tests__/xhpast/conditional-usage.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/compatibility/conditional-usage.lint-test
	@@ -23,7 +23,6 @@
	error:5:3
	error:7:3
	error:12:7
	-warning:16:3
	~~~~~~~~~~
	~~~~~~~~~~
	{
	diff --git a/src/lint/linter/__tests__/xhpast/index-function.lint-test b/src/lint/linter/xhpast/rules/__tests__/compatibility/index-function.lint-test
	rename from src/lint/linter/__tests__/xhpast/index-function.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/compatibility/index-function.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/nowdoc.lint-test b/src/lint/linter/xhpast/rules/__tests__/compatibility/nowdoc.lint-test
	rename from src/lint/linter/__tests__/xhpast/nowdoc.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/compatibility/nowdoc.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/php-compatibility.lint-test b/src/lint/linter/xhpast/rules/__tests__/compatibility/php-compatibility.lint-test
	rename from src/lint/linter/__tests__/xhpast/php-compatibility.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/compatibility/php-compatibility.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/php53-features.lint-test b/src/lint/linter/xhpast/rules/__tests__/compatibility/php53-features.lint-test
	rename from src/lint/linter/__tests__/xhpast/php53-features.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/compatibility/php53-features.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/php54-features.lint-test b/src/lint/linter/xhpast/rules/__tests__/compatibility/php54-features.lint-test
	rename from src/lint/linter/__tests__/xhpast/php54-features.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/compatibility/php54-features.lint-test
	--- a/src/lint/linter/__tests__/xhpast/php54-features.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/compatibility/php54-features.lint-test
	@@ -1,4 +1,4 @@
	-<?php
	+ <?php

	f()[0];
	m()[0];
	@@ -23,7 +23,6 @@
	~~~~~~~~~~
	error:3:5
	error:4:9
	-error:9:13
	error:12:7
	error:18:7
	~~~~~~~~~~
	diff --git a/src/lint/linter/__tests__/xhpast/php54-incompat.lint-test b/src/lint/linter/xhpast/rules/__tests__/compatibility/php54-incompat.lint-test
	rename from src/lint/linter/__tests__/xhpast/php54-incompat.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/compatibility/php54-incompat.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/windows.lint-test b/src/lint/linter/xhpast/rules/__tests__/compatibility/windows.lint-test
	rename from src/lint/linter/__tests__/xhpast/windows.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/compatibility/windows.lint-test
	diff --git a/src/lint/linter/xhpast/rules/__tests__/concatenation-operator/space-around-more-operators.lint-test b/src/lint/linter/xhpast/rules/__tests__/concatenation-operator/space-around-more-operators.lint-test
	new file mode 100644
	--- /dev/null
	+++ b/src/lint/linter/xhpast/rules/__tests__/concatenation-operator/space-around-more-operators.lint-test
	@@ -0,0 +1,24 @@
	+<?php
	+$a.$b;
	+$a . $b;
	+$a. $b;
	+$a .$b;
	+$a.
	+$b;
	+$a. // This should be okay.
	+$b;
	+~~~~~~~~~~
	+warning:3:3
	+warning:3:5
	+warning:4:4
	+warning:5:3
	+~~~~~~~~~~
	+<?php
	+$a.$b;
	+$a.$b;
	+$a.$b;
	+$a.$b;
	+$a.
	+$b;
	+$a. // This should be okay.
	+$b;
	diff --git a/src/lint/linter/__tests__/xhpast/constructor-parentheses.lint-test b/src/lint/linter/xhpast/rules/__tests__/constructor-parentheses/constructor-parentheses.lint-test
	rename from src/lint/linter/__tests__/xhpast/constructor-parentheses.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/constructor-parentheses/constructor-parentheses.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/space-after-control-keywords.lint-test b/src/lint/linter/xhpast/rules/__tests__/control-statement-spacing/space-after-control-keywords.lint-test
	rename from src/lint/linter/__tests__/xhpast/space-after-control-keywords.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/control-statement-spacing/space-after-control-keywords.lint-test
	--- a/src/lint/linter/__tests__/xhpast/space-after-control-keywords.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/control-statement-spacing/space-after-control-keywords.lint-test
	@@ -27,7 +27,6 @@
	try {} catch(Exception $ex) {}
	~~~~~~~~~~
	warning:3:1
	-warning:3:10
	warning:4:1
	warning:5:1
	warning:6:1
	@@ -35,8 +34,6 @@
	warning:8:1
	warning:8:6
	warning:9:1
	-warning:10:11
	-warning:11:16
	warning:14:3
	warning:15:3
	warning:25:3
	@@ -44,13 +41,16 @@
	~~~~~~~~~~
	<?php

	-if ($x) {} else {}
	+if ($x) {}
	+else {}
	for (;;) {}
	foreach ($x as $y) {}
	while ($x) {}
	do {} while ($x);
	switch ($x) {}
	-if ($x) {} else if ($y) {} else if ($z) {}
	+if ($x) {}
	+else if ($y) {}
	+else if ($z) {}

	if ($x) {}
	if ($x) {}
	diff --git a/src/lint/linter/__tests__/xhpast/decl-parens-hug-closing.lint-test b/src/lint/linter/xhpast/rules/__tests__/declaration-parentheses/decl-parens-hug-closing.lint-test
	rename from src/lint/linter/__tests__/xhpast/decl-parens-hug-closing.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/declaration-parentheses/decl-parens-hug-closing.lint-test
	--- a/src/lint/linter/__tests__/xhpast/decl-parens-hug-closing.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/declaration-parentheses/decl-parens-hug-closing.lint-test
	@@ -28,7 +28,6 @@
	warning:4:14
	warning:5:11
	warning:8:15
	-error:10:13
	warning:13:23
	warning:16:31
	warning:19:33
	diff --git a/src/lint/linter/__tests__/xhpast/parens-hug-contents.lint-test b/src/lint/linter/xhpast/rules/__tests__/declaration-parentheses/parens-hug-contents.lint-test
	rename from src/lint/linter/__tests__/xhpast/parens-hug-contents.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/declaration-parentheses/parens-hug-contents.lint-test
	--- a/src/lint/linter/__tests__/xhpast/parens-hug-contents.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/declaration-parentheses/parens-hug-contents.lint-test
	@@ -21,43 +21,28 @@
	$a // if comments are present
	);
	~~~~~~~~~~
	-warning:3:5
	-warning:3:8
	-warning:4:3
	-warning:5:3
	-warning:7:21
	-warning:7:24
	-warning:13:6
	-warning:13:30
	-warning:14:10
	-warning:14:19
	-warning:15:12
	warning:15:15
	-error:16:13 XHP19 Class-Filename Mismatch
	-warning:17:21
	warning:17:24
	-warning:19:10
	-warning:19:25
	~~~~~~~~~~
	<?php

	-if ($x) {}
	-f();
	-q();
	+if ( $x ) {}
	+f( );
	+q( );
	g();
	-if ($x) {} else if ($y) {}
	+if ($x) {} else if ( $y ) {}

	$obj->m(
	$x,
	$y,
	$z);
	-for ($ii = 0; $ii < 1; $ii++) {}
	-foreach ($x as $y) {}
	-function q($x) {}
	+for ( $ii = 0; $ii < 1; $ii++ ) {}
	+foreach ( $x as $y ) {}
	+function q( $x) {}
	final class X {
	- public function f($y) {}
	+ public function f( $y) {}
	}
	-foreach ($z as $k => $v) {}
	+foreach ( $z as $k => $v ) {}
	some_call( /* respect authorial intent */ $b,
	$a // if comments are present
	);
	diff --git a/src/lint/linter/__tests__/xhpast/default-parameters.lint-test b/src/lint/linter/xhpast/rules/__tests__/default-parameters/default-parameters.lint-test
	rename from src/lint/linter/__tests__/xhpast/default-parameters.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/default-parameters/default-parameters.lint-test
	--- a/src/lint/linter/__tests__/xhpast/default-parameters.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/default-parameters/default-parameters.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	function foo($x, $y, $z) {}
	function bar($x, $y = null, $z) {}
	function baz($x = null, $y = null, $z = null) {}
	@@ -8,6 +7,5 @@
	public function myMethod($x, $y = null, $z) {}
	}
	~~~~~~~~~~
	-warning:4:13
	-error:7:7
	-warning:8:27
	+warning:3:13
	+warning:7:27
	diff --git a/src/lint/linter/__tests__/xhpast/double-quote.lint-test b/src/lint/linter/xhpast/rules/__tests__/double-quote/double-quote.lint-test
	rename from src/lint/linter/__tests__/xhpast/double-quote.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/double-quote/double-quote.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/duplicate-key-in-array.lint-test b/src/lint/linter/xhpast/rules/__tests__/duplicate-array-keys/duplicate-key-in-array.lint-test
	rename from src/lint/linter/__tests__/xhpast/duplicate-key-in-array.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/duplicate-array-keys/duplicate-key-in-array.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/duplicate-switch-case.lint-test b/src/lint/linter/xhpast/rules/__tests__/duplicate-switch-case/duplicate-switch-case.lint-test
	rename from src/lint/linter/__tests__/xhpast/duplicate-switch-case.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/duplicate-switch-case/duplicate-switch-case.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/dynamic-define.lint-test b/src/lint/linter/xhpast/rules/__tests__/dynamic-define/dynamic-define.lint-test
	rename from src/lint/linter/__tests__/xhpast/dynamic-define.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/dynamic-define/dynamic-define.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/elseif.lint-test b/src/lint/linter/xhpast/rules/__tests__/elseif/elseif.lint-test
	rename from src/lint/linter/__tests__/xhpast/elseif.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/elseif/elseif.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/empty-block-statement.lint-test b/src/lint/linter/xhpast/rules/__tests__/empty-statement/empty-block-statement.lint-test
	rename from src/lint/linter/__tests__/xhpast/empty-block-statement.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/empty-statement/empty-block-statement.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/exit-expression.lint-test b/src/lint/linter/xhpast/rules/__tests__/exit-expression/exit-expression.lint-test
	rename from src/lint/linter/__tests__/xhpast/exit-expression.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/exit-expression/exit-expression.lint-test
	--- a/src/lint/linter/__tests__/xhpast/exit-expression.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/exit-expression/exit-expression.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	exit(-1);
	exit -1;
	strtoupper(33 * exit - 6);
	@@ -9,8 +8,5 @@
	$x = new stdClass();
	$y = clone $x;
	~~~~~~~~~~
	-error:4:1
	-warning:4:5
	-warning:4:6
	-error:5:17
	-warning:5:21
	+error:3:1
	+error:4:17
	diff --git a/src/lint/linter/__tests__/xhpast/extract-use.lint-test b/src/lint/linter/xhpast/rules/__tests__/extract-use/extract-use.lint-test
	rename from src/lint/linter/__tests__/xhpast/extract-use.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/extract-use/extract-use.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/formatted-string.lint-test b/src/lint/linter/xhpast/rules/__tests__/formatted-string/formatted-string.lint-test
	rename from src/lint/linter/__tests__/xhpast/formatted-string.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/formatted-string/formatted-string.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/global-variables.lint-test b/src/lint/linter/xhpast/rules/__tests__/global-variable/global-variables.lint-test
	rename from src/lint/linter/__tests__/xhpast/global-variables.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/global-variable/global-variables.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/surprising-constructors.lint-test b/src/lint/linter/xhpast/rules/__tests__/implicit-constructor/surprising-constructors.lint-test
	rename from src/lint/linter/__tests__/xhpast/surprising-constructors.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/implicit-constructor/surprising-constructors.lint-test
	--- a/src/lint/linter/__tests__/xhpast/surprising-constructors.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/implicit-constructor/surprising-constructors.lint-test
	@@ -1,10 +1,8 @@
	<?php
	-
	final class Platypus {
	public function platypus() {
	// This method must be renamed to __construct().
	}
	}
	~~~~~~~~~~
	-error:3:13 XHP19 Class-Filename Mismatch
	-error:4:19
	+error:3:19
	diff --git a/src/lint/linter/__tests__/xhpast/switches.lint-test b/src/lint/linter/xhpast/rules/__tests__/implicit-fallthrough/switches.lint-test
	rename from src/lint/linter/__tests__/xhpast/switches.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/implicit-fallthrough/switches.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/implicit-visibility.lint-test b/src/lint/linter/xhpast/rules/__tests__/implicit-visibility/implicit-visibility.lint-test
	rename from src/lint/linter/__tests__/xhpast/implicit-visibility.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/implicit-visibility/implicit-visibility.lint-test
	--- a/src/lint/linter/__tests__/xhpast/implicit-visibility.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/implicit-visibility/implicit-visibility.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	final class Foo {
	public function bar() {}
	function baz() {}
	@@ -11,14 +10,12 @@
	private $z;
	}
	~~~~~~~~~~
	-error:3:13 XHP19
	+advice:4:3
	advice:5:3
	-advice:6:3
	+advice:8:3
	advice:9:3
	-advice:10:3
	~~~~~~~~~~
	<?php
	-
	final class Foo {
	public function bar() {}
	public function baz() {}
	diff --git a/src/lint/linter/__tests__/xhpast/inline-html.lint-test b/src/lint/linter/xhpast/rules/__tests__/inline-html/inline-html.lint-test
	rename from src/lint/linter/__tests__/xhpast/inline-html.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/inline-html/inline-html.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/inner-function.lint-test b/src/lint/linter/xhpast/rules/__tests__/inner-function/inner-function.lint-test
	rename from src/lint/linter/__tests__/xhpast/inner-function.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/inner-function/inner-function.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/instanceof-operator.lint-test b/src/lint/linter/xhpast/rules/__tests__/instanceof-operator/instanceof-operator.lint-test
	rename from src/lint/linter/__tests__/xhpast/instanceof-operator.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/instanceof-operator/instanceof-operator.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/invalid-default-parameter.lint-test b/src/lint/linter/xhpast/rules/__tests__/invalid-default-parameter/invalid-default-parameter.lint-test
	rename from src/lint/linter/__tests__/xhpast/invalid-default-parameter.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/invalid-default-parameter/invalid-default-parameter.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/invalid-modifiers.lint-test b/src/lint/linter/xhpast/rules/__tests__/invalid-modifiers/invalid-modifiers.lint-test
	rename from src/lint/linter/__tests__/xhpast/invalid-modifiers.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/invalid-modifiers/invalid-modifiers.lint-test
	--- a/src/lint/linter/__tests__/xhpast/invalid-modifiers.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/invalid-modifiers/invalid-modifiers.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	class SomeClass {
	public $a;
	public public $b;
	@@ -11,9 +10,8 @@
	abstract final public function baz() {}
	}
	~~~~~~~~~~
	-error:3:7 XHP19
	+error:4:10
	error:5:10
	-error:6:10
	-error:7:11
	-error:10:10
	-error:11:12
	+error:6:11
	+error:9:10
	+error:10:12
	diff --git a/src/lint/linter/__tests__/xhpast/keyword-casing.lint-test b/src/lint/linter/xhpast/rules/__tests__/keyword-casing/keyword-casing.lint-test
	rename from src/lint/linter/__tests__/xhpast/keyword-casing.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/keyword-casing/keyword-casing.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/lamba-func-function.lint-test b/src/lint/linter/xhpast/rules/__tests__/lambda-func-function/lamba-func-function.lint-test
	rename from src/lint/linter/__tests__/xhpast/lamba-func-function.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/lambda-func-function/lamba-func-function.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/language-construct-parentheses.lint-test b/src/lint/linter/xhpast/rules/__tests__/language-construct-parentheses/language-construct-parentheses.lint-test
	rename from src/lint/linter/__tests__/xhpast/language-construct-parentheses.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/language-construct-parentheses/language-construct-parentheses.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/list-assignment.lint-test b/src/lint/linter/xhpast/rules/__tests__/list-assignment/list-assignment.lint-test
	rename from src/lint/linter/__tests__/xhpast/list-assignment.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/list-assignment/list-assignment.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/logical-operators.lint-test b/src/lint/linter/xhpast/rules/__tests__/logical-operators/logical-operators.lint-test
	rename from src/lint/linter/__tests__/xhpast/logical-operators.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/logical-operators/logical-operators.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/lowercase-functions.lint-test b/src/lint/linter/xhpast/rules/__tests__/lowercase-functions/lowercase-functions.lint-test
	rename from src/lint/linter/__tests__/xhpast/lowercase-functions.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/lowercase-functions/lowercase-functions.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/modifier-ordering.lint-test b/src/lint/linter/xhpast/rules/__tests__/modifier-ordering/modifier-ordering.lint-test
	rename from src/lint/linter/__tests__/xhpast/modifier-ordering.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/modifier-ordering/modifier-ordering.lint-test
	--- a/src/lint/linter/__tests__/xhpast/modifier-ordering.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/modifier-ordering/modifier-ordering.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	class Foo {
	public $x;
	static protected $y;
	@@ -9,13 +8,11 @@
	static final public function foobar() {}
	}
	~~~~~~~~~~
	-error:3:7 XHP19
	-advice:5:3
	-advice:7:3
	-advice:9:3
	+advice:4:3
	+advice:6:3
	+advice:8:3
	~~~~~~~~~~
	<?php
	-
	class Foo {
	public $x;
	protected static $y;
	diff --git a/src/lint/linter/__tests__/xhpast/constant-case.lint-test b/src/lint/linter/xhpast/rules/__tests__/naming-conventions/constant-case.lint-test
	rename from src/lint/linter/__tests__/xhpast/constant-case.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/naming-conventions/constant-case.lint-test
	--- a/src/lint/linter/__tests__/xhpast/constant-case.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/naming-conventions/constant-case.lint-test
	@@ -9,5 +9,4 @@
	~~~~~~~~~~
	warning:3:8
	warning:4:7
	-error:6:7
	warning:7:9
	diff --git a/src/lint/linter/__tests__/xhpast/naming-conventions.lint-test b/src/lint/linter/xhpast/rules/__tests__/naming-conventions/naming-conventions.lint-test
	rename from src/lint/linter/__tests__/xhpast/naming-conventions.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/naming-conventions/naming-conventions.lint-test
	--- a/src/lint/linter/__tests__/xhpast/naming-conventions.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/naming-conventions/naming-conventions.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	final class a {
	const b = 1, c = d;
	protected $E, $H;
	@@ -8,6 +7,8 @@

	interface i {}

	+
	+
	function YY($ZZ) {}

	final class Quack {
	@@ -16,6 +17,10 @@
	public function vV($w_w) {}
	}

	+
	+
	+
	+
	function () use ($this_is_a_closure) {};

	function f(&$YY) {}
	@@ -49,24 +54,22 @@
	Other::$y = 0;
	$mIxEdCaSe = 1;
	}
	+
	~~~~~~~~~~
	-warning:3:13
	-warning:4:9
	-warning:4:9
	-warning:4:16
	-warning:4:16
	-warning:5:13
	-warning:5:17
	-warning:6:19
	-warning:6:21
	-warning:6:25
	-warning:9:11
	-warning:11:10
	-warning:11:13
	-warning:21:13
	-warning:24:3
	-warning:25:3
	-warning:26:3
	-warning:28:3
	-warning:32:3
	-warning:50:3
	+warning:2:13
	+warning:3:9
	+warning:3:16
	+warning:4:13
	+warning:4:17
	+warning:5:19
	+warning:5:21
	+warning:5:25
	+warning:8:11
	+warning:12:10
	+warning:12:13
	+warning:26:13
	+warning:29:3
	+warning:30:3
	+warning:31:3
	+warning:33:3
	+warning:55:3
	diff --git a/src/lint/linter/__tests__/xhpast/newline-after-open-tag.lint-test b/src/lint/linter/xhpast/rules/__tests__/newline-after-open-tag/newline-after-open-tag.lint-test
	rename from src/lint/linter/__tests__/xhpast/newline-after-open-tag.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/newline-after-open-tag/newline-after-open-tag.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/no-parent-scope.lint-test b/src/lint/linter/xhpast/rules/__tests__/no-parent-scope/no-parent-scope.lint-test
	rename from src/lint/linter/__tests__/xhpast/no-parent-scope.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/no-parent-scope/no-parent-scope.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/object-operating-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/object-operator-spacing/object-operator-spacing.lint-test
	rename from src/lint/linter/__tests__/xhpast/object-operating-spacing.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/object-operator-spacing/object-operator-spacing.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/array-formatting.lint-test b/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/array-formatting.lint-test
	rename from src/lint/linter/__tests__/xhpast/array-formatting.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/array-formatting.lint-test
	--- a/src/lint/linter/__tests__/xhpast/array-formatting.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/array-formatting.lint-test
	@@ -4,10 +4,8 @@
	list ( $x, $y ) = array();
	[ 1, 2 , 3 ];
	~~~~~~~~~~
	-warning:3:6
	warning:3:8
	warning:3:16
	-warning:4:5
	warning:4:7
	warning:4:14
	warning:5:2
	@@ -15,6 +13,6 @@
	~~~~~~~~~~
	<?php

	-array(1, 2, 3);
	-list($x, $y) = array();
	+array (1, 2, 3);
	+list ($x, $y) = array();
	[1, 2 , 3];
	diff --git a/src/lint/linter/__tests__/xhpast/parens-hug-contents.lint-test b/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/parens-hug-contents.lint-test
	rename from src/lint/linter/__tests__/xhpast/parens-hug-contents.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/parens-hug-contents.lint-test
	--- a/src/lint/linter/__tests__/xhpast/parens-hug-contents.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/parentheses-spacing/parens-hug-contents.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	if ( $x ) {}
	f( );
	q( );
	@@ -21,26 +20,24 @@
	$a // if comments are present
	);
	~~~~~~~~~~
	-warning:3:5
	-warning:3:8
	+warning:2:5
	+warning:2:8
	+warning:3:3
	warning:4:3
	-warning:5:3
	-warning:7:21
	-warning:7:24
	-warning:13:6
	-warning:13:30
	-warning:14:10
	-warning:14:19
	-warning:15:12
	-warning:15:15
	-error:16:13 XHP19 Class-Filename Mismatch
	-warning:17:21
	-warning:17:24
	-warning:19:10
	-warning:19:25
	+warning:6:21
	+warning:6:24
	+warning:12:6
	+warning:12:30
	+warning:13:10
	+warning:13:19
	+warning:14:12
	+warning:14:15
	+warning:16:21
	+warning:16:24
	+warning:18:10
	+warning:18:25
	~~~~~~~~~~
	<?php
	-
	if ($x) {}
	f();
	q();
	diff --git a/src/lint/linter/__tests__/xhpast/no-segfault-on-abstract.lint-test b/src/lint/linter/xhpast/rules/__tests__/parse/no-segfault-on-abstract.lint-test
	rename from src/lint/linter/__tests__/xhpast/no-segfault-on-abstract.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/parse/no-segfault-on-abstract.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/no-segfault-on-exit.lint-test b/src/lint/linter/xhpast/rules/__tests__/parse/no-segfault-on-exit.lint-test
	rename from src/lint/linter/__tests__/xhpast/no-segfault-on-exit.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/parse/no-segfault-on-exit.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/unreasonably-deep-nesting.lint-test b/src/lint/linter/xhpast/rules/__tests__/parse/unreasonably-deep-nesting.lint-test
	rename from src/lint/linter/__tests__/xhpast/unreasonably-deep-nesting.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/parse/unreasonably-deep-nesting.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/parse_str-use.lint-test b/src/lint/linter/xhpast/rules/__tests__/parse_str-use/parse_str-use.lint-test
	rename from src/lint/linter/__tests__/xhpast/parse_str-use.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/parse_str-use/parse_str-use.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/call-time-pass-by-reference.lint-test b/src/lint/linter/xhpast/rules/__tests__/pass-by-reference/call-time-pass-by-reference.lint-test
	rename from src/lint/linter/__tests__/xhpast/call-time-pass-by-reference.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/pass-by-reference/call-time-pass-by-reference.lint-test
	--- a/src/lint/linter/__tests__/xhpast/call-time-pass-by-reference.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/pass-by-reference/call-time-pass-by-reference.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	class MyClass {
	public function myfunc($var) {
	echo $var;
	@@ -25,10 +24,9 @@
	array_walk(array(), function () use (&$x) {});
	MyClass::myfunc(array(&$x, &$y));
	~~~~~~~~~~
	-error:3:7 XHP19
	-error:10:8
	-error:13:15
	-error:16:17
	-error:19:24
	-error:19:39
	-error:23:6
	+error:9:8
	+error:12:15
	+error:15:17
	+error:18:24
	+error:18:39
	+error:22:6
	diff --git a/src/lint/linter/__tests__/xhpast/php-tags-echo-form.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-echo-tag/php-tags-echo-form.lint-test
	rename from src/lint/linter/__tests__/xhpast/php-tags-echo-form.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/php-echo-tag/php-tags-echo-form.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-open-tag/embedded-tags.lint-test
	rename from src/lint/linter/__tests__/xhpast/embedded-tags.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/php-open-tag/embedded-tags.lint-test
	--- a/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/php-open-tag/embedded-tags.lint-test
	@@ -2,4 +2,3 @@

	This shouldn't fatal the parser.
	~~~~~~~~~~
	-disabled:2:1
	diff --git a/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-tags-bad.lint-test
	rename from src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-tags-bad.lint-test
	--- a/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-tags-bad.lint-test
	@@ -3,7 +3,6 @@

	?>
	~~~~~~~~~~
	-disabled:1:1
	error:1:1
	~~~~~~~~~~
	garbage garbage
	diff --git a/src/lint/linter/__tests__/xhpast/php-tags-good.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-tags-good.lint-test
	rename from src/lint/linter/__tests__/xhpast/php-tags-good.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-tags-good.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/php-tags-script.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-tags-script.lint-test
	rename from src/lint/linter/__tests__/xhpast/php-tags-script.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/php-open-tag/php-tags-script.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/php-tags-short.lint-test b/src/lint/linter/xhpast/rules/__tests__/php-short-tag/php-tags-short.lint-test
	rename from src/lint/linter/__tests__/xhpast/php-tags-short.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/php-short-tag/php-tags-short.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/wrong-concat-operator.lint-test b/src/lint/linter/xhpast/rules/__tests__/plus-operator-on-strings/wrong-concat-operator.lint-test
	rename from src/lint/linter/__tests__/xhpast/wrong-concat-operator.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/plus-operator-on-strings/wrong-concat-operator.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/preg-quote.lint-test b/src/lint/linter/xhpast/rules/__tests__/preg-quote-misuse/preg-quote.lint-test
	rename from src/lint/linter/__tests__/xhpast/preg-quote.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/preg-quote-misuse/preg-quote.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/reused-local.lint-test b/src/lint/linter/xhpast/rules/__tests__/reused-as-iterator/reused-local.lint-test
	rename from src/lint/linter/__tests__/xhpast/reused-local.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/reused-as-iterator/reused-local.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/reused-iterator-reference.lint-test b/src/lint/linter/xhpast/rules/__tests__/reused-iterator-reference/reused-iterator-reference.lint-test
	rename from src/lint/linter/__tests__/xhpast/reused-iterator-reference.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/reused-iterator-reference/reused-iterator-reference.lint-test
	--- a/src/lint/linter/__tests__/xhpast/reused-iterator-reference.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/reused-iterator-reference/reused-iterator-reference.lint-test
	@@ -126,7 +126,5 @@
	warning:27:20
	warning:33:3
	warning:52:3
	-error:85:20
	-error:87:3
	warning:110:5
	warning:120:3
	diff --git a/src/lint/linter/__tests__/xhpast/reused-iterators.lint-test b/src/lint/linter/xhpast/rules/__tests__/reused-iterator/reused-iterators.lint-test
	rename from src/lint/linter/__tests__/xhpast/reused-iterators.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/reused-iterator/reused-iterators.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/self-member-references-php53.lint-test b/src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-references-php53.lint-test
	rename from src/lint/linter/__tests__/xhpast/self-member-references-php53.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-references-php53.lint-test
	--- a/src/lint/linter/__tests__/xhpast/self-member-references-php53.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-references-php53.lint-test
	@@ -9,7 +9,6 @@
	}
	}
	~~~~~~~~~~
	-error:3:13
	~~~~~~~~~~
	~~~~~~~~~~
	{
	diff --git a/src/lint/linter/__tests__/xhpast/self-member-references-php54.lint-test b/src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-references-php54.lint-test
	rename from src/lint/linter/__tests__/xhpast/self-member-references-php54.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-references-php54.lint-test
	--- a/src/lint/linter/__tests__/xhpast/self-member-references-php54.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-references-php54.lint-test
	@@ -9,7 +9,6 @@
	}
	}
	~~~~~~~~~~
	-error:3:13
	advice:6:7
	~~~~~~~~~~
	<?php
	diff --git a/src/lint/linter/__tests__/xhpast/self-member-references.lint-test b/src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-references.lint-test
	rename from src/lint/linter/__tests__/xhpast/self-member-references.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-references.lint-test
	--- a/src/lint/linter/__tests__/xhpast/self-member-references.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/self-member-reference/self-member-references.lint-test
	@@ -25,7 +25,6 @@
	SomeReallyLongClassName
	::someMethod();
	~~~~~~~~~~
	-error:3:7
	advice:7:5
	advice:12:10
	advice:12:14
	diff --git a/src/lint/linter/__tests__/xhpast/semicolon-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/semicolon-spacing/semicolon-spacing.lint-test
	rename from src/lint/linter/__tests__/xhpast/semicolon-spacing.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/semicolon-spacing/semicolon-spacing.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/slowness.lint-test b/src/lint/linter/xhpast/rules/__tests__/slowness/slowness.lint-test
	rename from src/lint/linter/__tests__/xhpast/slowness.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/slowness/slowness.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/use-of-this-in-static-method.lint-test b/src/lint/linter/xhpast/rules/__tests__/static-this/use-of-this-in-static-method.lint-test
	rename from src/lint/linter/__tests__/xhpast/use-of-this-in-static-method.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/static-this/use-of-this-in-static-method.lint-test
	--- a/src/lint/linter/__tests__/xhpast/use-of-this-in-static-method.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/static-this/use-of-this-in-static-method.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	final class A {
	public function u() {
	$this->f();
	@@ -9,5 +8,4 @@
	}
	}
	~~~~~~~~~~
	-error:3:13 XHP19 Class-Filename Mismatch
	-error:8:5 Use of $this in a static method.
	+error:7:5
	diff --git a/src/lint/linter/__tests__/xhpast/syntax-error.lint-test b/src/lint/linter/xhpast/rules/__tests__/syntax/syntax-error.lint-test
	rename from src/lint/linter/__tests__/xhpast/syntax-error.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/syntax/syntax-error.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/tautological-expressions.lint-test b/src/lint/linter/xhpast/rules/__tests__/tautological-expression/tautological-expressions.lint-test
	rename from src/lint/linter/__tests__/xhpast/tautological-expressions.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/tautological-expression/tautological-expressions.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/todo.lint-test b/src/lint/linter/xhpast/rules/__tests__/todo-comment/todo.lint-test
	rename from src/lint/linter/__tests__/xhpast/todo.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/todo-comment/todo.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/tostring-exception.lint-test b/src/lint/linter/xhpast/rules/__tests__/tostring-exception/tostring-exception.lint-test
	rename from src/lint/linter/__tests__/xhpast/tostring-exception.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/tostring-exception/tostring-exception.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/unary-postfix-expression-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/unary-postfix-expression-spacing/unary-postfix-expression-spacing.lint-test
	rename from src/lint/linter/__tests__/xhpast/unary-postfix-expression-spacing.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/unary-postfix-expression-spacing/unary-postfix-expression-spacing.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/unary-prefix-expression-spacing.lint-test b/src/lint/linter/xhpast/rules/__tests__/unary-prefix-expression-spacing/unary-prefix-expression-spacing.lint-test
	rename from src/lint/linter/__tests__/xhpast/unary-prefix-expression-spacing.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/unary-prefix-expression-spacing/unary-prefix-expression-spacing.lint-test
	diff --git a/src/lint/linter/__tests__/xhpast/undeclared-variables.lint-test b/src/lint/linter/xhpast/rules/__tests__/undeclared-variable/undeclared-variables.lint-test
	rename from src/lint/linter/__tests__/xhpast/undeclared-variables.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/undeclared-variable/undeclared-variables.lint-test
	--- a/src/lint/linter/__tests__/xhpast/undeclared-variables.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/undeclared-variable/undeclared-variables.lint-test
	@@ -186,18 +186,12 @@
	};
	}
	~~~~~~~~~~
	-warning:9:3
	error:28:3
	-error:30:3
	-error:36:3
	error:42:5
	error:43:7
	error:44:5
	error:45:5
	error:46:10
	-warning:51:3
	-error:51:10 worst ever
	-warning:61:3
	error:87:3 This stuff is basically testing the lexer/parser for function decls.
	error:104:15 Variables in instance derefs should be checked, static should not.
	error:118:3 isset() and empty() should not trigger errors.
	diff --git a/src/lint/linter/__tests__/xhpast/unnecessary-final-modifier.lint-test b/src/lint/linter/xhpast/rules/__tests__/unnecessary-final-modifier/unnecessary-final-modifier.lint-test
	rename from src/lint/linter/__tests__/xhpast/unnecessary-final-modifier.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/unnecessary-final-modifier/unnecessary-final-modifier.lint-test
	--- a/src/lint/linter/__tests__/xhpast/unnecessary-final-modifier.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/unnecessary-final-modifier/unnecessary-final-modifier.lint-test
	@@ -1,9 +1,7 @@
	<?php
	-
	final class Foo {
	public function bar() {}
	final public function baz() {}
	}
	~~~~~~~~~~
	-error:3:13 XHP19
	-advice:5:3
	+advice:4:3
	diff --git a/src/lint/linter/__tests__/xhpast/empty-statement.lint-test b/src/lint/linter/xhpast/rules/__tests__/unnecessary-semicolon/empty-statement.lint-test
	rename from src/lint/linter/__tests__/xhpast/empty-statement.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/unnecessary-semicolon/empty-statement.lint-test
	--- a/src/lint/linter/__tests__/xhpast/empty-statement.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/unnecessary-semicolon/empty-statement.lint-test
	@@ -3,7 +3,6 @@
	final class Foo {};
	$x = null;;
	~~~~~~~~~~
	-error:3:13 XHP19
	advice:3:19
	advice:4:11
	~~~~~~~~~~
	diff --git a/src/lint/linter/__tests__/xhpast/useless-overriding-method.lint-test b/src/lint/linter/xhpast/rules/__tests__/useless-overriding-method/useless-overriding-method.lint-test
	rename from src/lint/linter/__tests__/xhpast/useless-overriding-method.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/useless-overriding-method/useless-overriding-method.lint-test
	--- a/src/lint/linter/__tests__/xhpast/useless-overriding-method.lint-test
	+++ b/src/lint/linter/xhpast/rules/__tests__/useless-overriding-method/useless-overriding-method.lint-test
	@@ -1,5 +1,4 @@
	<?php
	-
	final class MyClass extends SomeOtherClass {
	public function __construct() {
	parent::__construct();
	@@ -22,7 +21,6 @@
	}
	}
	~~~~~~~~~~
	-error:3:13
	-advice:4:3
	-advice:8:3
	-advice:16:3
	+advice:3:3
	+advice:7:3
	+advice:15:3
	diff --git a/src/lint/linter/__tests__/xhpast/variable-variables.lint-test b/src/lint/linter/xhpast/rules/__tests__/variable-variable/variable-variables.lint-test
	rename from src/lint/linter/__tests__/xhpast/variable-variables.lint-test
	rename to src/lint/linter/xhpast/rules/__tests__/variable-variable/variable-variables.lint-test

File Metadata

Mime Type: text/plain
Expires: Mon, Feb 3, 9:01 PM (8 h, 50 m)
Storage Engine: blob
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: 7087803
Default Alt Text: D14010.id33882.diff (156 KB)

D14010.id33882.diffNo OneTemporaryActions

D14010.id33882.diffView Options

File Metadata

Event Timeline

D14010.id33882.diff
No OneTemporary
Actions

D14010.id33882.diff
View Options