avoid >100% progress

smnandre · May 30, 2020 · dcc71c2 · dcc71c2
1 parent a530568
commit dcc71c2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /vendor/
 /build/
+.phpunit.result.cache
 .php_cs.cache
 composer.lock
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -7,8 +7,9 @@ return PhpCsFixer\Config::create()
     ->setRules(array(
         '@Symfony' => true,
         '@Symfony:risky' => true,
+        'fopen_flags' => false,
         '@PHPUnit48Migration:risky' => true,
-        'array_syntax' => array('syntax' => 'short'),
+        'array_syntax' => ['syntax' => 'short'],
         'ordered_imports' => true,
         'php_unit_no_expectation_annotation' => false, // part of `PHPUnitXYMigration:risky` ruleset, to be enabled when PHPUnit 4.x support will be dropped, as we don't want to rewrite exceptions handling twice
         'protected_to_private' => false,

diff --git a/src/CurlDownloader.php b/src/CurlDownloader.php
@@ -168,6 +168,8 @@ public function get($origin, $url, $context, $file)
             if ($file && !isset($this->exceptions[(int) $ch])) {
                 $fd = fopen($file, 'rb');
             }
+            $progress = array_diff_key(curl_getinfo($ch), self::$timeInfo);
+            $this->finishProgress($ch, $params['notification'], $progress);
             unset($this->jobs[(int) $ch], $this->exceptions[(int) $ch]);
             curl_multi_remove_handle($this->multiHandle, $ch);
             curl_close($ch);
@@ -186,7 +188,7 @@ public function get($origin, $url, $context, $file)
 
     private function onProgress($ch, callable $notify, array $progress, array $previousProgress)
     {
-        if (300 <= $progress['http_code'] && $progress['http_code'] < 400) {
+        if (300 <= $progress['http_code'] && $progress['http_code'] < 400 || 0 > $progress['download_content_length']) {
             return;
         }
 
@@ -203,4 +205,12 @@ private function onProgress($ch, callable $notify, array $progress, array $previ
             $notify(STREAM_NOTIFY_PROGRESS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, (int) $progress['size_download'], (int) $progress['download_content_length'], false);
         }
     }
+
+    private function finishProgress($ch, callable $notify, array $progress)
+    {
+        if ($progress['download_content_length'] < 0) {
+            $notify(STREAM_NOTIFY_FILE_SIZE_IS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, 0, (int) $progress['size_download'], false);
+            $notify(STREAM_NOTIFY_PROGRESS, STREAM_NOTIFY_SEVERITY_INFO, '', 0, (int) $progress['size_download'], (int) $progress['size_download'], false);
+        }
+    }
 }