Skip to content

Commit 0b9eb17

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: (35 commits) fix: Improve FR validators translation [Notifier] Add push channel to notifier Fix CS [Lock] Split PdoStore into DoctrineDbalStore [Cache] Split PdoAdapter into DoctrineDbalAdapter Add swedish translation for issue #43458 [HttpClient] fix collecting debug info on destruction of CurlResponse Fix CS added missing thai translations Add missing translations for Chinese (zh_TW) [DependencyInjection] fix "url" env var processor update translation [Serializer] symfony#36594 attributes cache breaks normalization Remove untranslated translation for Afrikaans [Validator] Add missing validator polish translation [Security,Validator] Added missing Latvian translations #41053 Add the missing translations for Indonesian (id) [Validator] Add missing Lithuanian translation [Validator] Add missing Czech translation replace "ispravna" with "važeća" in translating "valid HTML/CSS" ...
2 parents 58dc2e7 + 40c16ed commit 0b9eb17

File tree

4 files changed

+32
-0
lines changed

4 files changed

+32
-0
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
use Symfony\Component\DependencyInjection\Parameter;
6060
use Symfony\Component\DependencyInjection\Reference;
6161
use Symfony\Component\DependencyInjection\ServiceLocator;
62+
use Symfony\Component\Dotenv\Command\DebugCommand;
6263
use Symfony\Component\EventDispatcher\Attribute\AsEventListener;
6364
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
6465
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
@@ -134,6 +135,7 @@
134135
use Symfony\Component\Notifier\Bridge\Mobyt\MobytTransportFactory;
135136
use Symfony\Component\Notifier\Bridge\Nexmo\NexmoTransportFactory;
136137
use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
138+
use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
137139
use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
138140
use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
139141
use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory as SendinblueNotifierTransportFactory;
@@ -251,6 +253,10 @@ public function load(array $configs, ContainerBuilder $container)
251253
if (!class_exists(BaseYamlLintCommand::class)) {
252254
$container->removeDefinition('console.command.yaml_lint');
253255
}
256+
257+
if (!class_exists(DebugCommand::class)) {
258+
$container->removeDefinition('console.command.dotenv_debug');
259+
}
254260
}
255261

256262
// Load Cache configuration first as it is used by other components
@@ -2366,6 +2372,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
23662372
$container->getDefinition('notifier.channel.email')->setArgument(0, null);
23672373
}
23682374
$container->getDefinition('notifier.channel.sms')->setArgument(0, null);
2375+
$container->getDefinition('notifier.channel.push')->setArgument(0, null);
23692376
}
23702377

23712378
$container->getDefinition('notifier.channel_policy')->setArgument(0, $config['channel_policy']);
@@ -2402,6 +2409,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
24022409
MobytTransportFactory::class => 'notifier.transport_factory.mobyt',
24032410
NexmoTransportFactory::class => 'notifier.transport_factory.nexmo',
24042411
OctopushTransportFactory::class => 'notifier.transport_factory.octopush',
2412+
OneSignalTransportFactory::class => 'notifier.transport_factory.onesignal',
24052413
OvhCloudTransportFactory::class => 'notifier.transport_factory.ovhcloud',
24062414
RocketChatTransportFactory::class => 'notifier.transport_factory.rocketchat',
24072415
SendinblueNotifierTransportFactory::class => 'notifier.transport_factory.sendinblue',
@@ -2434,6 +2442,7 @@ private function registerNotifierConfiguration(array $config, ContainerBuilder $
24342442
case 'messagebird': $package = 'message-bird'; break;
24352443
case 'messagemedia': $package = 'message-media'; break;
24362444
case 'microsoftteams': $package = 'microsoft-teams'; break;
2445+
case 'onesignal': $package = 'one-signal'; break;
24372446
case 'ovhcloud': $package = 'ovh-cloud'; break;
24382447
case 'rocketchat': $package = 'rocket-chat'; break;
24392448
case 'smsbiuras': $package = 'sms-biuras'; break;

Resources/config/console.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
use Symfony\Bundle\FrameworkBundle\Command\YamlLintCommand;
4040
use Symfony\Bundle\FrameworkBundle\EventListener\SuggestMissingPackageSubscriber;
4141
use Symfony\Component\Console\EventListener\ErrorListener;
42+
use Symfony\Component\Dotenv\Command\DebugCommand as DotenvDebugCommand;
4243
use Symfony\Component\Messenger\Command\ConsumeMessagesCommand;
4344
use Symfony\Component\Messenger\Command\DebugCommand;
4445
use Symfony\Component\Messenger\Command\FailedMessagesRemoveCommand;
@@ -129,6 +130,13 @@
129130
])
130131
->tag('console.command')
131132

