8000 - · symfony/symfony@c8701d8 · GitHub
[go: up one dir, main page]
Skip to content

Commit c8701d8

Browse files
OskarStarkOskarStark
committed
-
1 parent 13173c4 commit c8701d8

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

‎src/Symfony/Component/Notifier/Exception/MultipleExclusiveOptionsUsedException.php

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,17 @@
1616
*/
1717
class MultipleExclusiveOptionsUsedException extends InvalidArgumentException
1818
{
19-
public function __construct(array $usedOptions, array $availableOptions = null, \Throwable $previous = null)
19+
/**
20+
* @param string[] $usedOptions
21+
* @param string[] $exclusiveOptions
22+
*/
23+
public function __construct(array $usedOptions, array $exclusiveOptions, \Throwable $previous = null)
2024
{
21-
$message = sprintf('Multiple exclusive options have been used "%s".', implode('", "', $usedOptions));
22-
if (null !== $availableOptions) {
23-
$message .= sprintf(' Only one of %s can be used.', implode('", "', $availableOptions));
24-
}
25+
$message = sprintf(
26+
'Multiple exclusive options have been used "%s". Only one of %s can be used.',
27+
implode('", "', $usedOptions),
28+
implode('", "', $exclusiveOptions)
29+
);
2530

2631
parent::__construct($message, 0, $previous);
2732
}

‎src/Symfony/Component/Notifier/Tests/Exception/MultipleExclusiveOptionsUsedExceptionTest.php

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,7 @@
2525
*/
2626
final class MultipleExclusiveOptionsUsedExceptionTest extends TestCase
2727
{
28-
public function testMessageWithoutExclusiveOptionsGiven()
29-
{
30-
$exception = new MultipleExclusiveOptionsUsedException(['foo', 'bar']);
31-
32-
$this->assertSame(
33-
'Multiple exclusive options have been used "foo", "bar".',
34-
$exception->getMessage()
35-
);
36-
}
37-
38-
public function testMessageWithExclusiveOptionsGiven()
28+
public function testMessage()
3929
{
4030
$exception = new MultipleExclusiveOptionsUsedException(['foo', 'bar'], ['baz', 'qux']);
4131

0 commit comments

Comments
 (0)
0