diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php index fa7a0492..b278c3a5 100644 --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -1,223 +1,223 @@ 2, 'class' => array( - 'ArcanistAliasWorkflow' => 'workflow/alias/ArcanistAliasWorkflow.php', - 'ArcanistAmendWorkflow' => 'workflow/amend/ArcanistAmendWorkflow.php', - 'ArcanistApacheLicenseLinter' => 'lint/linter/apachelicense/ArcanistApacheLicenseLinter.php', - 'ArcanistApacheLicenseLinterTestCase' => 'lint/linter/apachelicense/__tests__/ArcanistApacheLicenseLinterTestCase.php', - 'ArcanistBaseUnitTestEngine' => 'unit/engine/base/ArcanistBaseUnitTestEngine.php', - 'ArcanistBaseWorkflow' => 'workflow/base/ArcanistBaseWorkflow.php', - 'ArcanistBranchWorkflow' => 'workflow/branch/ArcanistBranchWorkflow.php', - 'ArcanistBundle' => 'parser/bundle/ArcanistBundle.php', - 'ArcanistBundleTestCase' => 'parser/bundle/__tests__/ArcanistBundleTestCase.php', - 'ArcanistCallConduitWorkflow' => 'workflow/call-conduit/ArcanistCallConduitWorkflow.php', - 'ArcanistCapabilityNotSupportedException' => 'workflow/exception/notsupported/ArcanistCapabilityNotSupportedException.php', + 'ArcanistAliasWorkflow' => 'workflow/ArcanistAliasWorkflow.php', + 'ArcanistAmendWorkflow' => 'workflow/ArcanistAmendWorkflow.php', + 'ArcanistApacheLicenseLinter' => 'lint/linter/ArcanistApacheLicenseLinter.php', + 'ArcanistApacheLicenseLinterTestCase' => 'lint/linter/__tests__/ArcanistApacheLicenseLinterTestCase.php', + 'ArcanistBaseUnitTestEngine' => 'unit/engine/ArcanistBaseUnitTestEngine.php', + 'ArcanistBaseWorkflow' => 'workflow/ArcanistBaseWorkflow.php', + 'ArcanistBranchWorkflow' => 'workflow/ArcanistBranchWorkflow.php', + 'ArcanistBundle' => 'parser/ArcanistBundle.php', + 'ArcanistBundleTestCase' => 'parser/__tests__/ArcanistBundleTestCase.php', + 'ArcanistCallConduitWorkflow' => 'workflow/ArcanistCallConduitWorkflow.php', + 'ArcanistCapabilityNotSupportedException' => 'workflow/exception/ArcanistCapabilityNotSupportedException.php', 'ArcanistChooseInvalidRevisionException' => 'exception/ArcanistChooseInvalidRevisionException.php', 'ArcanistChooseNoRevisionsException' => 'exception/ArcanistChooseNoRevisionsException.php', - 'ArcanistCloseRevisionWorkflow' => 'workflow/close-revision/ArcanistCloseRevisionWorkflow.php', - 'ArcanistCloseWorkflow' => 'workflow/close/ArcanistCloseWorkflow.php', - 'ArcanistCommentRemover' => 'parser/commentremover/ArcanistCommentRemover.php', - 'ArcanistCommentRemoverTestCase' => 'parser/commentremover/__tests__/ArcanistCommentRemoverTestCase.php', - 'ArcanistCommitWorkflow' => 'workflow/commit/ArcanistCommitWorkflow.php', - 'ArcanistConduitLinter' => 'lint/linter/conduit/ArcanistConduitLinter.php', + 'ArcanistCloseRevisionWorkflow' => 'workflow/ArcanistCloseRevisionWorkflow.php', + 'ArcanistCloseWorkflow' => 'workflow/ArcanistCloseWorkflow.php', + 'ArcanistCommentRemover' => 'parser/ArcanistCommentRemover.php', + 'ArcanistCommentRemoverTestCase' => 'parser/__tests__/ArcanistCommentRemoverTestCase.php', + 'ArcanistCommitWorkflow' => 'workflow/ArcanistCommitWorkflow.php', + 'ArcanistConduitLinter' => 'lint/linter/ArcanistConduitLinter.php', 'ArcanistConfiguration' => 'configuration/ArcanistConfiguration.php', - 'ArcanistCoverWorkflow' => 'workflow/cover/ArcanistCoverWorkflow.php', - 'ArcanistDiffChange' => 'parser/diff/change/ArcanistDiffChange.php', - 'ArcanistDiffChangeType' => 'parser/diff/changetype/ArcanistDiffChangeType.php', - 'ArcanistDiffHunk' => 'parser/diff/hunk/ArcanistDiffHunk.php', - 'ArcanistDiffParser' => 'parser/diff/ArcanistDiffParser.php', - 'ArcanistDiffParserTestCase' => 'parser/diff/__tests__/ArcanistDiffParserTestCase.php', + 'ArcanistCoverWorkflow' => 'workflow/ArcanistCoverWorkflow.php', + 'ArcanistDiffChange' => 'parser/diff/ArcanistDiffChange.php', + 'ArcanistDiffChangeType' => 'parser/diff/ArcanistDiffChangeType.php', + 'ArcanistDiffHunk' => 'parser/diff/ArcanistDiffHunk.php', + 'ArcanistDiffParser' => 'parser/ArcanistDiffParser.php', + 'ArcanistDiffParserTestCase' => 'parser/__tests__/ArcanistDiffParserTestCase.php', 'ArcanistDiffUtils' => 'difference/ArcanistDiffUtils.php', 'ArcanistDiffUtilsTestCase' => 'difference/__tests__/ArcanistDiffUtilsTestCase.php', - 'ArcanistDiffWorkflow' => 'workflow/diff/ArcanistDiffWorkflow.php', - 'ArcanistDifferentialCommitMessage' => 'differential/commitmessage/ArcanistDifferentialCommitMessage.php', - 'ArcanistDifferentialCommitMessageParserException' => 'differential/commitmessage/ArcanistDifferentialCommitMessageParserException.php', - 'ArcanistDifferentialRevisionHash' => 'differential/constants/revisionhash/ArcanistDifferentialRevisionHash.php', - 'ArcanistDifferentialRevisionStatus' => 'differential/constants/revisionstatus/ArcanistDifferentialRevisionStatus.php', - 'ArcanistDownloadWorkflow' => 'workflow/download/ArcanistDownloadWorkflow.php', - 'ArcanistEventType' => 'events/constant/type/ArcanistEventType.php', - 'ArcanistExportWorkflow' => 'workflow/export/ArcanistExportWorkflow.php', - 'ArcanistFilenameLinter' => 'lint/linter/filename/ArcanistFilenameLinter.php', - 'ArcanistGeneratedLinter' => 'lint/linter/generated/ArcanistGeneratedLinter.php', - 'ArcanistGetConfigWorkflow' => 'workflow/get-config/ArcanistGetConfigWorkflow.php', - 'ArcanistGitAPI' => 'repository/api/git/ArcanistGitAPI.php', - 'ArcanistGitHookPreReceiveWorkflow' => 'workflow/git-hook-pre-receive/ArcanistGitHookPreReceiveWorkflow.php', - 'ArcanistHelpWorkflow' => 'workflow/help/ArcanistHelpWorkflow.php', - 'ArcanistHookAPI' => 'repository/hookapi/base/ArcanistHookAPI.php', - 'ArcanistInstallCertificateWorkflow' => 'workflow/install-certificate/ArcanistInstallCertificateWorkflow.php', - 'ArcanistJSHintLinter' => 'lint/linter/jshint/ArcanistJSHintLinter.php', - 'ArcanistLandWorkflow' => 'workflow/land/ArcanistLandWorkflow.php', - 'ArcanistLiberateLintEngine' => 'lint/engine/liberate/ArcanistLiberateLintEngine.php', - 'ArcanistLiberateWorkflow' => 'workflow/liberate/ArcanistLiberateWorkflow.php', - 'ArcanistLicenseLinter' => 'lint/linter/license/ArcanistLicenseLinter.php', - 'ArcanistLintEngine' => 'lint/engine/base/ArcanistLintEngine.php', - 'ArcanistLintJSONRenderer' => 'lint/renderer/ArcanistLintJSONRenderer.php', - 'ArcanistLintLikeCompilerRenderer' => 'lint/renderer/ArcanistLintLikeCompilerRenderer.php', - 'ArcanistLintMessage' => 'lint/message/ArcanistLintMessage.php', - 'ArcanistLintPatcher' => 'lint/patcher/ArcanistLintPatcher.php', - 'ArcanistLintRenderer' => 'lint/renderer/ArcanistLintRenderer.php', - 'ArcanistLintResult' => 'lint/result/ArcanistLintResult.php', - 'ArcanistLintSeverity' => 'lint/severity/ArcanistLintSeverity.php', - 'ArcanistLintSummaryRenderer' => 'lint/renderer/ArcanistLintSummaryRenderer.php', - 'ArcanistLintWorkflow' => 'workflow/lint/ArcanistLintWorkflow.php', - 'ArcanistLinter' => 'lint/linter/base/ArcanistLinter.php', - 'ArcanistLinterTestCase' => 'lint/linter/base/test/ArcanistLinterTestCase.php', - 'ArcanistListWorkflow' => 'workflow/list/ArcanistListWorkflow.php', - 'ArcanistMarkCommittedWorkflow' => 'workflow/mark-committed/ArcanistMarkCommittedWorkflow.php', - 'ArcanistMercurialAPI' => 'repository/api/mercurial/ArcanistMercurialAPI.php', - 'ArcanistMercurialParser' => 'repository/parser/mercurial/ArcanistMercurialParser.php', - 'ArcanistMercurialParserTestCase' => 'repository/parser/mercurial/__tests__/ArcanistMercurialParserTestCase.php', - 'ArcanistNoEffectException' => 'exception/usage/noeffect/ArcanistNoEffectException.php', - 'ArcanistNoEngineException' => 'exception/usage/noengine/ArcanistNoEngineException.php', - 'ArcanistNoLintLinter' => 'lint/linter/nolint/ArcanistNoLintLinter.php', - 'ArcanistNoLintTestCaseMisnamed' => 'lint/linter/nolint/__tests__/ArcanistNoLintTestCase.php', - 'ArcanistPEP8Linter' => 'lint/linter/pep8/ArcanistPEP8Linter.php', - 'ArcanistPasteWorkflow' => 'workflow/paste/ArcanistPasteWorkflow.php', - 'ArcanistPatchWorkflow' => 'workflow/patch/ArcanistPatchWorkflow.php', - 'ArcanistPhpcsLinter' => 'lint/linter/phpcs/ArcanistPhpcsLinter.php', - 'ArcanistPhutilLibraryLinter' => 'lint/linter/phutillibrary/ArcanistPhutilLibraryLinter.php', - 'ArcanistPhutilModuleLinter' => 'lint/linter/phutilmodule/ArcanistPhutilModuleLinter.php', - 'ArcanistPhutilTestCase' => 'unit/engine/phutil/testcase/ArcanistPhutilTestCase.php', - 'ArcanistPhutilTestSkippedException' => 'unit/engine/phutil/testcase/exception/ArcanistPhutilTestSkippedException.php', - 'ArcanistPhutilTestTerminatedException' => 'unit/engine/phutil/testcase/exception/ArcanistPhutilTestTerminatedException.php', - 'ArcanistPyFlakesLinter' => 'lint/linter/pyflakes/ArcanistPyFlakesLinter.php', - 'ArcanistPyLintLinter' => 'lint/linter/pylint/ArcanistPyLintLinter.php', - 'ArcanistRepositoryAPI' => 'repository/api/base/ArcanistRepositoryAPI.php', - 'ArcanistScriptAndRegexLinter' => 'lint/linter/scriptandregex/ArcanistScriptAndRegexLinter.php', - 'ArcanistSetConfigWorkflow' => 'workflow/set-config/ArcanistSetConfigWorkflow.php', - 'ArcanistShellCompleteWorkflow' => 'workflow/shell-complete/ArcanistShellCompleteWorkflow.php', - 'ArcanistSingleLintEngine' => 'lint/engine/single/ArcanistSingleLintEngine.php', - 'ArcanistSpellingDefaultData' => 'lint/linter/spelling/ArcanistSpellingDefaultData.php', - 'ArcanistSpellingLinter' => 'lint/linter/spelling/ArcanistSpellingLinter.php', - 'ArcanistSpellingLinterTestCase' => 'lint/linter/spelling/__tests__/ArcanistSpellingLinterTestCase.php', - 'ArcanistSubversionAPI' => 'repository/api/subversion/ArcanistSubversionAPI.php', - 'ArcanistSubversionHookAPI' => 'repository/hookapi/subversion/ArcanistSubversionHookAPI.php', - 'ArcanistSvnHookPreCommitWorkflow' => 'workflow/svn-hook-pre-commit/ArcanistSvnHookPreCommitWorkflow.php', - 'ArcanistTasksWorkflow' => 'workflow/tasks/ArcanistTasksWorkflow.php', - 'ArcanistTextLinter' => 'lint/linter/text/ArcanistTextLinter.php', - 'ArcanistTextLinterTestCase' => 'lint/linter/text/__tests__/ArcanistTextLinterTestCase.php', - 'ArcanistUncommittedChangesException' => 'exception/usage/uncommittedchanges/ArcanistUncommittedChangesException.php', - 'ArcanistUnitTestResult' => 'unit/result/ArcanistUnitTestResult.php', - 'ArcanistUnitWorkflow' => 'workflow/unit/ArcanistUnitWorkflow.php', - 'ArcanistUpgradeWorkflow' => 'workflow/upgrade/ArcanistUpgradeWorkflow.php', - 'ArcanistUploadWorkflow' => 'workflow/upload/ArcanistUploadWorkflow.php', - 'ArcanistUsageException' => 'exception/usage/ArcanistUsageException.php', - 'ArcanistUserAbortException' => 'exception/usage/userabort/ArcanistUserAbortException.php', - 'ArcanistWhichWorkflow' => 'workflow/which/ArcanistWhichWorkflow.php', + 'ArcanistDiffWorkflow' => 'workflow/ArcanistDiffWorkflow.php', + 'ArcanistDifferentialCommitMessage' => 'differential/ArcanistDifferentialCommitMessage.php', + 'ArcanistDifferentialCommitMessageParserException' => 'differential/ArcanistDifferentialCommitMessageParserException.php', + 'ArcanistDifferentialRevisionHash' => 'differential/constants/ArcanistDifferentialRevisionHash.php', + 'ArcanistDifferentialRevisionStatus' => 'differential/constants/ArcanistDifferentialRevisionStatus.php', + 'ArcanistDownloadWorkflow' => 'workflow/ArcanistDownloadWorkflow.php', + 'ArcanistEventType' => 'events/constant/ArcanistEventType.php', + 'ArcanistExportWorkflow' => 'workflow/ArcanistExportWorkflow.php', + 'ArcanistFilenameLinter' => 'lint/linter/ArcanistFilenameLinter.php', + 'ArcanistGeneratedLinter' => 'lint/linter/ArcanistGeneratedLinter.php', + 'ArcanistGetConfigWorkflow' => 'workflow/ArcanistGetConfigWorkflow.php', + 'ArcanistGitAPI' => 'repository/api/ArcanistGitAPI.php', + 'ArcanistGitHookPreReceiveWorkflow' => 'workflow/ArcanistGitHookPreReceiveWorkflow.php', + 'ArcanistHelpWorkflow' => 'workflow/ArcanistHelpWorkflow.php', + 'ArcanistHookAPI' => 'repository/hookapi/ArcanistHookAPI.php', + 'ArcanistInstallCertificateWorkflow' => 'workflow/ArcanistInstallCertificateWorkflow.php', + 'ArcanistJSHintLinter' => 'lint/linter/ArcanistJSHintLinter.php', + 'ArcanistLandWorkflow' => 'workflow/ArcanistLandWorkflow.php', + 'ArcanistLiberateLintEngine' => 'lint/engine/ArcanistLiberateLintEngine.php', + 'ArcanistLiberateWorkflow' => 'workflow/ArcanistLiberateWorkflow.php', + 'ArcanistLicenseLinter' => 'lint/linter/ArcanistLicenseLinter.php', + 'ArcanistLintEngine' => 'lint/engine/ArcanistLintEngine.php', + 'ArcanistLintJSONRenderer' => 'lint/ArcanistLintJSONRenderer.php', + 'ArcanistLintLikeCompilerRenderer' => 'lint/ArcanistLintLikeCompilerRenderer.php', + 'ArcanistLintMessage' => 'lint/ArcanistLintMessage.php', + 'ArcanistLintPatcher' => 'lint/ArcanistLintPatcher.php', + 'ArcanistLintRenderer' => 'lint/ArcanistLintRenderer.php', + 'ArcanistLintResult' => 'lint/ArcanistLintResult.php', + 'ArcanistLintSeverity' => 'lint/ArcanistLintSeverity.php', + 'ArcanistLintSummaryRenderer' => 'lint/ArcanistLintSummaryRenderer.php', + 'ArcanistLintWorkflow' => 'workflow/ArcanistLintWorkflow.php', + 'ArcanistLinter' => 'lint/linter/ArcanistLinter.php', + 'ArcanistLinterTestCase' => 'lint/linter/__tests__/ArcanistLinterTestCase.php', + 'ArcanistListWorkflow' => 'workflow/ArcanistListWorkflow.php', + 'ArcanistMarkCommittedWorkflow' => 'workflow/ArcanistMarkCommittedWorkflow.php', + 'ArcanistMercurialAPI' => 'repository/api/ArcanistMercurialAPI.php', + 'ArcanistMercurialParser' => 'repository/parser/ArcanistMercurialParser.php', + 'ArcanistMercurialParserTestCase' => 'repository/parser/__tests__/ArcanistMercurialParserTestCase.php', + 'ArcanistNoEffectException' => 'exception/usage/ArcanistNoEffectException.php', + 'ArcanistNoEngineException' => 'exception/usage/ArcanistNoEngineException.php', + 'ArcanistNoLintLinter' => 'lint/linter/ArcanistNoLintLinter.php', + 'ArcanistNoLintTestCaseMisnamed' => 'lint/linter/__tests__/ArcanistNoLintTestCase.php', + 'ArcanistPEP8Linter' => 'lint/linter/ArcanistPEP8Linter.php', + 'ArcanistPasteWorkflow' => 'workflow/ArcanistPasteWorkflow.php', + 'ArcanistPatchWorkflow' => 'workflow/ArcanistPatchWorkflow.php', + 'ArcanistPhpcsLinter' => 'lint/linter/ArcanistPhpcsLinter.php', + 'ArcanistPhutilLibraryLinter' => 'lint/linter/ArcanistPhutilLibraryLinter.php', + 'ArcanistPhutilModuleLinter' => 'lint/linter/ArcanistPhutilModuleLinter.php', + 'ArcanistPhutilTestCase' => 'unit/engine/phutil/ArcanistPhutilTestCase.php', + 'ArcanistPhutilTestSkippedException' => 'unit/engine/phutil/testcase/ArcanistPhutilTestSkippedException.php', + 'ArcanistPhutilTestTerminatedException' => 'unit/engine/phutil/testcase/ArcanistPhutilTestTerminatedException.php', + 'ArcanistPyFlakesLinter' => 'lint/linter/ArcanistPyFlakesLinter.php', + 'ArcanistPyLintLinter' => 'lint/linter/ArcanistPyLintLinter.php', + 'ArcanistRepositoryAPI' => 'repository/api/ArcanistRepositoryAPI.php', + 'ArcanistScriptAndRegexLinter' => 'lint/linter/ArcanistScriptAndRegexLinter.php', + 'ArcanistSetConfigWorkflow' => 'workflow/ArcanistSetConfigWorkflow.php', + 'ArcanistShellCompleteWorkflow' => 'workflow/ArcanistShellCompleteWorkflow.php', + 'ArcanistSingleLintEngine' => 'lint/engine/ArcanistSingleLintEngine.php', + 'ArcanistSpellingDefaultData' => 'lint/linter/ArcanistSpellingDefaultData.php', + 'ArcanistSpellingLinter' => 'lint/linter/ArcanistSpellingLinter.php', + 'ArcanistSpellingLinterTestCase' => 'lint/linter/__tests__/ArcanistSpellingLinterTestCase.php', + 'ArcanistSubversionAPI' => 'repository/api/ArcanistSubversionAPI.php', + 'ArcanistSubversionHookAPI' => 'repository/hookapi/ArcanistSubversionHookAPI.php', + 'ArcanistSvnHookPreCommitWorkflow' => 'workflow/ArcanistSvnHookPreCommitWorkflow.php', + 'ArcanistTasksWorkflow' => 'workflow/ArcanistTasksWorkflow.php', + 'ArcanistTextLinter' => 'lint/linter/ArcanistTextLinter.php', + 'ArcanistTextLinterTestCase' => 'lint/linter/__tests__/ArcanistTextLinterTestCase.php', + 'ArcanistUncommittedChangesException' => 'exception/usage/ArcanistUncommittedChangesException.php', + 'ArcanistUnitTestResult' => 'unit/ArcanistUnitTestResult.php', + 'ArcanistUnitWorkflow' => 'workflow/ArcanistUnitWorkflow.php', + 'ArcanistUpgradeWorkflow' => 'workflow/ArcanistUpgradeWorkflow.php', + 'ArcanistUploadWorkflow' => 'workflow/ArcanistUploadWorkflow.php', + 'ArcanistUsageException' => 'exception/ArcanistUsageException.php', + 'ArcanistUserAbortException' => 'exception/usage/ArcanistUserAbortException.php', + 'ArcanistWhichWorkflow' => 'workflow/ArcanistWhichWorkflow.php', 'ArcanistWorkingCopyIdentity' => 'workingcopyidentity/ArcanistWorkingCopyIdentity.php', - 'ArcanistXHPASTLintNamingHook' => 'lint/linter/xhpast/naminghook/ArcanistXHPASTLintNamingHook.php', - 'ArcanistXHPASTLintNamingHookTestCase' => 'lint/linter/xhpast/naminghook/__tests__/ArcanistXHPASTLintNamingHookTestCase.php', - 'ArcanistXHPASTLinter' => 'lint/linter/xhpast/ArcanistXHPASTLinter.php', - 'ArcanistXHPASTLinterTestCase' => 'lint/linter/xhpast/__tests__/ArcanistXHPASTLinterTestCase.php', + 'ArcanistXHPASTLintNamingHook' => 'lint/linter/xhpast/ArcanistXHPASTLintNamingHook.php', + 'ArcanistXHPASTLintNamingHookTestCase' => 'lint/linter/xhpast/__tests__/ArcanistXHPASTLintNamingHookTestCase.php', + 'ArcanistXHPASTLinter' => 'lint/linter/ArcanistXHPASTLinter.php', + 'ArcanistXHPASTLinterTestCase' => 'lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php', 'BranchInfo' => 'branch/BranchInfo.php', - 'ComprehensiveLintEngine' => 'lint/engine/comprehensive/ComprehensiveLintEngine.php', - 'ExampleLintEngine' => 'lint/engine/example/ExampleLintEngine.php', - 'NoseTestEngine' => 'unit/engine/nose/NoseTestEngine.php', - 'PhpunitTestEngine' => 'unit/engine/phpunit/PhpunitTestEngine.php', - 'PhutilLintEngine' => 'lint/engine/phutil/PhutilLintEngine.php', - 'PhutilModuleRequirements' => 'parser/phutilmodule/PhutilModuleRequirements.php', - 'PhutilUnitTestEngine' => 'unit/engine/phutil/PhutilUnitTestEngine.php', - 'PhutilUnitTestEngineTestCase' => 'unit/engine/phutil/__tests__/PhutilUnitTestEngineTestCase.php', - 'UnitTestableArcanistLintEngine' => 'lint/engine/test/UnitTestableArcanistLintEngine.php', + 'ComprehensiveLintEngine' => 'lint/engine/ComprehensiveLintEngine.php', + 'ExampleLintEngine' => 'lint/engine/ExampleLintEngine.php', + 'NoseTestEngine' => 'unit/engine/NoseTestEngine.php', + 'PhpunitTestEngine' => 'unit/engine/PhpunitTestEngine.php', + 'PhutilLintEngine' => 'lint/engine/PhutilLintEngine.php', + 'PhutilModuleRequirements' => 'parser/PhutilModuleRequirements.php', + 'PhutilUnitTestEngine' => 'unit/engine/PhutilUnitTestEngine.php', + 'PhutilUnitTestEngineTestCase' => 'unit/engine/__tests__/PhutilUnitTestEngineTestCase.php', + 'UnitTestableArcanistLintEngine' => 'lint/engine/UnitTestableArcanistLintEngine.php', ), 'function' => array( ), 'xmap' => array( 'ArcanistAliasWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistAmendWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistApacheLicenseLinter' => 'ArcanistLicenseLinter', 'ArcanistApacheLicenseLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistBranchWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistBundleTestCase' => 'ArcanistPhutilTestCase', 'ArcanistCallConduitWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistCapabilityNotSupportedException' => 'Exception', 'ArcanistChooseInvalidRevisionException' => 'Exception', 'ArcanistChooseNoRevisionsException' => 'Exception', 'ArcanistCloseRevisionWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistCloseWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistCommentRemoverTestCase' => 'ArcanistPhutilTestCase', 'ArcanistCommitWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistConduitLinter' => 'ArcanistLinter', 'ArcanistCoverWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistDiffParserTestCase' => 'ArcanistPhutilTestCase', 'ArcanistDiffUtilsTestCase' => 'ArcanistPhutilTestCase', 'ArcanistDiffWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistDifferentialCommitMessageParserException' => 'Exception', 'ArcanistDownloadWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistEventType' => 'PhutilEventType', 'ArcanistExportWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistFilenameLinter' => 'ArcanistLinter', 'ArcanistGeneratedLinter' => 'ArcanistLinter', 'ArcanistGetConfigWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistGitAPI' => 'ArcanistRepositoryAPI', 'ArcanistGitHookPreReceiveWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistHelpWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistInstallCertificateWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistJSHintLinter' => 'ArcanistLinter', 'ArcanistLandWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistLiberateLintEngine' => 'ArcanistLintEngine', 'ArcanistLiberateWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistLicenseLinter' => 'ArcanistLinter', 'ArcanistLintWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistLinterTestCase' => 'ArcanistPhutilTestCase', 'ArcanistListWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistMarkCommittedWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistMercurialAPI' => 'ArcanistRepositoryAPI', 'ArcanistMercurialParserTestCase' => 'ArcanistPhutilTestCase', 'ArcanistNoEffectException' => 'ArcanistUsageException', 'ArcanistNoEngineException' => 'ArcanistUsageException', 'ArcanistNoLintLinter' => 'ArcanistLinter', 'ArcanistNoLintTestCaseMisnamed' => 'ArcanistLinterTestCase', 'ArcanistPEP8Linter' => 'ArcanistLinter', 'ArcanistPasteWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistPatchWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistPhpcsLinter' => 'ArcanistLinter', 'ArcanistPhutilLibraryLinter' => 'ArcanistLinter', 'ArcanistPhutilModuleLinter' => 'ArcanistLinter', 'ArcanistPhutilTestSkippedException' => 'Exception', 'ArcanistPhutilTestTerminatedException' => 'Exception', 'ArcanistPyFlakesLinter' => 'ArcanistLinter', 'ArcanistPyLintLinter' => 'ArcanistLinter', 'ArcanistScriptAndRegexLinter' => 'ArcanistLinter', 'ArcanistSetConfigWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistShellCompleteWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistSingleLintEngine' => 'ArcanistLintEngine', 'ArcanistSpellingLinter' => 'ArcanistLinter', 'ArcanistSpellingLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistSubversionAPI' => 'ArcanistRepositoryAPI', 'ArcanistSubversionHookAPI' => 'ArcanistHookAPI', 'ArcanistSvnHookPreCommitWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistTasksWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistTextLinter' => 'ArcanistLinter', 'ArcanistTextLinterTestCase' => 'ArcanistLinterTestCase', 'ArcanistUncommittedChangesException' => 'ArcanistUsageException', 'ArcanistUnitWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistUpgradeWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistUploadWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistUsageException' => 'Exception', 'ArcanistUserAbortException' => 'ArcanistUsageException', 'ArcanistWhichWorkflow' => 'ArcanistBaseWorkflow', 'ArcanistXHPASTLintNamingHookTestCase' => 'ArcanistPhutilTestCase', 'ArcanistXHPASTLinter' => 'ArcanistLinter', 'ArcanistXHPASTLinterTestCase' => 'ArcanistLinterTestCase', 'ComprehensiveLintEngine' => 'ArcanistLintEngine', 'ExampleLintEngine' => 'ArcanistLintEngine', 'NoseTestEngine' => 'ArcanistBaseUnitTestEngine', 'PhpunitTestEngine' => 'ArcanistBaseUnitTestEngine', 'PhutilLintEngine' => 'ArcanistLintEngine', 'PhutilUnitTestEngine' => 'ArcanistBaseUnitTestEngine', 'PhutilUnitTestEngineTestCase' => 'ArcanistPhutilTestCase', 'UnitTestableArcanistLintEngine' => 'ArcanistLintEngine', ), )); diff --git a/src/differential/commitmessage/ArcanistDifferentialCommitMessage.php b/src/differential/ArcanistDifferentialCommitMessage.php similarity index 100% rename from src/differential/commitmessage/ArcanistDifferentialCommitMessage.php rename to src/differential/ArcanistDifferentialCommitMessage.php diff --git a/src/differential/commitmessage/ArcanistDifferentialCommitMessageParserException.php b/src/differential/ArcanistDifferentialCommitMessageParserException.php similarity index 100% rename from src/differential/commitmessage/ArcanistDifferentialCommitMessageParserException.php rename to src/differential/ArcanistDifferentialCommitMessageParserException.php diff --git a/src/differential/constants/revisionhash/ArcanistDifferentialRevisionHash.php b/src/differential/constants/ArcanistDifferentialRevisionHash.php similarity index 100% rename from src/differential/constants/revisionhash/ArcanistDifferentialRevisionHash.php rename to src/differential/constants/ArcanistDifferentialRevisionHash.php diff --git a/src/differential/constants/revisionstatus/ArcanistDifferentialRevisionStatus.php b/src/differential/constants/ArcanistDifferentialRevisionStatus.php similarity index 100% rename from src/differential/constants/revisionstatus/ArcanistDifferentialRevisionStatus.php rename to src/differential/constants/ArcanistDifferentialRevisionStatus.php diff --git a/src/events/constant/type/ArcanistEventType.php b/src/events/constant/ArcanistEventType.php similarity index 100% rename from src/events/constant/type/ArcanistEventType.php rename to src/events/constant/ArcanistEventType.php diff --git a/src/exception/usage/ArcanistUsageException.php b/src/exception/ArcanistUsageException.php similarity index 100% rename from src/exception/usage/ArcanistUsageException.php rename to src/exception/ArcanistUsageException.php diff --git a/src/exception/usage/noeffect/ArcanistNoEffectException.php b/src/exception/usage/ArcanistNoEffectException.php similarity index 100% rename from src/exception/usage/noeffect/ArcanistNoEffectException.php rename to src/exception/usage/ArcanistNoEffectException.php diff --git a/src/exception/usage/noengine/ArcanistNoEngineException.php b/src/exception/usage/ArcanistNoEngineException.php similarity index 100% rename from src/exception/usage/noengine/ArcanistNoEngineException.php rename to src/exception/usage/ArcanistNoEngineException.php diff --git a/src/exception/usage/uncommittedchanges/ArcanistUncommittedChangesException.php b/src/exception/usage/ArcanistUncommittedChangesException.php similarity index 100% rename from src/exception/usage/uncommittedchanges/ArcanistUncommittedChangesException.php rename to src/exception/usage/ArcanistUncommittedChangesException.php diff --git a/src/exception/usage/userabort/ArcanistUserAbortException.php b/src/exception/usage/ArcanistUserAbortException.php similarity index 100% rename from src/exception/usage/userabort/ArcanistUserAbortException.php rename to src/exception/usage/ArcanistUserAbortException.php diff --git a/src/lint/renderer/ArcanistLintJSONRenderer.php b/src/lint/ArcanistLintJSONRenderer.php similarity index 100% rename from src/lint/renderer/ArcanistLintJSONRenderer.php rename to src/lint/ArcanistLintJSONRenderer.php diff --git a/src/lint/renderer/ArcanistLintLikeCompilerRenderer.php b/src/lint/ArcanistLintLikeCompilerRenderer.php similarity index 100% rename from src/lint/renderer/ArcanistLintLikeCompilerRenderer.php rename to src/lint/ArcanistLintLikeCompilerRenderer.php diff --git a/src/lint/message/ArcanistLintMessage.php b/src/lint/ArcanistLintMessage.php similarity index 100% rename from src/lint/message/ArcanistLintMessage.php rename to src/lint/ArcanistLintMessage.php diff --git a/src/lint/patcher/ArcanistLintPatcher.php b/src/lint/ArcanistLintPatcher.php similarity index 100% rename from src/lint/patcher/ArcanistLintPatcher.php rename to src/lint/ArcanistLintPatcher.php diff --git a/src/lint/renderer/ArcanistLintRenderer.php b/src/lint/ArcanistLintRenderer.php similarity index 100% rename from src/lint/renderer/ArcanistLintRenderer.php rename to src/lint/ArcanistLintRenderer.php diff --git a/src/lint/result/ArcanistLintResult.php b/src/lint/ArcanistLintResult.php similarity index 100% rename from src/lint/result/ArcanistLintResult.php rename to src/lint/ArcanistLintResult.php diff --git a/src/lint/severity/ArcanistLintSeverity.php b/src/lint/ArcanistLintSeverity.php similarity index 100% rename from src/lint/severity/ArcanistLintSeverity.php rename to src/lint/ArcanistLintSeverity.php diff --git a/src/lint/renderer/ArcanistLintSummaryRenderer.php b/src/lint/ArcanistLintSummaryRenderer.php similarity index 100% rename from src/lint/renderer/ArcanistLintSummaryRenderer.php rename to src/lint/ArcanistLintSummaryRenderer.php diff --git a/src/lint/engine/liberate/ArcanistLiberateLintEngine.php b/src/lint/engine/ArcanistLiberateLintEngine.php similarity index 100% rename from src/lint/engine/liberate/ArcanistLiberateLintEngine.php rename to src/lint/engine/ArcanistLiberateLintEngine.php diff --git a/src/lint/engine/base/ArcanistLintEngine.php b/src/lint/engine/ArcanistLintEngine.php similarity index 100% rename from src/lint/engine/base/ArcanistLintEngine.php rename to src/lint/engine/ArcanistLintEngine.php diff --git a/src/lint/engine/single/ArcanistSingleLintEngine.php b/src/lint/engine/ArcanistSingleLintEngine.php similarity index 100% rename from src/lint/engine/single/ArcanistSingleLintEngine.php rename to src/lint/engine/ArcanistSingleLintEngine.php diff --git a/src/lint/engine/comprehensive/ComprehensiveLintEngine.php b/src/lint/engine/ComprehensiveLintEngine.php similarity index 100% rename from src/lint/engine/comprehensive/ComprehensiveLintEngine.php rename to src/lint/engine/ComprehensiveLintEngine.php diff --git a/src/lint/engine/example/ExampleLintEngine.php b/src/lint/engine/ExampleLintEngine.php similarity index 100% rename from src/lint/engine/example/ExampleLintEngine.php rename to src/lint/engine/ExampleLintEngine.php diff --git a/src/lint/engine/phutil/PhutilLintEngine.php b/src/lint/engine/PhutilLintEngine.php similarity index 100% rename from src/lint/engine/phutil/PhutilLintEngine.php rename to src/lint/engine/PhutilLintEngine.php diff --git a/src/lint/engine/test/UnitTestableArcanistLintEngine.php b/src/lint/engine/UnitTestableArcanistLintEngine.php similarity index 100% rename from src/lint/engine/test/UnitTestableArcanistLintEngine.php rename to src/lint/engine/UnitTestableArcanistLintEngine.php diff --git a/src/lint/linter/apachelicense/ArcanistApacheLicenseLinter.php b/src/lint/linter/ArcanistApacheLicenseLinter.php similarity index 100% rename from src/lint/linter/apachelicense/ArcanistApacheLicenseLinter.php rename to src/lint/linter/ArcanistApacheLicenseLinter.php diff --git a/src/lint/linter/conduit/ArcanistConduitLinter.php b/src/lint/linter/ArcanistConduitLinter.php similarity index 100% rename from src/lint/linter/conduit/ArcanistConduitLinter.php rename to src/lint/linter/ArcanistConduitLinter.php diff --git a/src/lint/linter/filename/ArcanistFilenameLinter.php b/src/lint/linter/ArcanistFilenameLinter.php similarity index 100% rename from src/lint/linter/filename/ArcanistFilenameLinter.php rename to src/lint/linter/ArcanistFilenameLinter.php diff --git a/src/lint/linter/generated/ArcanistGeneratedLinter.php b/src/lint/linter/ArcanistGeneratedLinter.php similarity index 100% rename from src/lint/linter/generated/ArcanistGeneratedLinter.php rename to src/lint/linter/ArcanistGeneratedLinter.php diff --git a/src/lint/linter/jshint/ArcanistJSHintLinter.php b/src/lint/linter/ArcanistJSHintLinter.php similarity index 100% rename from src/lint/linter/jshint/ArcanistJSHintLinter.php rename to src/lint/linter/ArcanistJSHintLinter.php diff --git a/src/lint/linter/license/ArcanistLicenseLinter.php b/src/lint/linter/ArcanistLicenseLinter.php similarity index 100% rename from src/lint/linter/license/ArcanistLicenseLinter.php rename to src/lint/linter/ArcanistLicenseLinter.php diff --git a/src/lint/linter/base/ArcanistLinter.php b/src/lint/linter/ArcanistLinter.php similarity index 100% rename from src/lint/linter/base/ArcanistLinter.php rename to src/lint/linter/ArcanistLinter.php diff --git a/src/lint/linter/nolint/ArcanistNoLintLinter.php b/src/lint/linter/ArcanistNoLintLinter.php similarity index 100% rename from src/lint/linter/nolint/ArcanistNoLintLinter.php rename to src/lint/linter/ArcanistNoLintLinter.php diff --git a/src/lint/linter/pep8/ArcanistPEP8Linter.php b/src/lint/linter/ArcanistPEP8Linter.php similarity index 100% rename from src/lint/linter/pep8/ArcanistPEP8Linter.php rename to src/lint/linter/ArcanistPEP8Linter.php diff --git a/src/lint/linter/phpcs/ArcanistPhpcsLinter.php b/src/lint/linter/ArcanistPhpcsLinter.php similarity index 100% rename from src/lint/linter/phpcs/ArcanistPhpcsLinter.php rename to src/lint/linter/ArcanistPhpcsLinter.php diff --git a/src/lint/linter/phutillibrary/ArcanistPhutilLibraryLinter.php b/src/lint/linter/ArcanistPhutilLibraryLinter.php similarity index 100% rename from src/lint/linter/phutillibrary/ArcanistPhutilLibraryLinter.php rename to src/lint/linter/ArcanistPhutilLibraryLinter.php diff --git a/src/lint/linter/phutilmodule/ArcanistPhutilModuleLinter.php b/src/lint/linter/ArcanistPhutilModuleLinter.php similarity index 100% rename from src/lint/linter/phutilmodule/ArcanistPhutilModuleLinter.php rename to src/lint/linter/ArcanistPhutilModuleLinter.php diff --git a/src/lint/linter/pyflakes/ArcanistPyFlakesLinter.php b/src/lint/linter/ArcanistPyFlakesLinter.php similarity index 100% rename from src/lint/linter/pyflakes/ArcanistPyFlakesLinter.php rename to src/lint/linter/ArcanistPyFlakesLinter.php diff --git a/src/lint/linter/pylint/ArcanistPyLintLinter.php b/src/lint/linter/ArcanistPyLintLinter.php similarity index 100% rename from src/lint/linter/pylint/ArcanistPyLintLinter.php rename to src/lint/linter/ArcanistPyLintLinter.php diff --git a/src/lint/linter/scriptandregex/ArcanistScriptAndRegexLinter.php b/src/lint/linter/ArcanistScriptAndRegexLinter.php similarity index 100% rename from src/lint/linter/scriptandregex/ArcanistScriptAndRegexLinter.php rename to src/lint/linter/ArcanistScriptAndRegexLinter.php diff --git a/src/lint/linter/spelling/ArcanistSpellingDefaultData.php b/src/lint/linter/ArcanistSpellingDefaultData.php similarity index 100% rename from src/lint/linter/spelling/ArcanistSpellingDefaultData.php rename to src/lint/linter/ArcanistSpellingDefaultData.php diff --git a/src/lint/linter/spelling/ArcanistSpellingLinter.php b/src/lint/linter/ArcanistSpellingLinter.php similarity index 100% rename from src/lint/linter/spelling/ArcanistSpellingLinter.php rename to src/lint/linter/ArcanistSpellingLinter.php diff --git a/src/lint/linter/text/ArcanistTextLinter.php b/src/lint/linter/ArcanistTextLinter.php similarity index 100% rename from src/lint/linter/text/ArcanistTextLinter.php rename to src/lint/linter/ArcanistTextLinter.php diff --git a/src/lint/linter/xhpast/ArcanistXHPASTLinter.php b/src/lint/linter/ArcanistXHPASTLinter.php similarity index 100% rename from src/lint/linter/xhpast/ArcanistXHPASTLinter.php rename to src/lint/linter/ArcanistXHPASTLinter.php diff --git a/src/lint/linter/apachelicense/__tests__/ArcanistApacheLicenseLinterTestCase.php b/src/lint/linter/__tests__/ArcanistApacheLicenseLinterTestCase.php similarity index 96% rename from src/lint/linter/apachelicense/__tests__/ArcanistApacheLicenseLinterTestCase.php rename to src/lint/linter/__tests__/ArcanistApacheLicenseLinterTestCase.php index 5c5f6939..ab026261 100644 --- a/src/lint/linter/apachelicense/__tests__/ArcanistApacheLicenseLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistApacheLicenseLinterTestCase.php @@ -1,40 +1,40 @@ executeTestsInDirectory( - dirname(__FILE__).'/data/', + dirname(__FILE__).'/apachelicense/', $linter, $working_copy); } protected function compareTransform($expected, $actual) { $expected = str_replace('YYYY', date('Y'), $expected); return parent::compareTransform($expected, $actual); } } diff --git a/src/lint/linter/base/test/ArcanistLinterTestCase.php b/src/lint/linter/__tests__/ArcanistLinterTestCase.php similarity index 100% rename from src/lint/linter/base/test/ArcanistLinterTestCase.php rename to src/lint/linter/__tests__/ArcanistLinterTestCase.php diff --git a/src/lint/linter/nolint/__tests__/ArcanistNoLintTestCase.php b/src/lint/linter/__tests__/ArcanistNoLintTestCase.php similarity index 100% rename from src/lint/linter/nolint/__tests__/ArcanistNoLintTestCase.php rename to src/lint/linter/__tests__/ArcanistNoLintTestCase.php diff --git a/src/lint/linter/spelling/__tests__/ArcanistSpellingLinterTestCase.php b/src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php similarity index 96% rename from src/lint/linter/spelling/__tests__/ArcanistSpellingLinterTestCase.php rename to src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php index cdead793..7afe118e 100644 --- a/src/lint/linter/spelling/__tests__/ArcanistSpellingLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistSpellingLinterTestCase.php @@ -1,38 +1,38 @@ removeLintRule('acc'.'out'); $linter->addPartialWordRule('supermn', 'superman'); $linter->addWholeWordRule('batmn', 'batman'); $working_copy = ArcanistWorkingCopyIdentity::newFromPath(__FILE__); return $this->executeTestsInDirectory( - dirname(__FILE__).'/data/', + dirname(__FILE__).'/spelling/', $linter, $working_copy); } } diff --git a/src/lint/linter/text/__tests__/ArcanistTextLinterTestCase.php b/src/lint/linter/__tests__/ArcanistTextLinterTestCase.php similarity index 96% rename from src/lint/linter/text/__tests__/ArcanistTextLinterTestCase.php rename to src/lint/linter/__tests__/ArcanistTextLinterTestCase.php index 021eff46..28b2bcb5 100644 --- a/src/lint/linter/text/__tests__/ArcanistTextLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistTextLinterTestCase.php @@ -1,35 +1,35 @@ executeTestsInDirectory( - dirname(__FILE__).'/data/', + dirname(__FILE__).'/text/', $linter, $working_copy); } } diff --git a/src/lint/linter/xhpast/__tests__/ArcanistXHPASTLinterTestCase.php b/src/lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php similarity index 96% rename from src/lint/linter/xhpast/__tests__/ArcanistXHPASTLinterTestCase.php rename to src/lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php index 6228aee3..4630339d 100644 --- a/src/lint/linter/xhpast/__tests__/ArcanistXHPASTLinterTestCase.php +++ b/src/lint/linter/__tests__/ArcanistXHPASTLinterTestCase.php @@ -1,42 +1,42 @@ setCustomSeverityMap( array( ArcanistXHPASTLinter::LINT_RAGGED_CLASSTREE_EDGE => ArcanistLintSeverity::SEVERITY_WARNING, )); $working_copy = ArcanistWorkingCopyIdentity::newFromPath(__FILE__); return $this->executeTestsInDirectory( - dirname(__FILE__).'/data/', + dirname(__FILE__).'/xhpast/', $linter, $working_copy); } } diff --git a/src/lint/linter/apachelicense/__tests__/data/c-basic.lint-test b/src/lint/linter/__tests__/apachelicense/c-basic.lint-test similarity index 100% rename from src/lint/linter/apachelicense/__tests__/data/c-basic.lint-test rename to src/lint/linter/__tests__/apachelicense/c-basic.lint-test diff --git a/src/lint/linter/apachelicense/__tests__/data/greedy.lint-test b/src/lint/linter/__tests__/apachelicense/greedy.lint-test similarity index 100% rename from src/lint/linter/apachelicense/__tests__/data/greedy.lint-test rename to src/lint/linter/__tests__/apachelicense/greedy.lint-test diff --git a/src/lint/linter/apachelicense/__tests__/data/php-basic.lint-test b/src/lint/linter/__tests__/apachelicense/php-basic.lint-test similarity index 100% rename from src/lint/linter/apachelicense/__tests__/data/php-basic.lint-test rename to src/lint/linter/__tests__/apachelicense/php-basic.lint-test diff --git a/src/lint/linter/apachelicense/__tests__/data/php-script.lint-test b/src/lint/linter/__tests__/apachelicense/php-script.lint-test similarity index 100% rename from src/lint/linter/apachelicense/__tests__/data/php-script.lint-test rename to src/lint/linter/__tests__/apachelicense/php-script.lint-test diff --git a/src/lint/linter/apachelicense/__tests__/data/php-update-mess.lint-test b/src/lint/linter/__tests__/apachelicense/php-update-mess.lint-test similarity index 100% rename from src/lint/linter/apachelicense/__tests__/data/php-update-mess.lint-test rename to src/lint/linter/__tests__/apachelicense/php-update-mess.lint-test diff --git a/src/lint/linter/apachelicense/__tests__/data/php-update-multi.lint-test b/src/lint/linter/__tests__/apachelicense/php-update-multi.lint-test similarity index 100% rename from src/lint/linter/apachelicense/__tests__/data/php-update-multi.lint-test rename to src/lint/linter/__tests__/apachelicense/php-update-multi.lint-test diff --git a/src/lint/linter/apachelicense/__tests__/data/php-update-single.lint-test b/src/lint/linter/__tests__/apachelicense/php-update-single.lint-test similarity index 100% rename from src/lint/linter/apachelicense/__tests__/data/php-update-single.lint-test rename to src/lint/linter/__tests__/apachelicense/php-update-single.lint-test diff --git a/src/lint/linter/spelling/__tests__/data/spell.lint-test b/src/lint/linter/__tests__/spelling/spell.lint-test similarity index 100% rename from src/lint/linter/spelling/__tests__/data/spell.lint-test rename to src/lint/linter/__tests__/spelling/spell.lint-test diff --git a/src/lint/linter/text/__tests__/data/empty-file.lint-test b/src/lint/linter/__tests__/text/empty-file.lint-test similarity index 100% rename from src/lint/linter/text/__tests__/data/empty-file.lint-test rename to src/lint/linter/__tests__/text/empty-file.lint-test diff --git a/src/lint/linter/text/__tests__/data/nocommit-hook.lint-test b/src/lint/linter/__tests__/text/nocommit-hook.lint-test similarity index 100% rename from src/lint/linter/text/__tests__/data/nocommit-hook.lint-test rename to src/lint/linter/__tests__/text/nocommit-hook.lint-test diff --git a/src/lint/linter/text/__tests__/data/nocommit-nohook.lint-test b/src/lint/linter/__tests__/text/nocommit-nohook.lint-test similarity index 100% rename from src/lint/linter/text/__tests__/data/nocommit-nohook.lint-test rename to src/lint/linter/__tests__/text/nocommit-nohook.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/array-index.lint-test b/src/lint/linter/__tests__/xhpast/array-index.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/array-index.lint-test rename to src/lint/linter/__tests__/xhpast/array-index.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/creative-brace-use.lint-test b/src/lint/linter/__tests__/xhpast/creative-brace-use.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/creative-brace-use.lint-test rename to src/lint/linter/__tests__/xhpast/creative-brace-use.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/duplicate-key-in-array.lint-test b/src/lint/linter/__tests__/xhpast/duplicate-key-in-array.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/duplicate-key-in-array.lint-test rename to src/lint/linter/__tests__/xhpast/duplicate-key-in-array.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/dynamic-define.lint-test b/src/lint/linter/__tests__/xhpast/dynamic-define.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/dynamic-define.lint-test rename to src/lint/linter/__tests__/xhpast/dynamic-define.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/embedded-tags.lint-test b/src/lint/linter/__tests__/xhpast/embedded-tags.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/embedded-tags.lint-test rename to src/lint/linter/__tests__/xhpast/embedded-tags.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/exit-expression.lint-test b/src/lint/linter/__tests__/xhpast/exit-expression.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/exit-expression.lint-test rename to src/lint/linter/__tests__/xhpast/exit-expression.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/hash-comments.lint-test b/src/lint/linter/__tests__/xhpast/hash-comments.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/hash-comments.lint-test rename to src/lint/linter/__tests__/xhpast/hash-comments.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/naming-conventions.lint-test b/src/lint/linter/__tests__/xhpast/naming-conventions.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/naming-conventions.lint-test rename to src/lint/linter/__tests__/xhpast/naming-conventions.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/no-segfault-on-abstract.lint-test b/src/lint/linter/__tests__/xhpast/no-segfault-on-abstract.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/no-segfault-on-abstract.lint-test rename to src/lint/linter/__tests__/xhpast/no-segfault-on-abstract.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/no-segfault-on-exit.lint-test b/src/lint/linter/__tests__/xhpast/no-segfault-on-exit.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/no-segfault-on-exit.lint-test rename to src/lint/linter/__tests__/xhpast/no-segfault-on-exit.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/parens-hug-contents.lint-test b/src/lint/linter/__tests__/xhpast/parens-hug-contents.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/parens-hug-contents.lint-test rename to src/lint/linter/__tests__/xhpast/parens-hug-contents.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/php-tags-bad.lint-test b/src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/php-tags-bad.lint-test rename to src/lint/linter/__tests__/xhpast/php-tags-bad.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/php-tags-echo-form.lint-test b/src/lint/linter/__tests__/xhpast/php-tags-echo-form.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/php-tags-echo-form.lint-test rename to src/lint/linter/__tests__/xhpast/php-tags-echo-form.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/php-tags-good.lint-test b/src/lint/linter/__tests__/xhpast/php-tags-good.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/php-tags-good.lint-test rename to src/lint/linter/__tests__/xhpast/php-tags-good.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/php-tags-script.lint-test b/src/lint/linter/__tests__/xhpast/php-tags-script.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/php-tags-script.lint-test rename to src/lint/linter/__tests__/xhpast/php-tags-script.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/php53.lint-test b/src/lint/linter/__tests__/xhpast/php53.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/php53.lint-test rename to src/lint/linter/__tests__/xhpast/php53.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/preg-quote.lint-test b/src/lint/linter/__tests__/xhpast/preg-quote.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/preg-quote.lint-test rename to src/lint/linter/__tests__/xhpast/preg-quote.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/ragged-classtree-edges.lint-test b/src/lint/linter/__tests__/xhpast/ragged-classtree-edges.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/ragged-classtree-edges.lint-test rename to src/lint/linter/__tests__/xhpast/ragged-classtree-edges.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/reused-iterators.lint-test b/src/lint/linter/__tests__/xhpast/reused-iterators.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/reused-iterators.lint-test rename to src/lint/linter/__tests__/xhpast/reused-iterators.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/reused-local.lint-test b/src/lint/linter/__tests__/xhpast/reused-local.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/reused-local.lint-test rename to src/lint/linter/__tests__/xhpast/reused-local.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/single-pass-adjacent-patches.lint-test b/src/lint/linter/__tests__/xhpast/single-pass-adjacent-patches.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/single-pass-adjacent-patches.lint-test rename to src/lint/linter/__tests__/xhpast/single-pass-adjacent-patches.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/space-after-control-keywords.lint-test b/src/lint/linter/__tests__/xhpast/space-after-control-keywords.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/space-after-control-keywords.lint-test rename to src/lint/linter/__tests__/xhpast/space-after-control-keywords.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/space-around-operators.lint-test b/src/lint/linter/__tests__/xhpast/space-around-operators.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/space-around-operators.lint-test rename to src/lint/linter/__tests__/xhpast/space-around-operators.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/surprising-constructors.lint-test b/src/lint/linter/__tests__/xhpast/surprising-constructors.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/surprising-constructors.lint-test rename to src/lint/linter/__tests__/xhpast/surprising-constructors.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/switches.lint-test b/src/lint/linter/__tests__/xhpast/switches.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/switches.lint-test rename to src/lint/linter/__tests__/xhpast/switches.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/syntax-error.lint-test b/src/lint/linter/__tests__/xhpast/syntax-error.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/syntax-error.lint-test rename to src/lint/linter/__tests__/xhpast/syntax-error.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/tautological-expressions.lint-test b/src/lint/linter/__tests__/xhpast/tautological-expressions.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/tautological-expressions.lint-test rename to src/lint/linter/__tests__/xhpast/tautological-expressions.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/undeclared-variables.lint-test b/src/lint/linter/__tests__/xhpast/undeclared-variables.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/undeclared-variables.lint-test rename to src/lint/linter/__tests__/xhpast/undeclared-variables.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/unreasonably-deep-nesting.lint-test b/src/lint/linter/__tests__/xhpast/unreasonably-deep-nesting.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/unreasonably-deep-nesting.lint-test rename to src/lint/linter/__tests__/xhpast/unreasonably-deep-nesting.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/use-of-this-in-static-method.lint-test b/src/lint/linter/__tests__/xhpast/use-of-this-in-static-method.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/use-of-this-in-static-method.lint-test rename to src/lint/linter/__tests__/xhpast/use-of-this-in-static-method.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/variable-variables.lint-test b/src/lint/linter/__tests__/xhpast/variable-variables.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/variable-variables.lint-test rename to src/lint/linter/__tests__/xhpast/variable-variables.lint-test diff --git a/src/lint/linter/xhpast/__tests__/data/wrong-concat-operator.lint-test b/src/lint/linter/__tests__/xhpast/wrong-concat-operator.lint-test similarity index 100% rename from src/lint/linter/xhpast/__tests__/data/wrong-concat-operator.lint-test rename to src/lint/linter/__tests__/xhpast/wrong-concat-operator.lint-test diff --git a/src/lint/linter/phutillibrary/__init__.php b/src/lint/linter/phutillibrary/__init__.php deleted file mode 100644 index e22eb549..00000000 --- a/src/lint/linter/phutillibrary/__init__.php +++ /dev/null @@ -1,17 +0,0 @@ -getResourcePath($name)); } private function getResourcePath($name) { - return dirname(__FILE__).'/data/'.$name; + return dirname(__FILE__).'/bundle/'.$name; } private function loadDiff($old, $new) { list($err, $stdout) = exec_manual( 'diff --unified=65535 --label %s --label %s -- %s %s', 'file 9999-99-99', 'file 9999-99-99', $this->getResourcePath($old), $this->getResourcePath($new)); $this->assertEqual( 1, $err, "Expect `diff` to find changes between '{$old}' and '{$new}'."); return $stdout; } private function loadOneChangeBundle($old, $new) { $diff = $this->loadDiff($old, $new); return ArcanistBundle::newFromDiff($diff); } public function testTrailingContext() { // Diffs need to generate without extra trailing context, or 'patch' will // choke on them. $this->assertEqual( $this->loadResource('trailing-context.diff'), $this->loadOneChangeBundle( 'trailing-context.old', 'trailing-context.new')->toUnifiedDiff()); } public function testDisjointHunks() { // Diffs need to generate without overlapping hunks. $this->assertEqual( $this->loadResource('disjoint-hunks.diff'), $this->loadOneChangeBundle( 'disjoint-hunks.old', 'disjoint-hunks.new')->toUnifiedDiff()); } public function testNonlocalTrailingNewline() { // Diffs without changes near the end of the file should not generate a // bogus, change-free hunk if the file has no trailing newline. $this->assertEqual( $this->loadResource('trailing-newline.diff'), $this->loadOneChangeBundle( 'trailing-newline.old', 'trailing-newline.new')->toUnifiedDiff()); } } diff --git a/src/parser/commentremover/__tests__/ArcanistCommentRemoverTestCase.php b/src/parser/__tests__/ArcanistCommentRemoverTestCase.php similarity index 100% rename from src/parser/commentremover/__tests__/ArcanistCommentRemoverTestCase.php rename to src/parser/__tests__/ArcanistCommentRemoverTestCase.php diff --git a/src/parser/diff/__tests__/ArcanistDiffParserTestCase.php b/src/parser/__tests__/ArcanistDiffParserTestCase.php similarity index 99% rename from src/parser/diff/__tests__/ArcanistDiffParserTestCase.php rename to src/parser/__tests__/ArcanistDiffParserTestCase.php index bdfa724c..90c6cae5 100644 --- a/src/parser/diff/__tests__/ArcanistDiffParserTestCase.php +++ b/src/parser/__tests__/ArcanistDiffParserTestCase.php @@ -1,535 +1,535 @@ parseDiff($root.$file); } } private function parseDiff($diff_file) { $contents = Filesystem::readFile($diff_file); $file = basename($diff_file); $parser = new ArcanistDiffParser(); $changes = $parser->parseDiff($contents); switch ($file) { case 'colorized.hggitdiff': $this->assertEqual(1, count($changes)); break; case 'basic-missing-both-newlines-plus.udiff': case 'basic-missing-both-newlines.udiff': case 'basic-missing-new-newline-plus.udiff': case 'basic-missing-new-newline.udiff': case 'basic-missing-old-newline-plus.udiff': case 'basic-missing-old-newline.udiff': $expect_old = strpos($file, '-old-') || strpos($file, '-both-'); $expect_new = strpos($file, '-new-') || strpos($file, '-both-'); $expect_two = strpos($file, '-plus'); $this->assertEqual(count($changes), $expect_two ? 2 : 1); $change = reset($changes); $this->assertEqual(true, $change !== null); $hunks = $change->getHunks(); $this->assertEqual(1, count($hunks)); $hunk = reset($hunks); $this->assertEqual((bool)$expect_old, $hunk->getIsMissingOldNewline()); $this->assertEqual((bool)$expect_new, $hunk->getIsMissingNewNewline()); break; case 'basic-binary.udiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::FILE_BINARY, $change->getFileType()); break; case 'basic-multi-hunk.udiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $hunks = $change->getHunks(); $this->assertEqual(4, count($hunks)); $this->assertEqual('right', $change->getCurrentPath()); $this->assertEqual('left', $change->getOldPath()); break; case 'basic-multi-hunk-content.svndiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $hunks = $change->getHunks(); $this->assertEqual(2, count($hunks)); $there_is_a_literal_trailing_space_here = ' '; $corpus_0 = <<assertEqual( $corpus_0, $hunks[0]->getCorpus()); $this->assertEqual( $corpus_1, $hunks[1]->getCorpus()); break; case 'svn-ignore-whitespace-only.svndiff': $this->assertEqual(2, count($changes)); $hunks = reset($changes)->getHunks(); $this->assertEqual(0, count($hunks)); break; case 'svn-property-add.svndiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $hunks = reset($changes)->getHunks(); $this->assertEqual(1, count($hunks)); $this->assertEqual( array( 'duck' => 'quack', ), $change->getNewProperties() ); break; case 'svn-property-modify.svndiff': $this->assertEqual(2, count($changes)); $change = array_shift($changes); $this->assertEqual(0, count($change->getHunks())); $this->assertEqual( array( 'svn:ignore' => '*.phpz', ), $change->getOldProperties() ); $this->assertEqual( array( 'svn:ignore' => '*.php', ), $change->getNewProperties() ); $change = array_shift($changes); $this->assertEqual(0, count($change->getHunks())); $this->assertEqual( array( 'svn:special' => '*', ), $change->getOldProperties() ); $this->assertEqual( array( 'svn:special' => 'moo', ), $change->getNewProperties() ); break; case 'svn-property-delete.svndiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual(0, count($change->getHunks())); $this->assertEqual( $change->getOldProperties(), array( 'svn:special' => '*', )); $this->assertEqual( array( ), $change->getNewProperties()); break; case 'svn-property-merged.svndiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual(count($change->getHunks()), 0); $this->assertEqual( $change->getOldProperties(), array()); $this->assertEqual( $change->getNewProperties(), array()); break; case 'svn-property-merge.svndiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual(count($change->getHunks()), 0); $this->assertEqual( $change->getOldProperties(), array( )); $this->assertEqual( $change->getNewProperties(), array( 'svn:mergeinfo' => <<assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::FILE_BINARY, $change->getFileType()); $this->assertEqual(0, count($change->getHunks())); $this->assertEqual( array( 'svn:mime-type' => 'application/octet-stream', ), $change->getNewProperties() ); break; case 'svn-binary-diff.svndiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::FILE_BINARY, $change->getFileType()); $this->assertEqual(count($change->getHunks()), 0); break; case 'git-delete-file.gitdiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::TYPE_DELETE, $change->getType()); $this->assertEqual( 'scripts/intern/test/testfile2', $change->getCurrentPath()); $this->assertEqual(1, count($change->getHunks())); break; case 'git-binary-change.gitdiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::FILE_BINARY, $change->getFileType()); $this->assertEqual(0, count($change->getHunks())); break; case 'git-filemode-change.gitdiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual(1, count($change->getHunks())); $this->assertEqual( array( 'unix:filemode' => '100644', ), $change->getOldProperties() ); $this->assertEqual( array( 'unix:filemode' => '100755', ), $change->getNewProperties() ); break; case 'git-filemode-change-only.gitdiff': $this->assertEqual(count($changes), 2); $change = reset($changes); $this->assertEqual(count($change->getHunks()), 0); $this->assertEqual( array( 'unix:filemode' => '100644', ), $change->getOldProperties() ); $this->assertEqual( array( 'unix:filemode' => '100755', ), $change->getNewProperties() ); break; case 'svn-empty-file.svndiff': $this->assertEqual(2, count($changes)); $change = array_shift($changes); $this->assertEqual(0, count($change->getHunks())); break; case 'git-ignore-whitespace-only.gitdiff': $this->assertEqual(count($changes), 2); $change = array_shift($changes); $this->assertEqual(count($change->getHunks()), 0); $this->assertEqual( $change->getOldPath(), 'scripts/intern/test/testfile2'); $this->assertEqual( $change->getCurrentPath(), 'scripts/intern/test/testfile2'); $change = array_shift($changes); $this->assertEqual(count($change->getHunks()), 1); $this->assertEqual( $change->getOldPath(), 'scripts/intern/test/testfile3'); $this->assertEqual( $change->getCurrentPath(), 'scripts/intern/test/testfile3'); break; case 'git-move.gitdiff': case 'git-move-edit.gitdiff': case 'git-move-plus.gitdiff': $extra_changeset = (bool)strpos($file, '-plus'); $has_hunk = (bool)strpos($file, '-edit'); $this->assertEqual($extra_changeset ? 3 : 2, count($changes)); $change = array_shift($changes); $this->assertEqual($has_hunk ? 1 : 0, count($change->getHunks())); $this->assertEqual( $change->getType(), ArcanistDiffChangeType::TYPE_MOVE_HERE); $target = $change; $change = array_shift($changes); $this->assertEqual(0, count($change->getHunks())); $this->assertEqual( ArcanistDiffChangeType::TYPE_MOVE_AWAY, $change->getType() ); $this->assertEqual( $change->getCurrentPath(), $target->getOldPath()); $this->assertEqual( true, in_array($target->getCurrentPath(), $change->getAwayPaths())); break; case 'git-merge-header.gitdiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::TYPE_MESSAGE, $change->getType()); $this->assertEqual( '501f6d519703458471dbea6284ec5f49d1408598', $change->getCommitHash()); break; case 'git-new-file.gitdiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::TYPE_ADD, $change->getType()); break; case 'git-copy.gitdiff': $this->assertEqual(2, count($changes)); $change = array_shift($changes); $this->assertEqual(0, count($change->getHunks())); $this->assertEqual( ArcanistDiffChangeType::TYPE_COPY_HERE, $change->getType()); $this->assertEqual( 'flib/intern/widgets/ui/UIWidgetRSSBox.php', $change->getCurrentPath()); $change = array_shift($changes); $this->assertEqual(0, count($change->getHunks())); $this->assertEqual( ArcanistDiffChangeType::TYPE_COPY_AWAY, $change->getType()); $this->assertEqual( 'lib/display/intern/ui/widget/UIWidgetRSSBox.php', $change->getCurrentPath()); break; case 'git-copy-plus.gitdiff': $this->assertEqual(2, count($changes)); $change = array_shift($changes); $this->assertEqual(3, count($change->getHunks())); $this->assertEqual( ArcanistDiffChangeType::TYPE_COPY_HERE, $change->getType()); $this->assertEqual( 'flib/intern/widgets/ui/UIWidgetGraphConnect.php', $change->getCurrentPath()); $change = array_shift($changes); $this->assertEqual(0, count($change->getHunks())); $this->assertEqual( ArcanistDiffChangeType::TYPE_COPY_AWAY, $change->getType()); $this->assertEqual( 'lib/display/intern/ui/widget/UIWidgetLunchtime.php', $change->getCurrentPath()); break; case 'svn-property-multiline.svndiff': $this->assertEqual(1, count($changes)); $change = array_shift($changes); $this->assertEqual(0, count($change->getHunks())); $this->assertEqual( array( 'svn:ignore' => 'tags', ), $change->getOldProperties() ); $this->assertEqual( array( 'svn:ignore' => "tags\nasdf\nlol\nwhat", ), $change->getNewProperties() ); break; case 'git-empty-files.gitdiff': $this->assertEqual(2, count($changes)); while ($change = array_shift($changes)) { $this->assertEqual(0, count($change->getHunks())); } break; case 'git-mnemonicprefix.gitdiff': // Check parsing of diffs created with `diff.mnemonicprefix` // configuration option set to `true`. $this->assertEqual(1, count($changes)); $this->assertEqual(1, count(reset($changes)->getHunks())); break; case 'git-commit.gitdiff': case 'git-commit-logdecorate.gitdiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::TYPE_MESSAGE, $change->getType()); $this->assertEqual( '76e2f1339c298c748aa0b52030799ed202a6537b', $change->getCommitHash()); $this->assertEqual( <<. I tested most of these calls, but there were some that I didn't know how to reach, so if you are one of the owners of this code, please test your feature in my sandbox: www.ngao.devrs013.facebook.com @brosenthal, I removed some logic that was setting a disabled state on a UIActionButton, which is actually a no-op. Reviewed By: brosenthal Other Commenters: sparker, egiovanola Test Plan: www.ngao.devrs013.facebook.com Explicitly tested: * ads creation flow (add keyword) * ads manager (conversion tracking) * help center (create a discussion) * new user wizard (next step button) Revert: OK DiffCamp Revision: 94064 git-svn-id: svn+ssh://tubbs/svnroot/tfb/trunk/www@223593 2c7ba8d8 EOTEXT , $change->getMetadata('message') ); break; case 'git-binary.gitdiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::TYPE_CHANGE, $change->getType()); $this->assertEqual( ArcanistDiffChangeType::FILE_BINARY, $change->getFileType()); break; case 'git-odd-filename.gitdiff': $this->assertEqual(2, count($changes)); $change = reset($changes); $this->assertEqual( 'old/'."\342\210\206".'.jpg', $change->getOldPath()); $this->assertEqual( 'new/'."\342\210\206".'.jpg', $change->getCurrentPath()); break; case 'hg-binary-change.hgdiff': case 'hg-solo-binary-change.hgdiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::TYPE_ADD, $change->getType()); $this->assertEqual( ArcanistDiffChangeType::FILE_BINARY, $change->getFileType()); break; case 'hg-binary-delete.hgdiff': $this->assertEqual(1, count($changes)); $change = reset($changes); $this->assertEqual( ArcanistDiffChangeType::TYPE_DELETE, $change->getType()); $this->assertEqual( ArcanistDiffChangeType::FILE_BINARY, $change->getFileType()); break; case 'git-replace-symlink.gitdiff': $this->assertEqual(1, count($changes)); $change = array_shift($changes); $this->assertEqual( ArcanistDiffChangeType::TYPE_CHANGE, $change->getType()); break; case 'svn-1.7-property-added.svndiff': $this->assertEqual(1, count($changes)); $change = head($changes); $new_properties = $change->getNewProperties(); $this->assertEqual(2, count($new_properties)); $this->assertEqual('*', idx($new_properties, 'svn:executable')); $this->assertEqual('text/html', idx($new_properties, 'svn:mime-type')); break; default: throw new Exception("No test block for diff file {$diff_file}."); break; } } } diff --git a/src/parser/bundle/__tests__/data/disjoint-hunks.diff b/src/parser/__tests__/bundle/disjoint-hunks.diff similarity index 100% rename from src/parser/bundle/__tests__/data/disjoint-hunks.diff rename to src/parser/__tests__/bundle/disjoint-hunks.diff diff --git a/src/parser/bundle/__tests__/data/disjoint-hunks.new b/src/parser/__tests__/bundle/disjoint-hunks.new similarity index 100% rename from src/parser/bundle/__tests__/data/disjoint-hunks.new rename to src/parser/__tests__/bundle/disjoint-hunks.new diff --git a/src/parser/bundle/__tests__/data/disjoint-hunks.old b/src/parser/__tests__/bundle/disjoint-hunks.old similarity index 100% rename from src/parser/bundle/__tests__/data/disjoint-hunks.old rename to src/parser/__tests__/bundle/disjoint-hunks.old diff --git a/src/parser/bundle/__tests__/data/trailing-context.diff b/src/parser/__tests__/bundle/trailing-context.diff similarity index 100% rename from src/parser/bundle/__tests__/data/trailing-context.diff rename to src/parser/__tests__/bundle/trailing-context.diff diff --git a/src/parser/bundle/__tests__/data/trailing-context.new b/src/parser/__tests__/bundle/trailing-context.new similarity index 100% rename from src/parser/bundle/__tests__/data/trailing-context.new rename to src/parser/__tests__/bundle/trailing-context.new diff --git a/src/parser/bundle/__tests__/data/trailing-context.old b/src/parser/__tests__/bundle/trailing-context.old similarity index 100% rename from src/parser/bundle/__tests__/data/trailing-context.old rename to src/parser/__tests__/bundle/trailing-context.old diff --git a/src/parser/bundle/__tests__/data/trailing-newline.diff b/src/parser/__tests__/bundle/trailing-newline.diff similarity index 100% rename from src/parser/bundle/__tests__/data/trailing-newline.diff rename to src/parser/__tests__/bundle/trailing-newline.diff diff --git a/src/parser/bundle/__tests__/data/trailing-newline.new b/src/parser/__tests__/bundle/trailing-newline.new similarity index 100% rename from src/parser/bundle/__tests__/data/trailing-newline.new rename to src/parser/__tests__/bundle/trailing-newline.new diff --git a/src/parser/bundle/__tests__/data/trailing-newline.old b/src/parser/__tests__/bundle/trailing-newline.old similarity index 100% rename from src/parser/bundle/__tests__/data/trailing-newline.old rename to src/parser/__tests__/bundle/trailing-newline.old diff --git a/src/parser/diff/__tests__/data/basic-binary.udiff b/src/parser/__tests__/diff/basic-binary.udiff similarity index 100% rename from src/parser/diff/__tests__/data/basic-binary.udiff rename to src/parser/__tests__/diff/basic-binary.udiff diff --git a/src/parser/diff/__tests__/data/basic-missing-both-newlines-plus.udiff b/src/parser/__tests__/diff/basic-missing-both-newlines-plus.udiff similarity index 100% rename from src/parser/diff/__tests__/data/basic-missing-both-newlines-plus.udiff rename to src/parser/__tests__/diff/basic-missing-both-newlines-plus.udiff diff --git a/src/parser/diff/__tests__/data/basic-missing-both-newlines.udiff b/src/parser/__tests__/diff/basic-missing-both-newlines.udiff similarity index 100% rename from src/parser/diff/__tests__/data/basic-missing-both-newlines.udiff rename to src/parser/__tests__/diff/basic-missing-both-newlines.udiff diff --git a/src/parser/diff/__tests__/data/basic-missing-new-newline-plus.udiff b/src/parser/__tests__/diff/basic-missing-new-newline-plus.udiff similarity index 100% rename from src/parser/diff/__tests__/data/basic-missing-new-newline-plus.udiff rename to src/parser/__tests__/diff/basic-missing-new-newline-plus.udiff diff --git a/src/parser/diff/__tests__/data/basic-missing-new-newline.udiff b/src/parser/__tests__/diff/basic-missing-new-newline.udiff similarity index 100% rename from src/parser/diff/__tests__/data/basic-missing-new-newline.udiff rename to src/parser/__tests__/diff/basic-missing-new-newline.udiff diff --git a/src/parser/diff/__tests__/data/basic-missing-old-newline-plus.udiff b/src/parser/__tests__/diff/basic-missing-old-newline-plus.udiff similarity index 100% rename from src/parser/diff/__tests__/data/basic-missing-old-newline-plus.udiff rename to src/parser/__tests__/diff/basic-missing-old-newline-plus.udiff diff --git a/src/parser/diff/__tests__/data/basic-missing-old-newline.udiff b/src/parser/__tests__/diff/basic-missing-old-newline.udiff similarity index 100% rename from src/parser/diff/__tests__/data/basic-missing-old-newline.udiff rename to src/parser/__tests__/diff/basic-missing-old-newline.udiff diff --git a/src/parser/diff/__tests__/data/basic-multi-hunk-content.svndiff b/src/parser/__tests__/diff/basic-multi-hunk-content.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/basic-multi-hunk-content.svndiff rename to src/parser/__tests__/diff/basic-multi-hunk-content.svndiff diff --git a/src/parser/diff/__tests__/data/basic-multi-hunk.udiff b/src/parser/__tests__/diff/basic-multi-hunk.udiff similarity index 100% rename from src/parser/diff/__tests__/data/basic-multi-hunk.udiff rename to src/parser/__tests__/diff/basic-multi-hunk.udiff diff --git a/src/parser/diff/__tests__/data/colorized.hggitdiff b/src/parser/__tests__/diff/colorized.hggitdiff similarity index 100% rename from src/parser/diff/__tests__/data/colorized.hggitdiff rename to src/parser/__tests__/diff/colorized.hggitdiff diff --git a/src/parser/diff/__tests__/data/git-binary-change.gitdiff b/src/parser/__tests__/diff/git-binary-change.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-binary-change.gitdiff rename to src/parser/__tests__/diff/git-binary-change.gitdiff diff --git a/src/parser/diff/__tests__/data/git-binary.gitdiff b/src/parser/__tests__/diff/git-binary.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-binary.gitdiff rename to src/parser/__tests__/diff/git-binary.gitdiff diff --git a/src/parser/diff/__tests__/data/git-commit-logdecorate.gitdiff b/src/parser/__tests__/diff/git-commit-logdecorate.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-commit-logdecorate.gitdiff rename to src/parser/__tests__/diff/git-commit-logdecorate.gitdiff diff --git a/src/parser/diff/__tests__/data/git-commit.gitdiff b/src/parser/__tests__/diff/git-commit.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-commit.gitdiff rename to src/parser/__tests__/diff/git-commit.gitdiff diff --git a/src/parser/diff/__tests__/data/git-copy-plus.gitdiff b/src/parser/__tests__/diff/git-copy-plus.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-copy-plus.gitdiff rename to src/parser/__tests__/diff/git-copy-plus.gitdiff diff --git a/src/parser/diff/__tests__/data/git-copy.gitdiff b/src/parser/__tests__/diff/git-copy.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-copy.gitdiff rename to src/parser/__tests__/diff/git-copy.gitdiff diff --git a/src/parser/diff/__tests__/data/git-delete-file.gitdiff b/src/parser/__tests__/diff/git-delete-file.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-delete-file.gitdiff rename to src/parser/__tests__/diff/git-delete-file.gitdiff diff --git a/src/parser/diff/__tests__/data/git-empty-files.gitdiff b/src/parser/__tests__/diff/git-empty-files.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-empty-files.gitdiff rename to src/parser/__tests__/diff/git-empty-files.gitdiff diff --git a/src/parser/diff/__tests__/data/git-filemode-change-only.gitdiff b/src/parser/__tests__/diff/git-filemode-change-only.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-filemode-change-only.gitdiff rename to src/parser/__tests__/diff/git-filemode-change-only.gitdiff diff --git a/src/parser/diff/__tests__/data/git-filemode-change.gitdiff b/src/parser/__tests__/diff/git-filemode-change.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-filemode-change.gitdiff rename to src/parser/__tests__/diff/git-filemode-change.gitdiff diff --git a/src/parser/diff/__tests__/data/git-ignore-whitespace-only.gitdiff b/src/parser/__tests__/diff/git-ignore-whitespace-only.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-ignore-whitespace-only.gitdiff rename to src/parser/__tests__/diff/git-ignore-whitespace-only.gitdiff diff --git a/src/parser/diff/__tests__/data/git-merge-header.gitdiff b/src/parser/__tests__/diff/git-merge-header.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-merge-header.gitdiff rename to src/parser/__tests__/diff/git-merge-header.gitdiff diff --git a/src/parser/diff/__tests__/data/git-mnemonicprefix.gitdiff b/src/parser/__tests__/diff/git-mnemonicprefix.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-mnemonicprefix.gitdiff rename to src/parser/__tests__/diff/git-mnemonicprefix.gitdiff diff --git a/src/parser/diff/__tests__/data/git-move-edit.gitdiff b/src/parser/__tests__/diff/git-move-edit.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-move-edit.gitdiff rename to src/parser/__tests__/diff/git-move-edit.gitdiff diff --git a/src/parser/diff/__tests__/data/git-move-plus.gitdiff b/src/parser/__tests__/diff/git-move-plus.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-move-plus.gitdiff rename to src/parser/__tests__/diff/git-move-plus.gitdiff diff --git a/src/parser/diff/__tests__/data/git-move.gitdiff b/src/parser/__tests__/diff/git-move.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-move.gitdiff rename to src/parser/__tests__/diff/git-move.gitdiff diff --git a/src/parser/diff/__tests__/data/git-new-file.gitdiff b/src/parser/__tests__/diff/git-new-file.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-new-file.gitdiff rename to src/parser/__tests__/diff/git-new-file.gitdiff diff --git a/src/parser/diff/__tests__/data/git-odd-filename.gitdiff b/src/parser/__tests__/diff/git-odd-filename.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-odd-filename.gitdiff rename to src/parser/__tests__/diff/git-odd-filename.gitdiff diff --git a/src/parser/diff/__tests__/data/git-replace-symlink.gitdiff b/src/parser/__tests__/diff/git-replace-symlink.gitdiff similarity index 100% rename from src/parser/diff/__tests__/data/git-replace-symlink.gitdiff rename to src/parser/__tests__/diff/git-replace-symlink.gitdiff diff --git a/src/parser/diff/__tests__/data/hg-binary-change.hgdiff b/src/parser/__tests__/diff/hg-binary-change.hgdiff similarity index 100% rename from src/parser/diff/__tests__/data/hg-binary-change.hgdiff rename to src/parser/__tests__/diff/hg-binary-change.hgdiff diff --git a/src/parser/diff/__tests__/data/hg-binary-delete.hgdiff b/src/parser/__tests__/diff/hg-binary-delete.hgdiff similarity index 100% rename from src/parser/diff/__tests__/data/hg-binary-delete.hgdiff rename to src/parser/__tests__/diff/hg-binary-delete.hgdiff diff --git a/src/parser/diff/__tests__/data/hg-solo-binary-change.hgdiff b/src/parser/__tests__/diff/hg-solo-binary-change.hgdiff similarity index 100% rename from src/parser/diff/__tests__/data/hg-solo-binary-change.hgdiff rename to src/parser/__tests__/diff/hg-solo-binary-change.hgdiff diff --git a/src/parser/diff/__tests__/data/svn-1.7-property-added.svndiff b/src/parser/__tests__/diff/svn-1.7-property-added.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-1.7-property-added.svndiff rename to src/parser/__tests__/diff/svn-1.7-property-added.svndiff diff --git a/src/parser/diff/__tests__/data/svn-binary-add.svndiff b/src/parser/__tests__/diff/svn-binary-add.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-binary-add.svndiff rename to src/parser/__tests__/diff/svn-binary-add.svndiff diff --git a/src/parser/diff/__tests__/data/svn-binary-diff.svndiff b/src/parser/__tests__/diff/svn-binary-diff.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-binary-diff.svndiff rename to src/parser/__tests__/diff/svn-binary-diff.svndiff diff --git a/src/parser/diff/__tests__/data/svn-empty-file.svndiff b/src/parser/__tests__/diff/svn-empty-file.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-empty-file.svndiff rename to src/parser/__tests__/diff/svn-empty-file.svndiff diff --git a/src/parser/diff/__tests__/data/svn-ignore-whitespace-only.svndiff b/src/parser/__tests__/diff/svn-ignore-whitespace-only.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-ignore-whitespace-only.svndiff rename to src/parser/__tests__/diff/svn-ignore-whitespace-only.svndiff diff --git a/src/parser/diff/__tests__/data/svn-property-add.svndiff b/src/parser/__tests__/diff/svn-property-add.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-property-add.svndiff rename to src/parser/__tests__/diff/svn-property-add.svndiff diff --git a/src/parser/diff/__tests__/data/svn-property-delete.svndiff b/src/parser/__tests__/diff/svn-property-delete.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-property-delete.svndiff rename to src/parser/__tests__/diff/svn-property-delete.svndiff diff --git a/src/parser/diff/__tests__/data/svn-property-merge.svndiff b/src/parser/__tests__/diff/svn-property-merge.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-property-merge.svndiff rename to src/parser/__tests__/diff/svn-property-merge.svndiff diff --git a/src/parser/diff/__tests__/data/svn-property-merged.svndiff b/src/parser/__tests__/diff/svn-property-merged.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-property-merged.svndiff rename to src/parser/__tests__/diff/svn-property-merged.svndiff diff --git a/src/parser/diff/__tests__/data/svn-property-modify.svndiff b/src/parser/__tests__/diff/svn-property-modify.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-property-modify.svndiff rename to src/parser/__tests__/diff/svn-property-modify.svndiff diff --git a/src/parser/diff/__tests__/data/svn-property-multiline.svndiff b/src/parser/__tests__/diff/svn-property-multiline.svndiff similarity index 100% rename from src/parser/diff/__tests__/data/svn-property-multiline.svndiff rename to src/parser/__tests__/diff/svn-property-multiline.svndiff diff --git a/src/parser/diff/change/ArcanistDiffChange.php b/src/parser/diff/ArcanistDiffChange.php similarity index 100% rename from src/parser/diff/change/ArcanistDiffChange.php rename to src/parser/diff/ArcanistDiffChange.php diff --git a/src/parser/diff/changetype/ArcanistDiffChangeType.php b/src/parser/diff/ArcanistDiffChangeType.php similarity index 100% rename from src/parser/diff/changetype/ArcanistDiffChangeType.php rename to src/parser/diff/ArcanistDiffChangeType.php diff --git a/src/parser/diff/hunk/ArcanistDiffHunk.php b/src/parser/diff/ArcanistDiffHunk.php similarity index 100% rename from src/parser/diff/hunk/ArcanistDiffHunk.php rename to src/parser/diff/ArcanistDiffHunk.php diff --git a/src/repository/api/git/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php similarity index 100% rename from src/repository/api/git/ArcanistGitAPI.php rename to src/repository/api/ArcanistGitAPI.php diff --git a/src/repository/api/mercurial/ArcanistMercurialAPI.php b/src/repository/api/ArcanistMercurialAPI.php similarity index 100% rename from src/repository/api/mercurial/ArcanistMercurialAPI.php rename to src/repository/api/ArcanistMercurialAPI.php diff --git a/src/repository/api/base/ArcanistRepositoryAPI.php b/src/repository/api/ArcanistRepositoryAPI.php similarity index 100% rename from src/repository/api/base/ArcanistRepositoryAPI.php rename to src/repository/api/ArcanistRepositoryAPI.php diff --git a/src/repository/api/subversion/ArcanistSubversionAPI.php b/src/repository/api/ArcanistSubversionAPI.php similarity index 100% rename from src/repository/api/subversion/ArcanistSubversionAPI.php rename to src/repository/api/ArcanistSubversionAPI.php diff --git a/src/repository/hookapi/base/ArcanistHookAPI.php b/src/repository/hookapi/ArcanistHookAPI.php similarity index 100% rename from src/repository/hookapi/base/ArcanistHookAPI.php rename to src/repository/hookapi/ArcanistHookAPI.php diff --git a/src/repository/hookapi/subversion/ArcanistSubversionHookAPI.php b/src/repository/hookapi/ArcanistSubversionHookAPI.php similarity index 100% rename from src/repository/hookapi/subversion/ArcanistSubversionHookAPI.php rename to src/repository/hookapi/ArcanistSubversionHookAPI.php diff --git a/src/repository/parser/mercurial/ArcanistMercurialParser.php b/src/repository/parser/ArcanistMercurialParser.php similarity index 100% rename from src/repository/parser/mercurial/ArcanistMercurialParser.php rename to src/repository/parser/ArcanistMercurialParser.php diff --git a/src/repository/parser/mercurial/__tests__/ArcanistMercurialParserTestCase.php b/src/repository/parser/__tests__/ArcanistMercurialParserTestCase.php similarity index 98% rename from src/repository/parser/mercurial/__tests__/ArcanistMercurialParserTestCase.php rename to src/repository/parser/__tests__/ArcanistMercurialParserTestCase.php index 46032a05..6b2615a9 100644 --- a/src/repository/parser/mercurial/__tests__/ArcanistMercurialParserTestCase.php +++ b/src/repository/parser/__tests__/ArcanistMercurialParserTestCase.php @@ -1,100 +1,100 @@ parseData( basename($file), Filesystem::readFile($root.'/'.$file)); } } private function parseData($name, $data) { switch ($name) { case 'branches-basic.txt': $output = ArcanistMercurialParser::parseMercurialBranches($data); $this->assertEqual( array('default', 'stable'), array_keys($output)); $this->assertEqual( array('a21ccf4412d5', 'ec222a29bdf0'), array_values(ipull($output, 'rev'))); break; case 'branches-with-spaces.txt': $output = ArcanistMercurialParser::parseMercurialBranches($data); $this->assertEqual( array( 'm m m m m 2:ffffffffffff (inactive)', 'xxx yyy zzz', 'default', "'", ), array_keys($output)); $this->assertEqual( array('0b9d8290c4e0', '78963faacfc7', '5db03c5500c6', 'ffffffffffff'), array_values(ipull($output, 'rev'))); break; case 'log-basic.txt': $output = ArcanistMercurialParser::parseMercurialLog($data); $this->assertEqual( 3, count($output)); $this->assertEqual( array('a21ccf4412d5', 'a051f8a6a7cc', 'b1f49efeab65'), array_values(ipull($output, 'rev'))); break; case 'log-empty.txt': // Empty logs (e.g., "hg parents" for a root revision) should parse // correctly. $output = ArcanistMercurialParser::parseMercurialLog($data); $this->assertEqual( array(), $output); break; case 'status-basic.txt': $output = ArcanistMercurialParser::parseMercurialStatus($data); $this->assertEqual( 4, count($output)); $this->assertEqual( array('changed', 'added', 'removed', 'untracked'), array_keys($output)); break; case 'status-moves.txt': $output = ArcanistMercurialParser::parseMercurialStatusDetails($data); $this->assertEqual( 'move_source', $output['moved_file']['from']); $this->assertEqual( null, $output['changed_file']['from']); $this->assertEqual( 'copy_source', $output['copied_file']['from']); $this->assertEqual( null, idx($output, 'copy_source')); break; default: throw new Exception("No test information for test data '{$name}'!"); } } } diff --git a/src/repository/parser/mercurial/__tests__/data/branches-basic.txt b/src/repository/parser/__tests__/mercurial/branches-basic.txt similarity index 100% rename from src/repository/parser/mercurial/__tests__/data/branches-basic.txt rename to src/repository/parser/__tests__/mercurial/branches-basic.txt diff --git a/src/repository/parser/mercurial/__tests__/data/branches-with-spaces.txt b/src/repository/parser/__tests__/mercurial/branches-with-spaces.txt similarity index 100% rename from src/repository/parser/mercurial/__tests__/data/branches-with-spaces.txt rename to src/repository/parser/__tests__/mercurial/branches-with-spaces.txt diff --git a/src/repository/parser/mercurial/__tests__/data/log-basic.txt b/src/repository/parser/__tests__/mercurial/log-basic.txt similarity index 100% rename from src/repository/parser/mercurial/__tests__/data/log-basic.txt rename to src/repository/parser/__tests__/mercurial/log-basic.txt diff --git a/src/repository/parser/mercurial/__tests__/data/log-empty.txt b/src/repository/parser/__tests__/mercurial/log-empty.txt similarity index 100% rename from src/repository/parser/mercurial/__tests__/data/log-empty.txt rename to src/repository/parser/__tests__/mercurial/log-empty.txt diff --git a/src/repository/parser/mercurial/__tests__/data/status-basic.txt b/src/repository/parser/__tests__/mercurial/status-basic.txt similarity index 100% rename from src/repository/parser/mercurial/__tests__/data/status-basic.txt rename to src/repository/parser/__tests__/mercurial/status-basic.txt diff --git a/src/repository/parser/mercurial/__tests__/data/status-moves.txt b/src/repository/parser/__tests__/mercurial/status-moves.txt similarity index 100% rename from src/repository/parser/mercurial/__tests__/data/status-moves.txt rename to src/repository/parser/__tests__/mercurial/status-moves.txt diff --git a/src/unit/result/ArcanistUnitTestResult.php b/src/unit/ArcanistUnitTestResult.php similarity index 100% rename from src/unit/result/ArcanistUnitTestResult.php rename to src/unit/ArcanistUnitTestResult.php diff --git a/src/unit/engine/base/ArcanistBaseUnitTestEngine.php b/src/unit/engine/ArcanistBaseUnitTestEngine.php similarity index 100% rename from src/unit/engine/base/ArcanistBaseUnitTestEngine.php rename to src/unit/engine/ArcanistBaseUnitTestEngine.php diff --git a/src/unit/engine/nose/NoseTestEngine.php b/src/unit/engine/NoseTestEngine.php similarity index 100% rename from src/unit/engine/nose/NoseTestEngine.php rename to src/unit/engine/NoseTestEngine.php diff --git a/src/unit/engine/phpunit/PhpunitTestEngine.php b/src/unit/engine/PhpunitTestEngine.php similarity index 100% rename from src/unit/engine/phpunit/PhpunitTestEngine.php rename to src/unit/engine/PhpunitTestEngine.php diff --git a/src/unit/engine/phutil/PhutilUnitTestEngine.php b/src/unit/engine/PhutilUnitTestEngine.php similarity index 100% rename from src/unit/engine/phutil/PhutilUnitTestEngine.php rename to src/unit/engine/PhutilUnitTestEngine.php diff --git a/src/unit/engine/phutil/__tests__/PhutilUnitTestEngineTestCase.php b/src/unit/engine/__tests__/PhutilUnitTestEngineTestCase.php similarity index 100% rename from src/unit/engine/phutil/__tests__/PhutilUnitTestEngineTestCase.php rename to src/unit/engine/__tests__/PhutilUnitTestEngineTestCase.php diff --git a/src/unit/engine/phutil/testcase/ArcanistPhutilTestCase.php b/src/unit/engine/phutil/ArcanistPhutilTestCase.php similarity index 100% rename from src/unit/engine/phutil/testcase/ArcanistPhutilTestCase.php rename to src/unit/engine/phutil/ArcanistPhutilTestCase.php diff --git a/src/unit/engine/phutil/testcase/exception/ArcanistPhutilTestSkippedException.php b/src/unit/engine/phutil/testcase/ArcanistPhutilTestSkippedException.php similarity index 100% rename from src/unit/engine/phutil/testcase/exception/ArcanistPhutilTestSkippedException.php rename to src/unit/engine/phutil/testcase/ArcanistPhutilTestSkippedException.php diff --git a/src/unit/engine/phutil/testcase/exception/ArcanistPhutilTestTerminatedException.php b/src/unit/engine/phutil/testcase/ArcanistPhutilTestTerminatedException.php similarity index 100% rename from src/unit/engine/phutil/testcase/exception/ArcanistPhutilTestTerminatedException.php rename to src/unit/engine/phutil/testcase/ArcanistPhutilTestTerminatedException.php diff --git a/src/workflow/alias/ArcanistAliasWorkflow.php b/src/workflow/ArcanistAliasWorkflow.php similarity index 100% rename from src/workflow/alias/ArcanistAliasWorkflow.php rename to src/workflow/ArcanistAliasWorkflow.php diff --git a/src/workflow/amend/ArcanistAmendWorkflow.php b/src/workflow/ArcanistAmendWorkflow.php similarity index 100% rename from src/workflow/amend/ArcanistAmendWorkflow.php rename to src/workflow/ArcanistAmendWorkflow.php diff --git a/src/workflow/base/ArcanistBaseWorkflow.php b/src/workflow/ArcanistBaseWorkflow.php similarity index 100% rename from src/workflow/base/ArcanistBaseWorkflow.php rename to src/workflow/ArcanistBaseWorkflow.php diff --git a/src/workflow/branch/ArcanistBranchWorkflow.php b/src/workflow/ArcanistBranchWorkflow.php similarity index 100% rename from src/workflow/branch/ArcanistBranchWorkflow.php rename to src/workflow/ArcanistBranchWorkflow.php diff --git a/src/workflow/call-conduit/ArcanistCallConduitWorkflow.php b/src/workflow/ArcanistCallConduitWorkflow.php similarity index 100% rename from src/workflow/call-conduit/ArcanistCallConduitWorkflow.php rename to src/workflow/ArcanistCallConduitWorkflow.php diff --git a/src/workflow/close-revision/ArcanistCloseRevisionWorkflow.php b/src/workflow/ArcanistCloseRevisionWorkflow.php similarity index 100% rename from src/workflow/close-revision/ArcanistCloseRevisionWorkflow.php rename to src/workflow/ArcanistCloseRevisionWorkflow.php diff --git a/src/workflow/close/ArcanistCloseWorkflow.php b/src/workflow/ArcanistCloseWorkflow.php similarity index 100% rename from src/workflow/close/ArcanistCloseWorkflow.php rename to src/workflow/ArcanistCloseWorkflow.php diff --git a/src/workflow/commit/ArcanistCommitWorkflow.php b/src/workflow/ArcanistCommitWorkflow.php similarity index 100% rename from src/workflow/commit/ArcanistCommitWorkflow.php rename to src/workflow/ArcanistCommitWorkflow.php diff --git a/src/workflow/cover/ArcanistCoverWorkflow.php b/src/workflow/ArcanistCoverWorkflow.php similarity index 100% rename from src/workflow/cover/ArcanistCoverWorkflow.php rename to src/workflow/ArcanistCoverWorkflow.php diff --git a/src/workflow/diff/ArcanistDiffWorkflow.php b/src/workflow/ArcanistDiffWorkflow.php similarity index 100% rename from src/workflow/diff/ArcanistDiffWorkflow.php rename to src/workflow/ArcanistDiffWorkflow.php diff --git a/src/workflow/download/ArcanistDownloadWorkflow.php b/src/workflow/ArcanistDownloadWorkflow.php similarity index 100% rename from src/workflow/download/ArcanistDownloadWorkflow.php rename to src/workflow/ArcanistDownloadWorkflow.php diff --git a/src/workflow/export/ArcanistExportWorkflow.php b/src/workflow/ArcanistExportWorkflow.php similarity index 100% rename from src/workflow/export/ArcanistExportWorkflow.php rename to src/workflow/ArcanistExportWorkflow.php diff --git a/src/workflow/get-config/ArcanistGetConfigWorkflow.php b/src/workflow/ArcanistGetConfigWorkflow.php similarity index 100% rename from src/workflow/get-config/ArcanistGetConfigWorkflow.php rename to src/workflow/ArcanistGetConfigWorkflow.php diff --git a/src/workflow/git-hook-pre-receive/ArcanistGitHookPreReceiveWorkflow.php b/src/workflow/ArcanistGitHookPreReceiveWorkflow.php similarity index 100% rename from src/workflow/git-hook-pre-receive/ArcanistGitHookPreReceiveWorkflow.php rename to src/workflow/ArcanistGitHookPreReceiveWorkflow.php diff --git a/src/workflow/help/ArcanistHelpWorkflow.php b/src/workflow/ArcanistHelpWorkflow.php similarity index 100% rename from src/workflow/help/ArcanistHelpWorkflow.php rename to src/workflow/ArcanistHelpWorkflow.php diff --git a/src/workflow/install-certificate/ArcanistInstallCertificateWorkflow.php b/src/workflow/ArcanistInstallCertificateWorkflow.php similarity index 100% rename from src/workflow/install-certificate/ArcanistInstallCertificateWorkflow.php rename to src/workflow/ArcanistInstallCertificateWorkflow.php diff --git a/src/workflow/land/ArcanistLandWorkflow.php b/src/workflow/ArcanistLandWorkflow.php similarity index 100% rename from src/workflow/land/ArcanistLandWorkflow.php rename to src/workflow/ArcanistLandWorkflow.php diff --git a/src/workflow/liberate/ArcanistLiberateWorkflow.php b/src/workflow/ArcanistLiberateWorkflow.php similarity index 100% rename from src/workflow/liberate/ArcanistLiberateWorkflow.php rename to src/workflow/ArcanistLiberateWorkflow.php diff --git a/src/workflow/lint/ArcanistLintWorkflow.php b/src/workflow/ArcanistLintWorkflow.php similarity index 100% rename from src/workflow/lint/ArcanistLintWorkflow.php rename to src/workflow/ArcanistLintWorkflow.php diff --git a/src/workflow/list/ArcanistListWorkflow.php b/src/workflow/ArcanistListWorkflow.php similarity index 100% rename from src/workflow/list/ArcanistListWorkflow.php rename to src/workflow/ArcanistListWorkflow.php diff --git a/src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php b/src/workflow/ArcanistMarkCommittedWorkflow.php similarity index 100% rename from src/workflow/mark-committed/ArcanistMarkCommittedWorkflow.php rename to src/workflow/ArcanistMarkCommittedWorkflow.php diff --git a/src/workflow/paste/ArcanistPasteWorkflow.php b/src/workflow/ArcanistPasteWorkflow.php similarity index 100% rename from src/workflow/paste/ArcanistPasteWorkflow.php rename to src/workflow/ArcanistPasteWorkflow.php diff --git a/src/workflow/patch/ArcanistPatchWorkflow.php b/src/workflow/ArcanistPatchWorkflow.php similarity index 100% rename from src/workflow/patch/ArcanistPatchWorkflow.php rename to src/workflow/ArcanistPatchWorkflow.php diff --git a/src/workflow/set-config/ArcanistSetConfigWorkflow.php b/src/workflow/ArcanistSetConfigWorkflow.php similarity index 100% rename from src/workflow/set-config/ArcanistSetConfigWorkflow.php rename to src/workflow/ArcanistSetConfigWorkflow.php diff --git a/src/workflow/shell-complete/ArcanistShellCompleteWorkflow.php b/src/workflow/ArcanistShellCompleteWorkflow.php similarity index 100% rename from src/workflow/shell-complete/ArcanistShellCompleteWorkflow.php rename to src/workflow/ArcanistShellCompleteWorkflow.php diff --git a/src/workflow/svn-hook-pre-commit/ArcanistSvnHookPreCommitWorkflow.php b/src/workflow/ArcanistSvnHookPreCommitWorkflow.php similarity index 100% rename from src/workflow/svn-hook-pre-commit/ArcanistSvnHookPreCommitWorkflow.php rename to src/workflow/ArcanistSvnHookPreCommitWorkflow.php diff --git a/src/workflow/tasks/ArcanistTasksWorkflow.php b/src/workflow/ArcanistTasksWorkflow.php similarity index 100% rename from src/workflow/tasks/ArcanistTasksWorkflow.php rename to src/workflow/ArcanistTasksWorkflow.php diff --git a/src/workflow/unit/ArcanistUnitWorkflow.php b/src/workflow/ArcanistUnitWorkflow.php similarity index 100% rename from src/workflow/unit/ArcanistUnitWorkflow.php rename to src/workflow/ArcanistUnitWorkflow.php diff --git a/src/workflow/upgrade/ArcanistUpgradeWorkflow.php b/src/workflow/ArcanistUpgradeWorkflow.php similarity index 100% rename from src/workflow/upgrade/ArcanistUpgradeWorkflow.php rename to src/workflow/ArcanistUpgradeWorkflow.php diff --git a/src/workflow/upload/ArcanistUploadWorkflow.php b/src/workflow/ArcanistUploadWorkflow.php similarity index 100% rename from src/workflow/upload/ArcanistUploadWorkflow.php rename to src/workflow/ArcanistUploadWorkflow.php diff --git a/src/workflow/which/ArcanistWhichWorkflow.php b/src/workflow/ArcanistWhichWorkflow.php similarity index 100% rename from src/workflow/which/ArcanistWhichWorkflow.php rename to src/workflow/ArcanistWhichWorkflow.php diff --git a/src/workflow/exception/notsupported/ArcanistCapabilityNotSupportedException.php b/src/workflow/exception/ArcanistCapabilityNotSupportedException.php similarity index 100% rename from src/workflow/exception/notsupported/ArcanistCapabilityNotSupportedException.php rename to src/workflow/exception/ArcanistCapabilityNotSupportedException.php