Merge c761754 into f383724

bootstrap.php

@@ -202,7 +202,18 @@
 define('DATA_DIR', CONFIG_DIR . '/data');
 define('RELATIONSHIPS_DIR', CONFIG_DIR . '/relationships');
 
-require_once __DIR__ . '/vendor/autoload.php';
+/*
+ * if Tidbit is running independently, the dependencies are in the /vendor
+ * directory, but if Tidbit is part of a larger composer managed system, the
+ * dependencies are a couple directories higher. If neither are found, bail
+ */
+if (file_exists(__DIR__ . '/vendor/autoload.php')) {
+    require_once __DIR__ . '/vendor/autoload.php';
+} elseif (file_exists(__DIR__ . '../../autoload.php')) {
+    require_once __DIR__ . '../../autoload.php';
+} else {
+    exitWithError('Unable to locate composer\'s autoload.php file');
+}
 
 // load general config
 require_once CONFIG_DIR . '/config.php';
@@ -322,7 +333,7 @@
         $modules[$m] *= $factor;
     }
 
-    // Multiple favorites with $factor too 
+    // Multiple favorites with $factor too
     if (isset($opts['with-favorites'])) {
         foreach ($sugarFavoritesModules as $m => $n) {
             $sugarFavoritesModules[$m] *= $factor;