Remove DaemonUtils, update autoloader locator

googleapis · Mar 5, 2018 · d72266f · d72266f
1 parent f980c8d
commit d72266f
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 56 deletions.
diff --git a/Core/bin/google-cloud-batch b/Core/bin/google-cloud-batch
@@ -18,15 +18,25 @@
 
 namespace Google\Cloud\Core\Batch;
 
-use Google\Cloud\Core\Daemon\DaemonUtils;
+$foundAutoloader = false;
+$autoloaderCandidates = [
+    '/../vendor/autoload.php',     // Git clone of google-cloud-php-core
+    '/../../vendor/autoload.php',  // Git clone of google-cloud-php
+    '/../../../autoload.php',      // google/cloud-core installation
+    '/../../../../autoload.php',   // google/cloud installation
+];
+foreach ($autoloaderCandidates as $candidate) {
+    if (file_exists($candidate)) {
+        require_once $candidate;
+        $foundAutoloader = true;
+        break;
+    }
+}
 
-$autoloader = DaemonUtils::locateAutoloader(__DIR__ . '/..');
-if (is_null($autoloader)) {
+if (!$foundAutoloader) {
     die('No autoloader found');
 }
 
-require_once $autoloader;
-
 function showUsageAndDie()
 {
     die("usage: " . __FILE__ . " [daemon|retry] {id}");

diff --git a/Core/src/Daemon/DaemonUtils.php b/Core/src/Daemon/DaemonUtils.php
diff --git a/Debugger/bin/google-cloud-debugger b/Debugger/bin/google-cloud-debugger
@@ -18,15 +18,25 @@
 
 namespace Google\Cloud\Debugger;
 
-use Google\Cloud\Core\Daemon\DaemonUtils;
+$foundAutoloader = false;
+$autoloaderCandidates = [
+    '/../vendor/autoload.php',     // Git clone of google-cloud-php-debugger
+    '/../../vendor/autoload.php',  // Git clone of google-cloud-php
+    '/../../../autoload.php',      // google/cloud-debugger installation
+    '/../../../../autoload.php',   // google/cloud installation
+];
+foreach ($autoloaderCandidates as $candidate) {
+    if (file_exists($candidate)) {
+        require_once $candidate;
+        $foundAutoloader = true;
+        break;
+    }
+}
 
-$autoloader = DaemonUtils::locateAutoloader(__DIR__ . '/..');
-if (is_null($autoloader)) {
+if (!$foundAutoloader) {
     die('No autoloader found');
 }
 
-require_once $autoloader;
-
 function showUsageAndDie()
 {
     $filename = basename(__FILE__);