Skip to content

Commit 6f2ea67

Browse files
bug symfony#19757 [PhpUnitBridge] allow to pass a message as string (xabbuh)
This PR was merged into the 3.2-dev branch. Discussion ---------- [PhpUnitBridge] allow to pass a message as string | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Currently our tests for deprecation messages just pass "accidentally" (we never pass arrays but only strings). Commits ------- 8ceed79 [PhpUnitBridge] allow to pass a message as string
2 parents 29b6b9b + 8ceed79 commit 6f2ea67

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/Symfony/Bridge/PhpUnit/ErrorAssert.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
final class ErrorAssert
2020
{
2121
/**
22-
* @param string[] $expectedMessages Expected deprecation messages
23-
* @param callable $testCode A callable that is expected to trigger the deprecation messages
22+
* @param string[]|string $expectedMessages Expected deprecation messages
23+
* @param callable $testCode A callable that is expected to trigger the deprecation messages
2424
*/
2525
public static function assertDeprecationsAreTriggered($expectedMessages, $testCode)
2626
{
@@ -32,9 +32,9 @@ public static function assertDeprecationsAreTriggered($expectedMessages, $testCo
3232
}
3333

3434
/**
35-
* @param int $expectedType Expected triggered error type (pass one of PHP's E_* constants)
36-
* @param string[] $expectedMessages Expected error messages
37-
* @param callable $testCode A callable that is expected to trigger the error messages
35+
* @param int $expectedType Expected triggered error type (pass one of PHP's E_* constants)
36+
* @param string[]|string $expectedMessages Expected error messages
37+
* @param callable $testCode A callable that is expected to trigger the error messages
3838
*/
3939
public static function assertErrorsAreTriggered($expectedType, $expectedMessages, $testCode)
4040
{
@@ -63,6 +63,8 @@ public static function assertErrorsAreTriggered($expectedType, $expectedMessages
6363
throw $e;
6464
}
6565

66+
$expectedMessages = (array) $expectedMessages;
67+
6668
\PHPUnit_Framework_Assert::assertCount(count($expectedMessages), $triggeredMessages);
6769

6870
foreach ($triggeredMessages as $i => $message) {

0 commit comments

Comments
 (0)