fix : fixed incorrect interface on curl downloader (#137)

narrowspark · Oct 23, 2019 · 093c61e · 093c61e
1 parent 1ac7531
commit 093c61e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Prefetcher/Downloader/CurlDownloader.php b/src/Prefetcher/Downloader/CurlDownloader.php
@@ -103,13 +103,16 @@ public function __construct()
     /**
      * Download the package content.
      *
-     * @param string          $url
-     * @param resource|string $context
-     * @param null|string     $file
+     * This must stay in sync with the RemoteFilesystem::getRemoteContents interface.
+     *
+     * @param string               $originUrl
+     * @param string               $url
+     * @param null|resource|string $context
+     * @param null|string          $file
      *
      * @return array
      */
-    public function get(string $url, $context, ?string $file): array
+    public function get(string $originUrl, string $url, $context, ?string $file): array
     {
         $params = \stream_context_get_params($context);
         $ch = \curl_init();

diff --git a/src/Prefetcher/Downloader/ParallelDownloader.php b/src/Prefetcher/Downloader/ParallelDownloader.php
@@ -365,7 +365,7 @@ protected function getRemoteContents($originUrl, $fileUrl, $context, array &$res
             return $result;
         }
 
-        if (\preg_match('/^https?:/', $originUrl) !== 1 || $this->downloader === null) {
+        if ($this->downloader === null || \preg_match('/^https?:/', $originUrl) !== 1) {
             return parent::getRemoteContents($originUrl, $fileUrl, $context, $responseHeaders);
         }