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

Merge branch '4.4' into 5.1

Browse Source 
* 4.4:
  [Messenger] Improve error message readability
  fix filename being cleaned up at end of tests
This commit is contained in:
Fabien Potencier 2020-09-14 17:02:15 +02:00
commit 2df87a36bd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Tests/Command/CacheClearCommand/CacheClearCommandTest.php
View File

@ -38,7 +38,7 @@ class CacheClearCommandTest extends TestCase
protected function tearDown(): void
{
$this->fs->remove($this->kernel->getProjectDir());
$this->fs->remove(__DIR__.'/Fixture/preload.php');
$this->fs->remove(__DIR__.'/Fixture/.preload.php');
}
public function testCacheIsFreshAfterCacheClearedWithWarmup()

2
src/Symfony/Component/Messenger/Bridge/Amqp/Tests/Transport/ConnectionTest.php
View File

@ -488,7 +488,7 @@ class ConnectionTest extends TestCase
public function testObfuscatePasswordInDsn()
{
$this->expectException('AMQPException');
$this->expectExceptionMessage('Could not connect to the AMQP server. Please verify the provided DSN. ({"host":"localhost","port":5672,"vhost":"\/","login":"user","password":"********"})');
$this->expectExceptionMessage('Could not connect to the AMQP server. Please verify the provided DSN. ({"host":"localhost","port":5672,"vhost":"/","login":"user","password":"********"})');
$factory = new TestAmqpFactory(
$amqpConnection = $this->createMock(\AMQPConnection::class),
$amqpChannel = $this->createMock(\AMQPChannel::class),

2
src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php
View File

@ -470,7 +470,7 @@ class Connection
$credentials['password'] = '********';
unset($credentials['delay']);
throw new \AMQPException(sprintf('Could not connect to the AMQP server. Please verify the provided DSN. (%s).', json_encode($credentials)), 0, $e);
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);
}
$this->amqpChannel = $this->amqpFactory->createChannel($connection);