Merge pull request consolidation#28 from pmcjury/master

fixes consolidation#26 to use robo.phar standalone even if vendor dir exists, and you don't have Robo as a dependency

robo

@@ -1,12 +1,19 @@
 #!/usr/bin/env php
 <?php
-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 {
+/**
+ * if we're running from phar load the phar autoload, else let the script 'robo' search for the autoloader
+ */
+if(strpos(basename(__FILE__), 'phar')){
     require_once 'phar://robo.phar/vendor/autoload.php';
 }
-
+else{
+    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 {
+        require_once 'phar://robo.phar/vendor/autoload.php';
+    }
+}
 $runner = new \Robo\Runner();
 $runner->execute();

src/Task/Composer.php

@@ -124,7 +124,6 @@ public function getCommand()
  * $this->taskComposerInstall('path/to/my/composer.phar')
  *      ->preferDist()
  *      ->run();
- * ?>
  * 
  * // optimize autoloader with custom path
  * $this->taskComposerInstall('path/to/my/composer.phar')
@@ -158,7 +157,6 @@ public function run()
  * $this->taskComposerUpdate('path/to/my/composer.phar')
  *      ->preferDist()
  *      ->run();
- * ?>
  * 
  * // optimize autoloader with custom path
  * $this->taskComposerUpdate('path/to/my/composer.phar')
@@ -192,13 +190,11 @@ public function run()
  * $this->taskComposerDumpAutoload('path/to/my/composer.phar')
  *      ->preferDist()
  *      ->run();
- * ?>
  * 
  * // optimize autoloader dump with custom path
  * $this->taskComposerDumpAutoload('path/to/my/composer.phar')
  *      ->optimize()
  *      ->run();
- * ?>
  * 
  * // optimize autoloader dump with custom path and no dev
  * $this->taskComposerDumpAutoload('path/to/my/composer.phar')