Skip to content

Commit 95a2e68

Browse files
committed
update tests to use the new error assertion helper
1 parent 8c157a6 commit 95a2e68

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

Tests/ParserTest.php

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Yaml\Tests;
1313

14+
use Symfony\Bridge\PhpUnit\ErrorAssert;
1415
use Symfony\Component\Yaml\Yaml;
1516
use Symfony\Component\Yaml\Parser;
1617

@@ -930,27 +931,14 @@ public function testFloatKeys()
930931
*/
931932
public function testColonInMappingValueException()
932933
{
933-
$yaml = <<<EOF
934+
$parser = $this->parser;
935+
936+
ErrorAssert::assertDeprecationsAreTriggered('Using a colon in the unquoted mapping value "bar: baz" in line 1 is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', function () use ($parser) {
937+
$yaml = <<<EOF
934938
foo: bar: baz
935939
EOF;
936-
937-
$deprecations = array();
938-
set_error_handler(function ($type, $msg) use (&$deprecations) {
939-
if (E_USER_DEPRECATED !== $type) {
940-
restore_error_handler();
941-
942-
return call_user_func_array('PHPUnit_Util_ErrorHandler::handleError', func_get_args());
943-
}
944-
945-
$deprecations[] = $msg;
940+
$parser->parse($yaml);
946941
});
947-
948-
$this->parser->parse($yaml);
949-
950-
restore_error_handler();
951-
952-
$this->assertCount(1, $deprecations);
953-
$this->assertContains('Using a colon in the unquoted mapping value "bar: baz" in line 1 is deprecated since Symfony 2.8 and will throw a ParseException in 3.0.', $deprecations[0]);
954942
}
955943

956944
public function testColonInMappingValueExceptionNotTriggeredByColonInComment()

0 commit comments

Comments
 (0)