[Messenger][Redis] Fix auth option wrongly considered invalid

This commit is contained in:
Robin Chalas 2021-07-18 15:19:21 +02:00
parent 586899c1bd
commit 8bc6ee52fc
No known key found for this signature in database
GPG Key ID: 89672113756EE03B
3 changed files with 4 additions and 20 deletions

View File

@ -76,20 +76,14 @@ class AmqpExtIntegrationTest extends TestCase
$this->assertEmpty(iterator_to_array($receiver->get())); $this->assertEmpty(iterator_to_array($receiver->get()));
} }
/**
* @group legacy
* ^ for now, deprecation errors are thrown during serialization.
*/
public function testRetryAndDelay() public function testRetryAndDelay()
{ {
$serializer = $this->createSerializer();
$connection = Connection::fromDsn(getenv('MESSENGER_AMQP_DSN')); $connection = Connection::fromDsn(getenv('MESSENGER_AMQP_DSN'));
$connection->setup(); $connection->setup();
$connection->purgeQueues(); $connection->purgeQueues();
$sender = new AmqpSender($connection, $serializer); $sender = new AmqpSender($connection);
$receiver = new AmqpReceiver($connection, $serializer); $receiver = new AmqpReceiver($connection);
// send a first message // send a first message
$sender->send($first = new Envelope(new DummyMessage('First'))); $sender->send($first = new Envelope(new DummyMessage('First')));

View File

@ -191,17 +191,6 @@ class ConnectionTest extends TestCase
Connection::fromDsn('redis://password1@localhost/queue', ['auth' => 'password2'], $redis); Connection::fromDsn('redis://password1@localhost/queue', ['auth' => 'password2'], $redis);
} }
public function testAuthAsUserInDsn()
{
$redis = $this->createMock(\Redis::class);
$redis->expects($this->exactly(1))->method('auth')
->with('password')
->willReturn(true);
Connection::fromDsn('redis://password:localhost/queue', [], $redis);
}
public function testNoAuthWithEmptyPassword() public function testNoAuthWithEmptyPassword()
{ {
$redis = $this->createMock(\Redis::class); $redis = $this->createMock(\Redis::class);

View File

@ -40,6 +40,8 @@ class Connection
'redeliver_timeout' => 3600, // Timeout before redeliver messages still in pending state (seconds) 'redeliver_timeout' => 3600, // Timeout before redeliver messages still in pending state (seconds)
'claim_interval' => 60000, // Interval by which pending/abandoned messages should be checked 'claim_interval' => 60000, // Interval by which pending/abandoned messages should be checked
'lazy' => false, 'lazy' => false,
'auth' => null,
'serializer' => \Redis::SERIALIZER_PHP,
]; ];
private $connection; private $connection;
@ -224,7 +226,6 @@ class Connection
private static function validateOptions(array $options): void private static function validateOptions(array $options): void
{ {
$availableOptions = array_keys(self::DEFAULT_OPTIONS); $availableOptions = array_keys(self::DEFAULT_OPTIONS);
$availableOptions[] = 'serializer';
if (0 < \count($invalidOptions = array_diff(array_keys($options), $availableOptions))) { if (0 < \count($invalidOptions = array_diff(array_keys($options), $availableOptions))) {
trigger_deprecation('symfony/messenger', '5.1', 'Invalid option(s) "%s" passed to the Redis Messenger transport. Passing invalid options is deprecated.', implode('", "', $invalidOptions)); trigger_deprecation('symfony/messenger', '5.1', 'Invalid option(s) "%s" passed to the Redis Messenger transport. Passing invalid options is deprecated.', implode('", "', $invalidOptions));