Skip to content

Commit ac1e0f4

Browse files
Merge branch '6.4' into 7.0
* 6.4: More go-ip fixes [AssetMapper] Fixing bug where a circular exception could be thrown while making error message Dump Valid constaints on debug command #46544 [DependencyInjection] fix dump xml with array/object/enum default value fix directory casing rename GoIP notifier bridge to GopIp [HttpFoundation] Add a slightly more verbose comment about a warning on UploadedFile [Messenger] BatchHandlerTrait - fix phpdoc typo [SecurityBundle] Remove unused test files Allow passing an `inline_service` to a `service_locator` [Security] Fix error with lock_factory in login_throttling fix(console): fix section output when multiples section with max height Remove me from CODEOWNERS Fix invalid method call + improve exception message Always return bool from messenger amqp conncetion nack [FrameworkBundle] Fix xsd handle-all-throwables [Console] Fix linewraps in OutputFormatter
2 parents e47e726 + 2851861 commit ac1e0f4

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2715,7 +2715,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
27152715
NotifierBridge\FreeMobile\FreeMobileTransportFactory::class => 'notifier.transport_factory.free-mobile',
27162716
NotifierBridge\GatewayApi\GatewayApiTransportFactory::class => 'notifier.transport_factory.gateway-api',
27172717
NotifierBridge\Gitter\GitterTransportFactory::class => 'notifier.transport_factory.gitter',
2718-
NotifierBridge\GoIP\GoIPTransportFactory::class => 'notifier.transport_factory.goip',
2718+
NotifierBridge\GoIp\GoIpTransportFactory::class => 'notifier.transport_factory.go-ip',
27192719
NotifierBridge\GoogleChat\GoogleChatTransportFactory::class => 'notifier.transport_factory.google-chat',
27202720
NotifierBridge\Infobip\InfobipTransportFactory::class => 'notifier.transport_factory.infobip',
27212721
NotifierBridge\Iqsms\IqsmsTransportFactory::class => 'notifier.transport_factory.iqsms',

Resources/config/notifier_transports.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@
299299
->set('notifier.transport_factory.redlink', Bridge\Redlink\RedlinkTransportFactory::class)
300300
->parent('notifier.transport_factory.abstract')
301301
->tag('texter.transport_factory')
302-
->set('notifier.transport_factory.goip', Bridge\GoIP\GoIPTransportFactory::class)
302+
->set('notifier.transport_factory.go-ip', Bridge\GoIp\GoIpTransportFactory::class)
303303
->parent('notifier.transport_factory.abstract')
304304
->tag('texter.transport_factory')
305305
;

Resources/config/schema/symfony-1.0.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
</xsd:choice>
4949

5050
<xsd:attribute name="http-method-override" type="xsd:boolean" />
51+
<xsd:attribute name="handle-all-throwables" type="xsd:boolean" />
5152
<xsd:attribute name="trust-x-sendfile-type-header" type="xsd:boolean" />
5253
<xsd:attribute name="ide" type="xsd:string" />
5354
<xsd:attribute name="secret" type="xsd:string" />

0 commit comments

Comments
 (0)