Skip to content

Commit 4c7e155

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: [ErrorHandler] Return false directly and remove unused variable [OptionsResolver] Assert that the error type is valid in deprecations test [HttpClient] Allow bearer token with colon [Form] Fix custom formats deprecation with HTML5 widgets [Translator] Optional Intl dependency [Contracts][Translation] Optional Intl dependency [ErrorHandler] Escape JSON encoded log context update missing translations arabic [Yaml] simplify the test fix test by letting mock throw the actual expected exception
2 parents 4606099 + 02b120a commit 4c7e155

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Tests/OptionsResolverTest.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,9 @@ public function testDeprecationMessages(\Closure $configureOptions, array $optio
524524
{
525525
$count = 0;
526526
error_clear_last();
527-
set_error_handler(function () use (&$count) {
527+
set_error_handler(function (int $type) use (&$count) {
528+
$this->assertSame(\E_USER_DEPRECATED, $type);
529+
528530
++$count;
529531

530532
return false;

0 commit comments

Comments
 (0)