Merge branch '7.0' into 7.1

xabbuh · xabbuh · commit 114e768a1cbf · 2024-07-09T21:36:07.000+02:00
* 7.0:
  fix merge
  [AssetMapper] Split test dirs in tests
  Fix typo
  Change incorrect check for the `stateless` request attribute
  [Validator] add setGroupProvider to AttributeLoader
  use copy() instead of rename() on Windows
  test: kebab-case to snake_case
  [PropertyInfo] Handle collection in PhpStan same as PhpDoc
  [Messenger] Passing to `WorkerMessageRetriedEvent` envelope with actual stamps after sent
diff --git a/Tests/CurlHttpClientTest.php b/Tests/CurlHttpClientTest.php
@@ -115,7 +115,7 @@ public function testOverridingInternalAttributesUsingCurlOptions()
         $httpClient->request('POST', 'http://localhost:8057/', [
             'extra' => [
                 'curl' => [
-                    \CURLOPT_PRIVATE => 'overriden private',
+                    \CURLOPT_PRIVATE => 'overridden private',
                 ],
             ],
         ]);
