Skip to content

Commit f8a954a

Browse files
Merge branch '5.4' into 6.0
* 5.4: 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 5.4.12 Update VERSION for 5.4.11 Update CHANGELOG for 5.4.11 Bump Symfony version to 4.4.45 Update VERSION for 4.4.44 Update CONTRIBUTORS for 4.4.44 Update CHANGELOG for 4.4.44
2 parents 408f595 + ed72a28 commit f8a954a

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
@@ -155,8 +155,10 @@
155155
use Symfony\Component\Notifier\Bridge\Vonage\VonageTransportFactory;
156156
use Symfony\Component\Notifier\Bridge\Yunpian\YunpianTransportFactory;
157157
use Symfony\Component\Notifier\Bridge\Zulip\ZulipTransportFactory;
158+
use Symfony\Component\Notifier\ChatterInterface;
158159
use Symfony\Component\Notifier\Notifier;
159160
use Symfony\Component\Notifier\Recipient\Recipient;
161+
use Symfony\Component\Notifier\TexterInterface;
160162
use Symfony\Component\Notifier\Transport\TransportFactoryInterface as NotifierTransportFactoryInterface;
161163
use Symfony\Component\PropertyAccess\PropertyAccessor;
162164
use Symfony\Component\PropertyInfo\Extractor\PhpStanExtractor;
@@ -2382,11 +2384,13 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
23822384
$container->getDefinition('chatter.transports')->setArgument(0, $config['chatter_transports']);
23832385
} else {
23842386
$container->removeDefinition('chatter');
2387+
$container->removeAlias(ChatterInterface::class);
23852388
}
23862389
if ($config['texter_transports']) {
23872390
$container->getDefinition('texter.transports')->setArgument(0, $config['texter_transports']);
23882391
} else {
23892392
$container->removeDefinition('texter');
2393+
$container->removeAlias(TexterInterface::class);
23902394
}
23912395

23922396
if ($this->mailerConfigEnabled) {

Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
5151
use Symfony\Component\HttpKernel\Fragment\FragmentUriGeneratorInterface;
5252
use Symfony\Component\Messenger\Transport\TransportFactory;
53+
use Symfony\Component\Notifier\ChatterInterface;
54+
use Symfony\Component\Notifier\TexterInterface;
5355
use Symfony\Component\PropertyAccess\PropertyAccessor;
5456
use Symfony\Component\Security\Core\Security;
5557
use Symfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
@@ -1909,7 +1911,9 @@ public function testNotifierWithoutTransports()
19091911

19101912
$this->assertTrue($container->hasDefinition('notifier'));
19111913
$this->assertFalse($container->hasDefinition('chatter'));
1914+
$this->assertFalse($container->hasAlias(ChatterInterface::class));
19121915
$this->assertFalse($container->hasDefinition('texter'));
1916+
$this->assertFalse($container->hasAlias(TexterInterface::class));
19131917
}
19141918

19151919
public function testIfNotifierTransportsAreKnownByFrameworkExtension()

0 commit comments

Comments
 (0)