mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-21 22:32:41 +01:00
Depend on autoloading
Test Plan: arc lint Reviewers: epriestley Reviewed By: epriestley CC: aran, Koolvin Differential Revision: https://secure.phabricator.com/D2609
This commit is contained in:
parent
94074cbc8c
commit
f288ee0e21
7 changed files with 7 additions and 32 deletions
|
@ -21,17 +21,6 @@ sanity_check_environment();
|
|||
|
||||
require_once dirname(__FILE__).'/__init_script__.php';
|
||||
|
||||
phutil_require_module('phutil', 'conduit/client');
|
||||
phutil_require_module('phutil', 'console');
|
||||
phutil_require_module('phutil', 'future/exec');
|
||||
phutil_require_module('phutil', 'filesystem');
|
||||
phutil_require_module('phutil', 'symbols');
|
||||
|
||||
phutil_require_module('arcanist', 'exception/usage');
|
||||
phutil_require_module('arcanist', 'configuration');
|
||||
phutil_require_module('arcanist', 'workingcopyidentity');
|
||||
phutil_require_module('arcanist', 'repository/api/base');
|
||||
|
||||
ini_set('memory_limit', -1);
|
||||
|
||||
$original_argv = $argv;
|
||||
|
@ -154,7 +143,6 @@ try {
|
|||
|
||||
$config = $working_copy->getConfig('arcanist_configuration');
|
||||
if ($config) {
|
||||
PhutilSymbolLoader::loadClass($config);
|
||||
$config = new $config();
|
||||
} else {
|
||||
$config = new ArcanistConfiguration();
|
||||
|
|
|
@ -61,14 +61,6 @@ if ($argc != 2) {
|
|||
phutil_require_module('phutil', 'filesystem');
|
||||
$dir = Filesystem::resolvePath($argv[1]);
|
||||
|
||||
phutil_require_module('phutil', 'parser/docblock');
|
||||
phutil_require_module('phutil', 'parser/xhpast/bin');
|
||||
phutil_require_module('phutil', 'parser/xhpast/api/tree');
|
||||
|
||||
phutil_require_module('arcanist', 'lint/linter/phutilmodule');
|
||||
phutil_require_module('arcanist', 'lint/message');
|
||||
phutil_require_module('arcanist', 'parser/phutilmodule');
|
||||
|
||||
|
||||
$data = array();
|
||||
$futures = array();
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Copyright 2011 Facebook, Inc.
|
||||
* Copyright 2012 Facebook, Inc.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -35,10 +35,6 @@ if ($argc != 2) {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
phutil_require_module('phutil', 'filesystem');
|
||||
phutil_require_module('phutil', 'filesystem/filefinder');
|
||||
phutil_require_module('phutil', 'future/exec');
|
||||
|
||||
$root = Filesystem::resolvePath($argv[1]);
|
||||
|
||||
if (!@file_exists($root.'/__phutil_library_init__.php')) {
|
||||
|
|
|
@ -154,7 +154,6 @@ final class PhutilUnitTestEngine extends ArcanistBaseUnitTestEngine {
|
|||
|
||||
$results = array();
|
||||
foreach ($run_tests as $test_class) {
|
||||
PhutilSymbolLoader::loadClass($test_class);
|
||||
$test_case = newv($test_class, array());
|
||||
$test_case->setEnableCoverage($enable_coverage);
|
||||
$test_case->setProjectRoot($this->getWorkingCopy()->getProjectRoot());
|
||||
|
|
|
@ -164,8 +164,9 @@ EOTEXT
|
|||
|
||||
$paths = $this->selectPathsForWorkflow($paths, $rev);
|
||||
|
||||
PhutilSymbolLoader::loadClass($engine);
|
||||
if (!is_subclass_of($engine, 'ArcanistLintEngine')) {
|
||||
// is_subclass_of() doesn't autoload under HPHP.
|
||||
if (!class_exists($engine) ||
|
||||
!is_subclass_of($engine, 'ArcanistLintEngine')) {
|
||||
throw new ArcanistUsageException(
|
||||
"Configured lint engine '{$engine}' is not a subclass of ".
|
||||
"'ArcanistLintEngine'.");
|
||||
|
|
|
@ -198,8 +198,6 @@ EOTEXT
|
|||
return 0;
|
||||
}
|
||||
|
||||
PhutilSymbolLoader::loadClass($lint_engine);
|
||||
|
||||
$engine = newv($lint_engine, array());
|
||||
$engine->setWorkingCopy($working_copy);
|
||||
$engine->setMinimumSeverity(ArcanistLintSeverity::SEVERITY_ERROR);
|
||||
|
|
|
@ -116,8 +116,9 @@ EOTEXT
|
|||
|
||||
$paths = $this->selectPathsForWorkflow($paths, $rev);
|
||||
|
||||
PhutilSymbolLoader::loadClass($engine_class);
|
||||
if (!is_subclass_of($engine_class, 'ArcanistBaseUnitTestEngine')) {
|
||||
// is_subclass_of() doesn't autoload under HPHP.
|
||||
if (!class_exists($engine_class) ||
|
||||
!is_subclass_of($engine_class, 'ArcanistBaseUnitTestEngine')) {
|
||||
throw new ArcanistUsageException(
|
||||
"Configured unit test engine '{$engine_class}' is not a subclass of ".
|
||||
"'ArcanistBaseUnitTestEngine'.");
|
||||
|
|
Loading…
Reference in a new issue