1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-25 16:22:42 +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:
vrana 2012-05-30 15:47:16 -07:00
parent 94074cbc8c
commit f288ee0e21
7 changed files with 7 additions and 32 deletions

View file

@ -21,17 +21,6 @@ sanity_check_environment();
require_once dirname(__FILE__).'/__init_script__.php'; 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); ini_set('memory_limit', -1);
$original_argv = $argv; $original_argv = $argv;
@ -154,7 +143,6 @@ try {
$config = $working_copy->getConfig('arcanist_configuration'); $config = $working_copy->getConfig('arcanist_configuration');
if ($config) { if ($config) {
PhutilSymbolLoader::loadClass($config);
$config = new $config(); $config = new $config();
} else { } else {
$config = new ArcanistConfiguration(); $config = new ArcanistConfiguration();

View file

@ -61,14 +61,6 @@ if ($argc != 2) {
phutil_require_module('phutil', 'filesystem'); phutil_require_module('phutil', 'filesystem');
$dir = Filesystem::resolvePath($argv[1]); $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(); $data = array();
$futures = array(); $futures = array();

View file

@ -2,7 +2,7 @@
<?php <?php
/* /*
* Copyright 2011 Facebook, Inc. * Copyright 2012 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -35,10 +35,6 @@ if ($argc != 2) {
exit(1); exit(1);
} }
phutil_require_module('phutil', 'filesystem');
phutil_require_module('phutil', 'filesystem/filefinder');
phutil_require_module('phutil', 'future/exec');
$root = Filesystem::resolvePath($argv[1]); $root = Filesystem::resolvePath($argv[1]);
if (!@file_exists($root.'/__phutil_library_init__.php')) { if (!@file_exists($root.'/__phutil_library_init__.php')) {

View file

@ -154,7 +154,6 @@ final class PhutilUnitTestEngine extends ArcanistBaseUnitTestEngine {
$results = array(); $results = array();
foreach ($run_tests as $test_class) { foreach ($run_tests as $test_class) {
PhutilSymbolLoader::loadClass($test_class);
$test_case = newv($test_class, array()); $test_case = newv($test_class, array());
$test_case->setEnableCoverage($enable_coverage); $test_case->setEnableCoverage($enable_coverage);
$test_case->setProjectRoot($this->getWorkingCopy()->getProjectRoot()); $test_case->setProjectRoot($this->getWorkingCopy()->getProjectRoot());

View file

@ -164,8 +164,9 @@ EOTEXT
$paths = $this->selectPathsForWorkflow($paths, $rev); $paths = $this->selectPathsForWorkflow($paths, $rev);
PhutilSymbolLoader::loadClass($engine); // is_subclass_of() doesn't autoload under HPHP.
if (!is_subclass_of($engine, 'ArcanistLintEngine')) { if (!class_exists($engine) ||
!is_subclass_of($engine, 'ArcanistLintEngine')) {
throw new ArcanistUsageException( throw new ArcanistUsageException(
"Configured lint engine '{$engine}' is not a subclass of ". "Configured lint engine '{$engine}' is not a subclass of ".
"'ArcanistLintEngine'."); "'ArcanistLintEngine'.");

View file

@ -198,8 +198,6 @@ EOTEXT
return 0; return 0;
} }
PhutilSymbolLoader::loadClass($lint_engine);
$engine = newv($lint_engine, array()); $engine = newv($lint_engine, array());
$engine->setWorkingCopy($working_copy); $engine->setWorkingCopy($working_copy);
$engine->setMinimumSeverity(ArcanistLintSeverity::SEVERITY_ERROR); $engine->setMinimumSeverity(ArcanistLintSeverity::SEVERITY_ERROR);

View file

@ -116,8 +116,9 @@ EOTEXT
$paths = $this->selectPathsForWorkflow($paths, $rev); $paths = $this->selectPathsForWorkflow($paths, $rev);
PhutilSymbolLoader::loadClass($engine_class); // is_subclass_of() doesn't autoload under HPHP.
if (!is_subclass_of($engine_class, 'ArcanistBaseUnitTestEngine')) { if (!class_exists($engine_class) ||
!is_subclass_of($engine_class, 'ArcanistBaseUnitTestEngine')) {
throw new ArcanistUsageException( throw new ArcanistUsageException(
"Configured unit test engine '{$engine_class}' is not a subclass of ". "Configured unit test engine '{$engine_class}' is not a subclass of ".
"'ArcanistBaseUnitTestEngine'."); "'ArcanistBaseUnitTestEngine'.");