Skip to content

Commit 35554ef

Browse files
Merge branch '6.1' into 6.2
* 6.1: (26 commits) cs fix [Messenger] Fix Doctrine transport on MySQL [Filesystem] Remove needless `mb_*` calls [Translator] Fix translator overlapse [Yaml] Improve test coverage in DumperTest and ParserTest Extract dispatching console signal handling and include subscribers [Mailer] Fix error message in case of an STMP error [HttpClient] Fix shared connections not being freed on PHP < 8 [HttpFoundation] Fix invalid ID not regenerated with native PHP file sessions [HttpClient] Fix memory leak when using StreamWrapper minor: fix test [Serializer] Fix error message remove the ChatterInterface alias when the chatter service is removed Bump Symfony version to 6.1.4 Update VERSION for 6.1.3 Update CHANGELOG for 6.1.3 Bump Symfony version to 6.0.12 Update VERSION for 6.0.11 Update CHANGELOG for 6.0.11 Bump Symfony version to 5.4.12 ...
2 parents 295caac + ab1f1df commit 35554ef

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,10 @@
172172
use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory;
173173
use Symfony\Component\Notifier\Bridge\Zendesk\ZendeskTransportFactory;
174174
use Symfony\Component\Notifier\Bridge\Zulip\ZulipTransportFactory;
175+
use Symfony\Component\Notifier\ChatterInterface;
175176
use Symfony\Component\Notifier\Notifier;
176177
use Symfony\Component\Notifier\Recipient\Recipient;
178+
use Symfony\Component\Notifier\TexterInterface;
177179
use Symfony\Component\Notifier\Transport\TransportFactoryInterface as NotifierTransportFactoryInterface;
178180
use Symfony\Component\PropertyAccess\PropertyAccessor;
179181
use Symfony\Component\PropertyInfo\Extractor\PhpDocExtractor;
@@ -2499,11 +2501,13 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
24992501
$container->getDefinition('chatter.transports')->setArgument(0, $config['chatter_transports']);
25002502
} else {
25012503
$container->removeDefinition('chatter');
2504+
$container->removeAlias(ChatterInterface::class);
25022505
}
25032506
if ($config['texter_transports']) {
25042507
$container->getDefinition('texter.transports')->setArgument(0, $config['texter_transports']);
25052508
} else {
25062509
$container->removeDefinition('texter');
2510+
$container->removeAlias(TexterInterface::class);
25072511
}
25082512

25092513
if ($this->mailerConfigEnabled) {

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@
5656
use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
5757
use Symfony\Component\HttpKernel\Fragment\FragmentUriGeneratorInterface;
5858
use Symfony\Component\Messenger\Transport\TransportFactory;
59+
use Symfony\Component\Notifier\ChatterInterface;
60+
use Symfony\Component\Notifier\TexterInterface;
5961
use Symfony\Component\PropertyAccess\PropertyAccessor;
6062
use Symfony\Component\Security\Core\AuthenticationEvents;
6163
use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
@@ -2018,7 +2020,9 @@ public function testNotifierWithoutTransports()
20182020

20192021
$this->assertTrue($container->hasDefinition('notifier'));
20202022
$this->assertFalse($container->hasDefinition('chatter'));
2023+
$this->assertFalse($container->hasAlias(ChatterInterface::class));
20212024
$this->assertFalse($container->hasDefinition('texter'));
2025+
$this->assertFalse($container->hasAlias(TexterInterface::class));
20222026
}
20232027

20242028
public function testIfNotifierTransportsAreKnownByFrameworkExtension()

0 commit comments

Comments
 (0)