Skip to content

Commit 4cbeeb5

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: [Messenger] Improve error message readability fix filename being cleaned up at end of tests
1 parent b6343c8 commit 4cbeeb5

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Tests/Transport/ConnectionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ public function testItDelaysTheMessageWithADifferentRoutingKeyAndTTLs()
488488
public function testObfuscatePasswordInDsn()
489489
{
490490
$this->expectException('AMQPException');
491-
$this->expectExceptionMessage('Could not connect to the AMQP server. Please verify the provided DSN. ({"host":"localhost","port":5672,"vhost":"\/","login":"user","password":"********"})');
491+
$this->expectExceptionMessage('Could not connect to the AMQP server. Please verify the provided DSN. ({"host":"localhost","port":5672,"vhost":"/","login":"user","password":"********"})');
492492
$factory = new TestAmqpFactory(
493493
$amqpConnection = $this->createMock(\AMQPConnection::class),
494494
$amqpChannel = $this->createMock(\AMQPChannel::class),

Transport/Connection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,7 @@ public function channel(): \AMQPChannel
470470
$credentials['password'] = '********';
471471
unset($credentials['delay']);
472472

473-
throw new \AMQPException(sprintf('Could not connect to the AMQP server. Please verify the provided DSN. (%s).', json_encode($credentials)), 0, $e);
473+
throw new \AMQPException(sprintf('Could not connect to the AMQP server. Please verify the provided DSN. (%s).', json_encode($credentials, \JSON_UNESCAPED_SLASHES)), 0, $e);
474474
}
475475
$this->amqpChannel = $this->amqpFactory->createChannel($connection);
476476

0 commit comments

Comments
 (0)