Make sure that progress bar steps are calculated correctly for nested…

… collections.

RoboFile.php

@@ -252,15 +252,22 @@ public function publish()
      */
     public function pharBuild()
     {
-        $collection = $this->collection();
-
         // Make sure to remove dev files before finding the files to pack into
-        // the phar.
+        // the phar.  This must therefore be done outside the collection,
+        // as the files to pack are found when the collection is built.
         $this->taskComposerInstall()
             ->noDev()
             ->printed(false)
             ->run();
 
+        $collection = $this->collectionBuilder();
+
+        // revert back phar dependencies on completion
+        $collection->completion($this
+            ->taskComposerInstall()
+            ->printed(false)
+        );
+
         $packer = $this->taskPackPhar('robo.phar');
         $files = Finder::create()->ignoreVCS(true)
             ->files()
@@ -280,8 +287,9 @@ public function pharBuild()
             $packer->addFile($file->getRelativePathname(), $file->getRealPath());
         }
         $packer->addFile('robo', 'robo')
-            ->executable('robo')
-            ->addToCollection($collection);
+            ->executable('robo');
+
+        $collection->addTask($packer);
 
         return $collection->run();
     }

src/Collection/CollectionBuilder.php

@@ -17,7 +17,7 @@
 use Robo\Contract\ConfigAwareInterface;
 use Robo\Common\ConfigAwareTrait;
 
-class CollectionBuilder implements NestedCollectionInterface, ConfigAwareInterface, ContainerAwareInterface, TaskInterface
+class CollectionBuilder implements NestedCollectionInterface, ConfigAwareInterface, ContainerAwareInterface, TaskInterface, WrappedTaskInterface
 {
     use ConfigAwareTrait;
     use ContainerAwareTrait;
@@ -247,6 +247,11 @@ public function run()
         return $this->getCollection()->run();
     }
 
+    public function original()
+    {
+        return $this->getCollection();
+    }
+
     /**
      * Return the collection of tasks associated with this builder.
      *

src/Task/Development/PackPhar.php

@@ -38,7 +38,7 @@
  * ?>
  * ```
  */
-class PackPhar extends BaseTask implements PrintedInterface
+class PackPhar extends BaseTask implements PrintedInterface, ProgressIndicatorAwareInterface
 {
     /**
      * @var \Phar