Skip to content

[FrameworkBundle] Add basic tests for the notifier framework bundle integration #40844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2021
Merged

[FrameworkBundle] Add basic tests for the notifier framework bundle integration #40844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
<xsd:element name="http-cache" type="http_cache" minOccurs="0" maxOccurs="1" />
<xsd:element name="rate-limiter" type="rate_limiter" minOccurs="0" maxOccurs="1" />
<xsd:element name="uid" type="uid" minOccurs="0" maxOccurs="1" />
<xsd:element name="notifier" type="notifier" minOccurs="0" maxOccurs="1" />
</xsd:choice>

<xsd:attribute name="http-method-override" type="xsd:boolean" />
Expand Down Expand Up @@ -627,6 +628,7 @@
<xsd:element name="envelope" type="mailer_envelope" minOccurs="0" maxOccurs="1" />
<xsd:element name="header" type="header" minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
<xsd:attribute name="enabled" type="xsd:boolean" />
<xsd:attribute name="dsn" type="xsd:string" />
<xsd:attribute name="message-bus" type="xsd:string" />
</xsd:complexType>
Expand Down Expand Up @@ -727,4 +729,42 @@
<xsd:enumeration value="1" />
</xsd:restriction>
</xsd:simpleType>

<xsd:complexType name="notifier">
<xsd:sequence>
<xsd:element name="chatter-transport" type="chatter-transport" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="texter-transport" type="texter-transport" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="channel-policy" type="channel-policy" minOccurs="0" maxOccurs="unbounded" />
<xsd:element name="admin-recipients" type="admin-recipients" minOccurs="0" maxOccurs="1" />
</xsd:sequence>
<xsd:attribute name="enabled" type="xsd:boolean" />
<xsd:attribute name="notification-on-failed-messages" type="xsd:boolean" />
<xsd:attribute name="message-bus" type="xsd:string" />
</xsd:complexType>

<xsd:complexType name="chatter-transport" mixed="true">
<xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>

<xsd:complexType name="texter-transport" mixed="true">
<xsd:attribute name="name" type="xsd:string" use="required"/>
</xsd:complexType>

<xsd:complexType name="channel-policy" mixed="true">
<xsd:sequence>
<xsd:element name="channel" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>

<xsd:complexType name="admin-recipients" mixed="true">
<xsd:sequence>
<xsd:element name="admin-recipient" type="admin-recipient" minOccurs="1" maxOccurs="unbounded" />
</xsd:sequence>
</xsd:complexType>

<xsd:complexType name="admin-recipient" mixed="true">
<xsd:attribute name="email" type="xsd:string" use="required" />
<xsd:attribute name="phone" type="xsd:string" />
</xsd:complexType>
</xsd:schema>
28 changes: 28 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?php

use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;

$container->loadFromExtension('framework', [
'messenger' => null,
'mailer' => [
'dsn' => 'smtp://example.com',
],
'notifier' => [
'enabled' => true,
'notification_on_failed_messages' => true,
'chatter_transports' => [
'slack' => 'null'
],
'texter_transports' => [
'twilio' => 'null'
],
'channel_policy' => [
'low' => ['slack'],
'high' => ['slack', 'twilio'],
],
'admin_recipients' => [
['email' => 'test@test.de', 'phone' => '+490815',],
]
],
]);
30 changes: 30 additions & 0 deletions ...Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_without_mailer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;

$container->loadFromExtension('framework', [
'mailer' => [
'enabled' => false,
],
'messenger' => [
'enabled' => true,
],
'notifier' => [
'enabled' => true,
'notification_on_failed_messages' => true,
'chatter_transports' => [
'slack' => 'null'
],
'texter_transports' => [
'twilio' => 'null'
],
'channel_policy' => [
'low' => ['slack'],
'high' => ['slack', 'twilio'],
],
'admin_recipients' => [
['email' => 'test@test.de', 'phone' => '+490815',],
]
],
]);
30 changes: 30 additions & 0 deletions ...dle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_without_messenger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;

$container->loadFromExtension('framework', [
'mailer' => [
'dsn' => 'smtp://example.com',
],
'messenger' => [
'enabled' => false,
],
'notifier' => [
'enabled' => true,
'notification_on_failed_messages' => true,
'chatter_transports' => [
'slack' => 'null'
],
'texter_transports' => [
'twilio' => 'null'
],
'channel_policy' => [
'low' => ['slack'],
'high' => ['slack', 'twilio'],
],
'admin_recipients' => [
['email' => 'test@test.de', 'phone' => '+490815',],
]
],
]);
10 changes: 10 additions & 0 deletions ...le/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/notifier_without_transports.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\BarMessage;
use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\FooMessage;

