Merge pull request #10 from nucleos/patch-from

Make from mail optional
nucleos · Jan 31, 2020 · 25fcde5 · 25fcde5
2 parents 17d9f78 + 4bc7427
commit 25fcde5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -25,3 +25,8 @@ parameters:
 			count: 3
 			path: src/DependencyInjection/Configuration.php
 
+		-
+			message: "#^Return type \\(array\\<string\\>\\) of method Nucleos\\\\ProfileBundle\\\\EventListener\\\\AlreadyLoggedinListener\\:\\:getSubscribedEvents\\(\\) should be covariant with return type \\(array\\<string, array\\<int\\|string, array\\<int\\|string, int\\|string\\>\\|int\\|string\\>\\|string\\>\\) of method Symfony\\\\Component\\\\EventDispatcher\\\\EventSubscriberInterface\\:\\:getSubscribedEvents\\(\\)$#"
+			count: 1
+			path: src/EventListener/AlreadyLoggedinListener.php
+
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -63,7 +63,7 @@ private function addRegistrationSection(ArrayNodeDefinition $node): void
                             ->addDefaultsIfNotSet()
                             ->children()
                                 ->booleanNode('enabled')->defaultFalse()->end()
-                                ->scalarNode('from_email')->isRequired()->cannotBeEmpty()->end()
+                                ->scalarNode('from_email')->defaultNull()->end()
                             ->end()
                         ->end()
                     ->end()

diff --git a/src/Mailer/Mailer.php b/src/Mailer/Mailer.php
@@ -37,15 +37,15 @@ final class Mailer implements MailerInterface
     private $router;
 
     /**
-     * @var string
+     * @var string|null
      */
     private $fromEmail;
 
     public function __construct(
         SymfonyMailer $mailer,
         TranslatorInterface $translator,
         UrlGeneratorInterface $router,
-        string $fromEmail
+        ?string $fromEmail
     ) {
         $this->mailer     = $mailer;
         $this->translator = $translator;
@@ -65,7 +65,6 @@ public function sendConfirmationEmailMessage(UserInterface $user): void
         );
 
         $mail = (new ResettingMail())
-            ->from(Address::fromString($this->fromEmail))
             ->to(new Address($user->getEmail()))
             ->subject($this->translator->trans('registration.email.subject', [
                 '%username%' => $user->getUsername(),
@@ -74,6 +73,10 @@ public function sendConfirmationEmailMessage(UserInterface $user): void
             ->setConfirmationUrl($url)
         ;
 
+        if (null !== $this->fromEmail) {
+            $mail->from(Address::fromString($this->fromEmail));
+        }
+
         $this->mailer->send($mail);
     }
 }
diff --git a/tests/DependencyInjection/NucleosProfileExtensionTest.php b/tests/DependencyInjection/NucleosProfileExtensionTest.php
@@ -74,8 +74,7 @@ private function createEmptyConfiguration(): void
     {
         $this->configuration = new ContainerBuilder();
         $loader              = new NucleosProfileExtension();
-        $config              = $this->getEmptyConfig();
-        $loader->load([$config], $this->configuration);
+        $loader->load([], $this->configuration);
         static::assertInstanceOf(ContainerBuilder::class, $this->configuration);
     }
 
@@ -88,21 +87,6 @@ private function createFullConfiguration(): void
         static::assertInstanceOf(ContainerBuilder::class, $this->configuration);
     }
 
-    /**
-     * @return array<mixed>
-     */
-    private function getEmptyConfig(): array
-    {
-        $yaml   = <<<'EOF'
-registration:
-    confirmation:
-        from_email: register@acme.org
-EOF;
-        $parser = new Parser();
-
-        return $parser->parse($yaml);
-    }
-
     /**
      * @return array<mixed>
      */