Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / vendor / drupal-composer / drupal-scaffold / src / PrestissimoFileFetcher.php

diff --git a/vendor/drupal-composer/drupal-scaffold/src/PrestissimoFileFetcher.php b/vendor/drupal-composer/drupal-scaffold/src/PrestissimoFileFetcher.php
index a99aa1d7b537c14a1fe600380afbd7e12adae575..30b7c233c4ed5096be244e71208e0085e29a691d 100644 (file)
--- a/vendor/drupal-composer/drupal-scaffold/src/PrestissimoFileFetcher.php
+++ b/vendor/drupal-composer/drupal-scaffold/src/PrestissimoFileFetcher.php
@@ -1,55 +1,66 @@
 <?php
 
-/**
- * @file
- * Contains \DrupalComposer\DrupalScaffold\FileFetcher.
- */
-
 namespace DrupalComposer\DrupalScaffold;
 
+use Composer\Util\RemoteFilesystem;
 use Composer\Config;
 use Composer\IO\IOInterface;
 use Hirak\Prestissimo\CopyRequest;
 use Hirak\Prestissimo\CurlMulti;
 
+/**
+ * Extends the default FileFetcher and uses hirak/prestissimo for parallel
+ * downloads.
+ */
 class PrestissimoFileFetcher extends FileFetcher {
 
-  /**
-   * @var \Composer\IO\IOInterface
-   */
-  protected $io;
-
   /**
    * @var \Composer\Config
    */
   protected $config;
 
-  public function __construct(\Composer\Util\RemoteFilesystem $remoteFilesystem, $source, array $filenames = [], IOInterface $io, Config $config) {
-    parent::__construct($remoteFilesystem, $source, $filenames);
-    $this->io = $io;
+  /**
+   * Constructs this PrestissimoFileFetcher object.
+   */
+  public function __construct(RemoteFilesystem $remoteFilesystem, $source, IOInterface $io, $progress = TRUE, Config $config) {
+    parent::__construct($remoteFilesystem, $source, $io, $progress);
     $this->config = $config;
   }
 
-  public function fetch($version, $destination) {
+  /**
+   * {@inheritdoc}
+   */
+  public function fetch($version, $destination, $override) {
     if (class_exists(CurlMulti::class)) {
-      $this->fetchWithPrestissimo($version, $destination);
+      $this->fetchWithPrestissimo($version, $destination, $override);
       return;
     }
-    parent::fetch($version, $destination);
+    parent::fetch($version, $destination, $override);
   }
 
-  protected function fetchWithPrestissimo($version, $destination) {
+  /**
+   * Fetch files in parallel.
+   */
+  protected function fetchWithPrestissimo($version, $destination, $override) {
     $requests = [];
-    array_walk($this->filenames, function ($filename) use ($version, $destination, &$requests) {
-      $url = $this->getUri($filename, $version);
-      $this->fs->ensureDirectoryExists($destination . '/' . dirname($filename));
-      $requests[] = new CopyRequest($url, $destination . '/' . $filename, false, $this->io, $this->config);
-    });
+
+    foreach ($this->filenames as $sourceFilename => $filename) {
+      $target = "$destination/$filename";
+      if ($override || !file_exists($target)) {
+        $url = $this->getUri($sourceFilename, $version);
+        $this->fs->ensureDirectoryExists($destination . '/' . dirname($filename));
+        $requests[] = new CopyRequest($url, $target, FALSE, $this->io, $this->config);
+      }
+    }
 
     $successCnt = $failureCnt = 0;
+    $errors = [];
     $totalCnt = count($requests);
+    if ($totalCnt == 0) {
+      return;
+    }
 
-    $multi = new CurlMulti;
+    $multi = new CurlMulti();
     $multi->setRequests($requests);
     do {
       $multi->setupEventLoop();
@@ -57,10 +68,20 @@ class PrestissimoFileFetcher extends FileFetcher {
       $result = $multi->getFinishedResults();
       $successCnt += $result['successCnt'];
       $failureCnt += $result['failureCnt'];
-      foreach ($result['urls'] as $url) {
-        $this->io->writeError("    <comment>$successCnt/$totalCnt</comment>:\t$url", true, \Composer\IO\IOInterface::VERBOSE);
+      if (isset($result['errors'])) {
+        $errors += $result['errors'];
+      }
+      if ($this->progress) {
+        foreach ($result['urls'] as $url) {
+          $this->io->writeError("  - Downloading <comment>$successCnt</comment>/<comment>$totalCnt</comment>: <info>$url</info>", TRUE);
+        }
       }
     } while ($multi->remain());
+
+    $urls = array_keys($errors);
+    if ($urls) {
+      throw new \Exception('Failed to download ' . implode(", ", $urls));
+    }
   }
 
 }