$container->loadFromExtension('framework', [
'notifier' => [
'enabled' => true,
],
]);
21 changes: 21 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:messenger enabled="true" />
<framework:mailer dsn="smtp://example.com" />
<framework:notifier enabled="true" notification-on-failed-messages="true">
<framework:chatter-transport name="slack">null</framework:chatter-transport>
<framework:texter-transport name="twilio">null</framework:texter-transport>
<framework:channel-policy name="low">slack</framework:channel-policy>
<framework:channel-policy name="high">twilio</framework:channel-policy>
<framework:admin-recipients>
<framework:admin-recipient email="test@test.de" phone="+490815" />
</framework:admin-recipients>
</framework:notifier>
</framework:config>
</container>
21 changes: 21 additions & 0 deletions ...Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_without_mailer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:mailer enabled="false" />
<framework:messenger enabled="true" />
<framework:notifier enabled="true" notification-on-failed-messages="true">
<framework:chatter-transport name="slack">null</framework:chatter-transport>
<framework:texter-transport name="twilio">null</framework:texter-transport>
<framework:channel-policy name="low">slack</framework:channel-policy>
<framework:channel-policy name="high">twilio</framework:channel-policy>
<framework:admin-recipients>
<framework:admin-recipient email="test@test.de" phone="+490815" />
</framework:admin-recipients>
</framework:notifier>
</framework:config>
</container>
21 changes: 21 additions & 0 deletions ...dle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_without_messenger.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:mailer dsn="smtp://example.com" />
<framework:messenger enabled="false" />
<framework:notifier enabled="true" notification-on-failed-messages="true">
<framework:chatter-transport name="slack">null</framework:chatter-transport>
<framework:texter-transport name="twilio">null</framework:texter-transport>
<framework:channel-policy name="low">slack</framework:channel-policy>
<framework:channel-policy name="high">twilio</framework:channel-policy>
<framework:admin-recipients>
<framework:admin-recipient email="test@test.de" phone="+490815" />
</framework:admin-recipients>
</framework:notifier>
</framework:config>
</container>
11 changes: 11 additions & 0 deletions ...le/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/notifier_without_transports.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<container xmlns="http://symfony.com/schema/dic/services"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:framework="http://symfony.com/schema/dic/symfony"
xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">

<framework:config>
<framework:notifier enabled="true"></framework:notifier>
</framework:config>
</container>
16 changes: 16 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
framework:
messenger: ~
mailer:
dsn: 'smtp://example.com'
notifier:
enabled: true
notification_on_failed_messages: true
chatter_transports:
slack: 'null'
texter_transports:
twilio: 'null'
channel_policy:
low: ['slack']
high: ['slack', 'twilio']
admin_recipients:
- { email: 'test@test.de', phone: '+490815' }
17 changes: 17 additions & 0 deletions ...Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_without_mailer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
framework:
mailer:
enabled: false
messenger:
enabled: true
notifier:
enabled: true
notification_on_failed_messages: true
chatter_transports:
slack: 'null'
texter_transports:
twilio: 'null'
channel_policy:
low: ['slack']
high: ['slack', 'twilio']
admin_recipients:
- { email: 'test@test.de', phone: '+490815' }
17 changes: 17 additions & 0 deletions ...dle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_without_messenger.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
framework:
mailer:
dsn: 'smtp://example.com'
messenger:
enabled: false
notifier:
enabled: true
notification_on_failed_messages: true
chatter_transports:
slack: 'null'
texter_transports:
twilio: 'null'
channel_policy:
low: ['slack']
high: ['slack', 'twilio']
admin_recipients:
- { email: 'test@test.de', phone: '+490815' }
3 changes: 3 additions & 0 deletions ...le/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/notifier_without_transports.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
framework:
notifier:
enabled: true
37 changes: 37 additions & 0 deletions src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1836,6 +1836,43 @@ public function testRegisterParameterCollectingBehaviorDescribingTags()
], $container->getParameter('container.behavior_describing_tags'));
}

public function testNotifierWithoutMailer()
{
$container = $this->createContainerFromFile('notifier_without_mailer');

$this->assertFalse($container->hasDefinition('notifier.channel.email'));
}

public function testNotifierWithoutMessenger()
{
$container = $this->createContainerFromFile('notifier_without_messenger');

$this->assertFalse($container->getDefinition('notifier.failed_message_listener')->hasTag('kernel.event_subscriber'));
}

public function testNotifierWithMailerAndMessenger()
{
$container = $this->createContainerFromFile('notifier');

$this->assertTrue($container->hasDefinition('notifier'));
$this->assertTrue($container->hasDefinition('chatter'));
$this->assertTrue($container->hasDefinition('texter'));
$this->assertTrue($container->hasDefinition('notifier.channel.chat'));
$this->assertTrue($container->hasDefinition('notifier.channel.email'));
$this->assertTrue($container->hasDefinition('notifier.channel.sms'));
$this->assertTrue($container->hasDefinition('notifier.channel_policy'));
$this->assertTrue($container->getDefinition('notifier.failed_message_listener')->hasTag('kernel.event_subscriber'));
}

public function testNotifierWithoutTransports()
{
$container = $this->createContainerFromFile('notifier_without_transports');

$this->assertTrue($container->hasDefinition('notifier'));
$this->assertFalse($container->hasDefinition('chatter'));
$this->assertFalse($container->hasDefinition('texter'));
}

protected function createContainer(array $data = [])
{
return new ContainerBuilder(new EnvPlaceholderParameterBag(array_merge([
Expand Down
1 change: 1 addition & 0 deletions src/Symfony/Bundle/FrameworkBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"symfony/mailer": "^5.2",
"symfony/messenger": "^5.2",
"symfony/mime": "^4.4|^5.0",
"symfony/notifier": "^5.3",
"symfony/process": "^4.4|^5.0",
"symfony/rate-limiter": "^5.2",
"symfony/security-bundle": "^5.3",
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy