Skip to content

Commit 37b8158

Browse files
committed
Remove "from_email" default values
1 parent d01739f commit 37b8158

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

DependencyInjection/Configuration.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ public function getConfigTreeBuilder()
5555
->booleanNode('use_flash_notifications')->defaultTrue()->end()
5656
->booleanNode('use_username_form_type')->defaultTrue()->end()
5757
->arrayNode('from_email')
58-
->addDefaultsIfNotSet()
58+
->isRequired()
5959
->children()
60-
->scalarNode('address')->defaultValue('webmaster@example.com')->cannotBeEmpty()->end()
61-
->scalarNode('sender_name')->defaultValue('webmaster')->cannotBeEmpty()->end()
60+
->scalarNode('address')->isRequired()->cannotBeEmpty()->end()
61+
->scalarNode('sender_name')->isRequired()->cannotBeEmpty()->end()
6262
->end()
6363
->end()
6464
->end()

Tests/DependencyInjection/FOSUserExtensionTest.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ public function testUserLoadConfirmationEmailWithDefaults()
244244
$this->createEmptyConfiguration();
245245

246246
$this->assertParameter(false, 'fos_user.registration.confirmation.enabled');
247-
$this->assertParameter(array('webmaster@example.com' => 'webmaster'), 'fos_user.registration.confirmation.from_email');
247+
$this->assertParameter(array('admin@acme.org' => 'Acme Corp'), 'fos_user.registration.confirmation.from_email');
248248
$this->assertParameter('@FOSUser/Registration/email.txt.twig', 'fos_user.registration.confirmation.template');
249249
$this->assertParameter('@FOSUser/Resetting/email.txt.twig', 'fos_user.resetting.email.template');
250-
$this->assertParameter(array('webmaster@example.com' => 'webmaster'), 'fos_user.resetting.email.from_email');
250+
$this->assertParameter(array('admin@acme.org' => 'Acme Corp'), 'fos_user.resetting.email.from_email');
251251
$this->assertParameter(86400, 'fos_user.resetting.token_ttl');
252252
}
253253

@@ -366,6 +366,9 @@ protected function getEmptyConfig()
366366
db_driver: mongodb
367367
firewall_name: fos_user
368368
user_class: Acme\MyBundle\Document\User
369+
from_email:
370+
address: admin@acme.org
371+
sender_name: Acme Corp
369372
EOF;
370373
$parser = new Parser();
371374

0 commit comments

Comments
 (0)