Merge branch 'master' of https://github.com/kzykhys/Ciconia

kzykhys · Nov 7, 2013 · 3ae3a53 · 3ae3a53
2 parents c251e7c + 88e7766
commit 3ae3a53
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/bin/ciconia b/bin/ciconia
@@ -7,7 +7,20 @@ if (PHP_SAPI !== 'cli') {
     echo 'Ciconia command should be run on the CLI environment.' . PHP_EOL;
 }
 
-require __DIR__ . '/../vendor/autoload.php';
+$paths = [
+    // Top-level package.
+    __DIR__ . '/../vendor/autoload.php',
+
+    // Included as a dependency.
+    __DIR__ . '/../../../autoload.php',
+];
+
+foreach($paths as $path) {
+    if (file_exists($path)) {
+        require $path;
+        break;
+    }
+}
 
 $app = new Application('Ciconia', \Ciconia\Ciconia::VERSION);
-$app->run();
+$app->run();
diff --git a/bin/compile b/bin/compile
@@ -8,8 +8,21 @@ if (PHP_SAPI !== 'cli') {
     die('Compile command must be run on the CLI environment.');
 }
 
-require __DIR__ . '/../vendor/autoload.php';
+$paths = [
+    // Top-level package.
+    __DIR__ . '/../vendor/autoload.php',
+
+    // Included as a dependency.
+    __DIR__ . '/../../../autoload.php',
+];
+
+foreach($paths as $path) {
+    if (file_exists($path)) {
+        require $path;
+        break;
+    }
+}
 
 $app = new Application('Ciconia Compiler', \Ciconia\Ciconia::VERSION);
 $app->add(new CompileCommand());
-$app->run();
+$app->run();