From f288ee0e2192450f29f724889fa0f4b5fba36027 Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Wed, 30 May 2012 15:47:16 -0700
Subject: [PATCH] Depend on autoloading

Test Plan:
  arc lint

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Koolvin

Differential Revision: https://secure.phabricator.com/D2609
---
 scripts/arcanist.php                                 | 12 ------------
 scripts/phutil_analyzer.php                          |  8 --------
 scripts/phutil_mapper.php                            |  6 +-----
 src/unit/engine/phutil/PhutilUnitTestEngine.php      |  1 -
 src/workflow/lint/ArcanistLintWorkflow.php           |  5 +++--
 .../ArcanistSvnHookPreCommitWorkflow.php             |  2 --
 src/workflow/unit/ArcanistUnitWorkflow.php           |  5 +++--
 7 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/scripts/arcanist.php b/scripts/arcanist.php
index 120793df..b6fdcd27 100755
--- a/scripts/arcanist.php
+++ b/scripts/arcanist.php
@@ -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();
diff --git a/scripts/phutil_analyzer.php b/scripts/phutil_analyzer.php
index e091d09a..8b800680 100755
--- a/scripts/phutil_analyzer.php
+++ b/scripts/phutil_analyzer.php
@@ -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();
diff --git a/scripts/phutil_mapper.php b/scripts/phutil_mapper.php
index 7ad38d3f..b0da9660 100755
--- a/scripts/phutil_mapper.php
+++ b/scripts/phutil_mapper.php
@@ -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')) {
diff --git a/src/unit/engine/phutil/PhutilUnitTestEngine.php b/src/unit/engine/phutil/PhutilUnitTestEngine.php
index 960745d2..a94a8973 100644
--- a/src/unit/engine/phutil/PhutilUnitTestEngine.php
+++ b/src/unit/engine/phutil/PhutilUnitTestEngine.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());
diff --git a/src/workflow/lint/ArcanistLintWorkflow.php b/src/workflow/lint/ArcanistLintWorkflow.php
index 9d50e356..0f6c7065 100644
--- a/src/workflow/lint/ArcanistLintWorkflow.php
+++ b/src/workflow/lint/ArcanistLintWorkflow.php
@@ -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'.");
diff --git a/src/workflow/svn-hook-pre-commit/ArcanistSvnHookPreCommitWorkflow.php b/src/workflow/svn-hook-pre-commit/ArcanistSvnHookPreCommitWorkflow.php
index 6ca1fbd3..d8e4fe49 100644
--- a/src/workflow/svn-hook-pre-commit/ArcanistSvnHookPreCommitWorkflow.php
+++ b/src/workflow/svn-hook-pre-commit/ArcanistSvnHookPreCommitWorkflow.php
@@ -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);
diff --git a/src/workflow/unit/ArcanistUnitWorkflow.php b/src/workflow/unit/ArcanistUnitWorkflow.php
index fee18583..02c873fe 100644
--- a/src/workflow/unit/ArcanistUnitWorkflow.php
+++ b/src/workflow/unit/ArcanistUnitWorkflow.php
@@ -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'.");