Merge branch 'develop'

* develop: Fix typo. Code style fixes. Improve output.
district09 · Mar 9, 2017 · feced32 · feced32
2 parents d70d526 + a7a68c9
commit feced32
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/src/PackageProject.php b/src/PackageProject.php
@@ -118,6 +118,7 @@ protected function getFiles()
     {
         $this->mirrorDir();
         $this->cleanMirrorDir();
+        $this->printTaskInfo('Retrieving files to package.');
         $mirrorFinder = new Finder();
         $mirrorFinder->ignoreDotFiles(false);
         $add = [];
@@ -143,26 +144,36 @@ protected function mirrorDir()
         if (file_exists($this->tmpDir)) {
             $this->fs->remove($this->tmpDir);
         }
-
+        $this->printTaskInfo(sprintf(
+            'Creating temporary directory %s.',
+            $this->tmpDir
+        ));
         $this->fs->mkdir($this->tmpDir);
         $tmpRealPath = realpath($this->tmpDir);
 
         $directoryIterator = new \RecursiveDirectoryIterator($this->dir, \RecursiveDirectoryIterator::SKIP_DOTS);
         $recursiveIterator = new \RecursiveIteratorIterator($directoryIterator, \RecursiveIteratorIterator::SELF_FIRST);
         $filterIterator = new \CallbackFilterIterator(
             $recursiveIterator,
-            function ($current) use ($tmpRealPath)
-            {
+            function ($current) use ($tmpRealPath) {
                 return strpos($current->getRealPath(), $tmpRealPath) !== 0;
             }
         );
+        $this->printTaskInfo(sprintf(
+            'Mirroring directory %s to temporary directory %s.',
+            $this->dir,
+            $tmpRealPath
+        ));
         foreach ($filterIterator as $item) {
             if (strpos($item->getRealPath(), $tmpRealPath) === 0) {
-              continue;
+                continue;
             }
             if (is_link($item)) {
                 if ($item->getRealPath() !== false) {
-                    $this->fs->symlink($item->getLinkTarget(), $this->tmpDir . DIRECTORY_SEPARATOR . $filterIterator->getSubPathName());
+                    $this->fs->symlink(
+                        $item->getLinkTarget(),
+                        $this->tmpDir . DIRECTORY_SEPARATOR . $filterIterator->getSubPathName()
+                    );
                 }
                 continue;
             }
@@ -182,6 +193,7 @@ function ($current) use ($tmpRealPath)
      */
     protected function cleanMirrorDir()
     {
+        $this->printTaskInfo(sprintf('Cleaning directory %s.', $this->tmpDir));
         if (empty($this->ignoreFileNames)) {
             return;
         }
@@ -211,6 +223,9 @@ public function run()
         $this->add($this->getFiles());
         $result = parent::run();
         if ($this->useTmpDir) {
+            $this->printTaskInfo(
+                sprintf('Removing temporary directory %s.', $this->tmpDir)
+            );
             $this->fs->remove($this->tmpDir);
         }
         return $result;