diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Messenger] DoctrineTransport - Use InvalidArgumentException instead of TransportException during configuration checks

Browse Source
This commit is contained in:
Vincent Touzet 2019-04-07 09:39:29 +02:00
parent 65b46a532c
commit e2dbe63489
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Messenger/Tests/Transport/Doctrine/ConnectionTest.php
View File

@ -213,7 +213,7 @@ class ConnectionTest extends TestCase
}
/**
* @expectedException \Symfony\Component\Messenger\Exception\TransportException
* @expectedException \Symfony\Component\Messenger\Exception\InvalidArgumentException
*/
public function testItThrowsAnExceptionIfAnExtraOptionsInDefined()
{
@ -221,7 +221,7 @@ class ConnectionTest extends TestCase
}
/**
* @expectedException \Symfony\Component\Messenger\Exception\TransportException
* @expectedException \Symfony\Component\Messenger\Exception\InvalidArgumentException
*/
public function testItThrowsAnExceptionIfAnExtraOptionsInDefinedInDSN()
{

4
src/Symfony/Component/Messenger/Transport/Doctrine/Connection.php
View File

@ -87,13 +87,13 @@ class Connection
// check for extra keys in options
$optionsExtraKeys = array_diff(array_keys($options), array_keys($configuration));
if (0 < \count($optionsExtraKeys)) {
throw new TransportException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', self::DEFAULT_OPTIONS)));
throw new InvalidArgumentException(sprintf('Unknown option found : [%s]. Allowed options are [%s]', implode(', ', $optionsExtraKeys), implode(', ', self::DEFAULT_OPTIONS)));
}
// check for extra keys in options
$queryExtraKeys = array_diff(array_keys($query), array_keys($configuration));
if (0 < \count($queryExtraKeys)) {
throw new TransportException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', self::DEFAULT_OPTIONS)));
throw new InvalidArgumentException(sprintf('Unknown option found in DSN: [%s]. Allowed options are [%s]', implode(', ', $queryExtraKeys), implode(', ', self::DEFAULT_OPTIONS)));
}
return $configuration;