diff --git a/src/Symfony/Bridge/PhpUnit/ErrorAssert.php b/src/Symfony/Bridge/PhpUnit/ErrorAssert.php index 3b443e6a1a7fe..783c1944db0be 100644 --- a/src/Symfony/Bridge/PhpUnit/ErrorAssert.php +++ b/src/Symfony/Bridge/PhpUnit/ErrorAssert.php @@ -19,8 +19,8 @@ final class ErrorAssert { /** - * @param string[] $expectedMessages Expected deprecation messages - * @param callable $testCode A callable that is expected to trigger the deprecation messages + * @param string[]|string $expectedMessages Expected deprecation messages + * @param callable $testCode A callable that is expected to trigger the deprecation messages */ public static function assertDeprecationsAreTriggered($expectedMessages, $testCode) { @@ -32,9 +32,9 @@ public static function assertDeprecationsAreTriggered($expectedMessages, $testCo } /** - * @param int $expectedType Expected triggered error type (pass one of PHP's E_* constants) - * @param string[] $expectedMessages Expected error messages - * @param callable $testCode A callable that is expected to trigger the error messages + * @param int $expectedType Expected triggered error type (pass one of PHP's E_* constants) + * @param string[]|string $expectedMessages Expected error messages + * @param callable $testCode A callable that is expected to trigger the error messages */ public static function assertErrorsAreTriggered($expectedType, $expectedMessages, $testCode) { @@ -63,6 +63,8 @@ public static function assertErrorsAreTriggered($expectedType, $expectedMessages throw $e; } + $expectedMessages = (array) $expectedMessages; + \PHPUnit_Framework_Assert::assertCount(count($expectedMessages), $triggeredMessages); foreach ($triggeredMessages as $i => $message) {