Merge branch '6.2' into 6.3

* 6.2:
  [Serializer] Fix serializedpath for non scalar types
  [Serializer] Preserve array keys while denormalize variadic parameters
  [FrameworkBundle] enable metadata cache when annotation is disabled
  [DependencyInjection] Fix setting the class of auto-discovery services
  [FrameworkBundle] Fix auto-discovering validator constraints
  TranslatorBag::diff now iterates over catalogue domains instead of operation domains
  [HttpClient] Fix not calling the on progress callback when canceling a MockResponse
  [TwigBridge] Fix raw content rendering in HTML notification emails

Author: nicolas-grekas

Response/MockResponse.php

@@ -102,6 +102,10 @@ public function cancel(): void
         } catch (TransportException $e) {
             // ignore errors when canceling
         }
+
+        $onProgress = $this->requestOptions['on_progress'] ?? static function () {};
+        $dlSize = isset($this->headers['content-encoding']) || 'HEAD' === $this->info['http_method'] || \in_array($this->info['http_code'], [204, 304], true) ? 0 : (int) ($this->headers['content-length'][0] ?? 0);
+        $onProgress($this->offset, $dlSize, $this->info);
     }
 
     public function __destruct()

Tests/MockHttpClientTest.php

@@ -533,4 +533,25 @@ public function testResetsRequestCount()
         $client->reset();
         $this->assertSame(0, $client->getRequestsCount());
     }
+
+    public function testCancellingMockResponseExecutesOnProgressWithUpdatedInfo()
+    {
+        $client = new MockHttpClient(new MockResponse(['foo', 'bar', 'ccc']));
+        $canceled = false;
+        $response = $client->request('GET', 'https://example.com', [
+            'on_progress' => static function (int $dlNow, int $dlSize, array $info) use (&$canceled): void {
+                $canceled = $info['canceled'];
+            },
+        ]);
+
+        foreach ($client->stream($response) as $response => $chunk) {
+            if ('bar' === $chunk->getContent()) {
+                $response->cancel();
+
+                break;
+            }
+        }
+
+        $this->assertTrue($canceled);
+    }
 }