Skip to content

Commit 5de54a5

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '5.4' into 6.0
* 5.4: [FrameworkBundle] deprecate notifier service aliases that dont follow the convention
2 parents e1e64d3 + b99965d commit 5de54a5

File tree

3 files changed

+33
-49
lines changed

3 files changed

+33
-49
lines changed

‎DependencyInjection/FrameworkExtension.php‎

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2402,42 +2402,42 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
24022402

24032403
$classToServices = [
24042404
AllMySmsTransportFactory::class => 'notifier.transport_factory.all-my-sms',
2405-
AmazonSnsTransportFactory::class => 'notifier.transport_factory.amazonsns',
2405+
AmazonSnsTransportFactory::class => 'notifier.transport_factory.amazon-sns',
24062406
ClickatellTransportFactory::class => 'notifier.transport_factory.clickatell',
24072407
DiscordTransportFactory::class => 'notifier.transport_factory.discord',
24082408
EsendexTransportFactory::class => 'notifier.transport_factory.esendex',
24092409
ExpoTransportFactory::class => 'notifier.transport_factory.expo',
2410-
FakeChatTransportFactory::class => 'notifier.transport_factory.fakechat',
2411-
FakeSmsTransportFactory::class => 'notifier.transport_factory.fakesms',
2410+
FakeChatTransportFactory::class => 'notifier.transport_factory.fake-chat',
2411+
FakeSmsTransportFactory::class => 'notifier.transport_factory.fake-sms',
24122412
FirebaseTransportFactory::class => 'notifier.transport_factory.firebase',
2413-
FreeMobileTransportFactory::class => 'notifier.transport_factory.freemobile',
2413+
FreeMobileTransportFactory::class => 'notifier.transport_factory.free-mobile',
24142414
GatewayApiTransportFactory::class => 'notifier.transport_factory.gateway-api',
24152415
GitterTransportFactory::class => 'notifier.transport_factory.gitter',
2416-
GoogleChatTransportFactory::class => 'notifier.transport_factory.googlechat',
2416+
GoogleChatTransportFactory::class => 'notifier.transport_factory.google-chat',
24172417
InfobipTransportFactory::class => 'notifier.transport_factory.infobip',
24182418
IqsmsTransportFactory::class => 'notifier.transport_factory.iqsms',
2419-
LightSmsTransportFactory::class => 'notifier.transport_factory.lightsms',
2420-
LinkedInTransportFactory::class => 'notifier.transport_factory.linkedin',
2419+
LightSmsTransportFactory::class => 'notifier.transport_factory.light-sms',
2420+
LinkedInTransportFactory::class => 'notifier.transport_factory.linked-in',
24212421
MailjetNotifierTransportFactory::class => 'notifier.transport_factory.mailjet',
24222422
MattermostTransportFactory::class => 'notifier.transport_factory.mattermost',
24232423
MercureTransportFactory::class => 'notifier.transport_factory.mercure',
2424-
MessageBirdTransport::class => 'notifier.transport_factory.messagebird',
2425-
MessageMediaTransportFactory::class => 'notifier.transport_factory.messagemedia',
2426-
MicrosoftTeamsTransportFactory::class => 'notifier.transport_factory.microsoftteams',
2424+
MessageBirdTransport::class => 'notifier.transport_factory.message-bird',
2425+
MessageMediaTransportFactory::class => 'notifier.transport_factory.message-media',
2426+
MicrosoftTeamsTransportFactory::class => 'notifier.transport_factory.microsoft-teams',
24272427
MobytTransportFactory::class => 'notifier.transport_factory.mobyt',
24282428
NexmoTransportFactory::class => 'notifier.transport_factory.nexmo',
24292429
OctopushTransportFactory::class => 'notifier.transport_factory.octopush',
2430-
OneSignalTransportFactory::class => 'notifier.transport_factory.onesignal',
2431-
OvhCloudTransportFactory::class => 'notifier.transport_factory.ovhcloud',
2432-
RocketChatTransportFactory::class => 'notifier.transport_factory.rocketchat',
2430+
OneSignalTransportFactory::class => 'notifier.transport_factory.one-signal',
2431+
OvhCloudTransportFactory::class => 'notifier.transport_factory.ovh-cloud',
2432+
RocketChatTransportFactory::class => 'notifier.transport_factory.rocket-chat',
24332433
SendinblueNotifierTransportFactory::class => 'notifier.transport_factory.sendinblue',
24342434
SinchTransportFactory::class => 'notifier.transport_factory.sinch',
24352435
SlackTransportFactory::class => 'notifier.transport_factory.slack',
24362436
Sms77TransportFactory::class => 'notifier.transport_factory.sms77',
24372437
SmsapiTransportFactory::class => 'notifier.transport_factory.smsapi',
2438-
SmsBiurasTransportFactory::class => 'notifier.transport_factory.smsbiuras',
2438+
SmsBiurasTransportFactory::class => 'notifier.transport_factory.sms-biuras',
24392439
SmscTransportFactory::class => 'notifier.transport_factory.smsc',
2440-
SpotHitTransportFactory::class => 'notifier.transport_factory.spothit',
2440+
SpotHitTransportFactory::class => 'notifier.transport_factory.spot-hit',
24412441
TelegramTransportFactory::class => 'notifier.transport_factory.telegram',
24422442
TelnyxTransportFactory::class => 'notifier.transport_factory.telnyx',
24432443
TurboSmsTransport::class => 'notifier.transport_factory.turbo-sms',
@@ -2449,24 +2449,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
24492449
$parentPackages = ['symfony/framework-bundle', 'symfony/notifier'];
24502450

24512451
foreach ($classToServices as $class => $service) {
2452-
switch ($package = substr($service, \strlen('notifier.transport_factory.'))) {
2453-
case 'amazonsns': $package = 'amazon-sns'; break;
2454-
case 'fakechat': $package = 'fake-chat'; break;
2455-
case 'fakesms': $package = 'fake-sms'; break;
2456-
case 'freemobile': $package = 'free-mobile'; break;
2457-
case 'googlechat': $package = 'google-chat'; break;
2458-
case 'lightsms': $package = 'light-sms'; break;
2459-
case 'linkedin': $package = 'linked-in'; break;
2460-
case 'messagebird': $package = 'message-bird'; break;
2461-
case 'messagemedia': $package = 'message-media'; break;
2462-
case 'microsoftteams': $package = 'microsoft-teams'; break;
2463-
case 'onesignal': $package = 'one-signal'; break;
2464-
case 'ovhcloud': $package = 'ovh-cloud'; break;
2465-
case 'rocketchat': $package = 'rocket-chat'; break;
2466-
case 'smsbiuras': $package = 'sms-biuras'; break;
2467-
case 'spothit': $package = 'spot-hit'; break;
2468-
case 'turbosms': $package = 'turbo-sms'; break;
2469-
}
2452+
$package = substr($service, \strlen('notifier.transport_factory.'));
24702453

24712454
if (!ContainerBuilder::willBeAvailable(sprintf('symfony/%s-notifier', $package), $class, $parentPackages)) {
24722455
$container->removeDefinition($service);

‎Resources/config/notifier_transports.php‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959

6060
return static function (ContainerConfigurator $container) {
6161
$container->services()
62+
6263
->set('notifier.transport_factory.abstract', AbstractTransportFactory::class)
6364
->abstract()
6465
->args([service('event_dispatcher'), service('http_client')->ignoreOnInvalid()])
@@ -67,7 +68,7 @@
6768
->parent('notifier.transport_factory.abstract')
6869
->tag('chatter.transport_factory')
6970

70-
->set('notifier.transport_factory.linkedin', LinkedInTransportFactory::class)
71+
->set('notifier.transport_factory.linked-in', LinkedInTransportFactory::class)
7172
->parent('notifier.transport_factory.abstract')
7273
->tag('chatter.transport_factory')
7374

@@ -83,11 +84,11 @@
8384
->parent('notifier.transport_factory.abstract')
8485
->tag('texter.transport_factory')
8586

86-
->set('notifier.transport_factory.rocketchat', RocketChatTransportFactory::class)
87+
->set('notifier.transport_factory.rocket-chat', RocketChatTransportFactory::class)
8788
->parent('notifier.transport_factory.abstract')
8889
->tag('chatter.transport_factory')
8990

90-
->set('notifier.transport_factory.googlechat', GoogleChatTransportFactory::class)
91+
->set('notifier.transport_factory.google-chat', GoogleChatTransportFactory::class)
9192
->parent('notifier.transport_factory.abstract')
9293
->tag('chatter.transport_factory')
9394

@@ -103,23 +104,23 @@
103104
->parent('notifier.transport_factory.abstract')
104105
->tag('chatter.transport_factory')
105106

106-
->set('notifier.transport_factory.freemobile', FreeMobileTransportFactory::class)
107+
->set('notifier.transport_factory.free-mobile', FreeMobileTransportFactory::class)
107108
->parent('notifier.transport_factory.abstract')
108109
->tag('texter.transport_factory')
109110

110-
->set('notifier.transport_factory.spothit', SpotHitTransportFactory::class)
111+
->set('notifier.transport_factory.spot-hit', SpotHitTransportFactory::class)
111112
->parent('notifier.transport_factory.abstract')
112113
->tag('texter.transport_factory')
113114

114-
->set('notifier.transport_factory.fakechat', FakeChatTransportFactory::class)
115+
->set('notifier.transport_factory.fake-chat', FakeChatTransportFactory::class)
115116
->parent('notifier.transport_factory.abstract')
116117
->tag('chatter.transport_factory')
117118

118-
->set('notifier.transport_factory.fakesms', FakeSmsTransportFactory::class)
119+
->set('notifier.transport_factory.fake-sms', FakeSmsTransportFactory::class)
119120
->parent('notifier.transport_factory.abstract')
120121
->tag('texter.transport_factory')
121122

122-
->set('notifier.transport_factory.ovhcloud', OvhCloudTransportFactory::class)
123+
->set('notifier.transport_factory.ovh-cloud', OvhCloudTransportFactory::class)
123124
->parent('notifier.transport_factory.abstract')
124125
->tag('texter.transport_factory')
125126

@@ -163,7 +164,7 @@
163164
->parent('notifier.transport_factory.abstract')
164165
->tag('chatter.transport_factory')
165166

166-
->set('notifier.transport_factory.microsoftteams', MicrosoftTeamsTransportFactory::class)
167+
->set('notifier.transport_factory.microsoft-teams', MicrosoftTeamsTransportFactory::class)
167168
->parent('notifier.transport_factory.abstract')
168169
->tag('chatter.transport_factory')
169170

@@ -183,7 +184,7 @@
183184
->parent('notifier.transport_factory.abstract')
184185
->tag('texter.transport_factory')
185186

186-
->set('notifier.transport_factory.amazonsns', AmazonSnsTransportFactory::class)
187+
->set('notifier.transport_factory.amazon-sns', AmazonSnsTransportFactory::class)
187188
->parent('notifier.transport_factory.abstract')
188189
->tag('texter.transport_factory')
189190
->tag('chatter.transport_factory')
@@ -193,23 +194,23 @@
193194
->tag('chatter.transport_factory')
194195
->tag('texter.transport_factory')
195196

196-
->set('notifier.transport_factory.lightsms', LightSmsTransportFactory::class)
197+
->set('notifier.transport_factory.light-sms', LightSmsTransportFactory::class)
197198
->parent('notifier.transport_factory.abstract')
198199
->tag('texter.transport_factory')
199200

200-
->set('notifier.transport_factory.smsbiuras', SmsBiurasTransportFactory::class)
201+
->set('notifier.transport_factory.sms-biuras', SmsBiurasTransportFactory::class)
201202
->parent('notifier.transport_factory.abstract')
202203
->tag('texter.transport_factory')
203204

204205
->set('notifier.transport_factory.smsc', SmscTransportFactory::class)
205206
->parent('notifier.transport_factory.abstract')
206207
->tag('texter.transport_factory')
207208

208-
->set('notifier.transport_factory.messagebird', MessageBirdTransportFactory::class)
209+
->set('notifier.transport_factory.message-bird', MessageBirdTransportFactory::class)
209210
->parent('notifier.transport_factory.abstract')
210211
->tag('texter.transport_factory')
211212

212-
->set('notifier.transport_factory.messagemedia', MessageMediaTransportFactory::class)
213+
->set('notifier.transport_factory.message-media', MessageMediaTransportFactory::class)
213214
->parent('notifier.transport_factory.abstract')
214215
->tag('texter.transport_factory')
215216

@@ -233,7 +234,7 @@
233234
->parent('notifier.transport_factory.abstract')
234235
->tag('texter.transport_factory')
235236

236-
->set('notifier.transport_factory.onesignal', OneSignalTransportFactory::class)
237+
->set('notifier.transport_factory.one-signal', OneSignalTransportFactory::class)
237238
->parent('notifier.transport_factory.abstract')
238239
->tag('texter.transport_factory')
239240

‎Tests/DependencyInjection/FrameworkExtensionTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1872,7 +1872,7 @@ public function testIfNotifierTransportsAreKnownByFrameworkExtension()
18721872
$container = $this->createContainerFromFile('notifier');
18731873

18741874
foreach ((new Finder())->in(\dirname(__DIR__, 4).'/Component/Notifier/Bridge')->directories()->depth(0)->exclude('Mercure') as $bridgeDirectory) {
1875-
$transportFactoryName = strtolower($bridgeDirectory->getFilename());
1875+
$transportFactoryName = strtolower(preg_replace('/(.)([A-Z])/', '$1-$2', $bridgeDirectory->getFilename()));
18761876
$this->assertTrue($container->hasDefinition('notifier.transport_factory.'.$transportFactoryName), sprintf('Did you forget to add the TransportFactory: "%s" to the $classToServices array in the FrameworkBundleExtension?', $bridgeDirectory->getFilename()));
18771877
}
18781878
}

0 commit comments

Comments
 (0)