Skip to content

Commit 0cdf28f

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: Fix typo 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
2 parents 6e9db00 + 88cdf42 commit 0cdf28f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Tests/CurlHttpClientTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public function testOverridingInternalAttributesUsingCurlOptions()
115115
$httpClient->request('POST', 'http://localhost:8057/', [
116116
'extra' => [
117117
'curl' => [
118-
\CURLOPT_PRIVATE => 'overriden private',
118+
\CURLOPT_PRIVATE => 'overridden private',
119119
],
120120
],
121121
]);

0 commit comments

Comments
 (0)