133+
->set('console.command.dotenv_debug', DotenvDebugCommand::class)
134+
->args([
135+
param('kernel.environment'),
136+
param('kernel.project_dir'),
137+
])
138+
->tag('console.command')
139+
132140
->set('console.command.event_dispatcher_debug', EventDispatcherDebugCommand::class)
133141
->args([
134142
tagged_locator('event_dispatcher.dispatcher', 'name'),

Resources/config/notifier.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@
1616
use Symfony\Component\Notifier\Channel\ChannelPolicy;
1717
use Symfony\Component\Notifier\Channel\ChatChannel;
1818
use Symfony\Component\Notifier\Channel\EmailChannel;
19+
use Symfony\Component\Notifier\Channel\PushChannel;
1920
use Symfony\Component\Notifier\Channel\SmsChannel;
2021
use Symfony\Component\Notifier\Chatter;
2122
use Symfony\Component\Notifier\ChatterInterface;
2223
use Symfony\Component\Notifier\EventListener\NotificationLoggerListener;
2324
use Symfony\Component\Notifier\EventListener\SendFailedMessageToNotifierListener;
2425
use Symfony\Component\Notifier\Message\ChatMessage;
26+
use Symfony\Component\Notifier\Message\PushMessage;
2527
use Symfony\Component\Notifier\Message\SmsMessage;
2628
use Symfony\Component\Notifier\Messenger\MessageHandler;
2729
use Symfony\Component\Notifier\Notifier;
@@ -57,6 +59,10 @@
5759
->args([service('mailer.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
5860
->tag('notifier.channel', ['channel' => 'email'])
5961

62+
->set('notifier.channel.push', PushChannel::class)
63+
->args([service('texter.transports'), service('messenger.default_bus')->ignoreOnInvalid()])
64+
->tag('notifier.channel', ['channel' => 'push'])
65+
6066
->set('notifier.monolog_handler', NotifierHandler::class)
6167
->args([service('notifier')])
6268

@@ -103,6 +109,10 @@
103109
->args([service('texter.transports')])
104110
->tag('messenger.message_handler', ['handles' => SmsMessage::class])
105111

112+
->set('texter.messenger.push_handler', MessageHandler::class)
113+
->args([service('texter.transports')])
114+
->tag('messenger.message_handler', ['handles' => PushMessage::class])
115+
106116
->set('notifier.logger_notification_listener', NotificationLoggerListener::class)
107117
->tag('kernel.event_subscriber')
108118
;

Resources/config/notifier_transports.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
use Symfony\Component\Notifier\Bridge\Mobyt\MobytTransportFactory;
3737
use Symfony\Component\Notifier\Bridge\Nexmo\NexmoTransportFactory;
3838
use Symfony\Component\Notifier\Bridge\Octopush\OctopushTransportFactory;
39+
use Symfony\Component\Notifier\Bridge\OneSignal\OneSignalTransportFactory;
3940
use Symfony\Component\Notifier\Bridge\OvhCloud\OvhCloudTransportFactory;
4041
use Symfony\Component\Notifier\Bridge\RocketChat\RocketChatTransportFactory;
4142
use Symfony\Component\Notifier\Bridge\Sendinblue\SendinblueTransportFactory;
@@ -230,5 +231,9 @@
230231
->set('notifier.transport_factory.sms77', Sms77TransportFactory::class)
231232
->parent('notifier.transport_factory.abstract')
232233
->tag('texter.transport_factory')
234+
235+
->set('notifier.transport_factory.onesignal', OneSignalTransportFactory::class)
236+
->parent('notifier.transport_factory.abstract')
237+
->tag('texter.transport_factory')
233238
;
234239
};

0 commit comments

Comments
 (0)