Skip to content

[PhpUnitBridge] allow to pass a message as string #19757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 29, 2016
Merged

[PhpUnitBridge] allow to pass a message as string #19757

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/Symfony/Bridge/PhpUnit/ErrorAssert.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand Down Expand Up @@ -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) {
Expand Down