removed mailer implementations

kimai · Mar 17, 2020 · a52680e · a52680e
1 parent 80bd012
commit a52680e
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 605 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+### 1.1
+
+- cleanup and bump composer dependencies
+- removed mailer implementations: `twig` and `swiftmailer` (using Noop by default, configure your own!)
+
 ### 1.0
 
 - changed package name to `kimai/user-bundle`

diff --git a/DependencyInjection/Compiler/CheckForMailerPass.php b/DependencyInjection/Compiler/CheckForMailerPass.php
diff --git a/FOSUserBundle.php b/FOSUserBundle.php
@@ -12,7 +12,6 @@
 namespace FOS\UserBundle;
 
 use Doctrine\Bundle\DoctrineBundle\DependencyInjection\Compiler\DoctrineOrmMappingsPass;
-use FOS\UserBundle\DependencyInjection\Compiler\CheckForMailerPass;
 use FOS\UserBundle\DependencyInjection\Compiler\CheckForSessionPass;
 use FOS\UserBundle\DependencyInjection\Compiler\InjectRememberMeServicesPass;
 use FOS\UserBundle\DependencyInjection\Compiler\InjectUserCheckerPass;
@@ -33,7 +32,6 @@ public function build(ContainerBuilder $container)
         $container->addCompilerPass(new InjectUserCheckerPass());
         $container->addCompilerPass(new InjectRememberMeServicesPass());
         $container->addCompilerPass(new CheckForSessionPass());
-        $container->addCompilerPass(new CheckForMailerPass());
 
         $this->addRegisterMappingsPass($container);
     }

diff --git a/Mailer/Mailer.php b/Mailer/Mailer.php
diff --git a/Mailer/TwigSwiftMailer.php b/Mailer/TwigSwiftMailer.php
diff --git a/Resources/config/mailer.xml b/Resources/config/mailer.xml
@@ -16,39 +16,7 @@
     </parameters>
 
     <services>
-        <service id="fos_user.mailer.default" class="FOS\UserBundle\Mailer\Mailer" public="false">
-            <argument type="service" id="mailer" />
-            <argument type="service" id="router" />
-            <argument type="service" id="templating" />
-            <argument type="collection">
-                <argument key="confirmation.template">%fos_user.registration.confirmation.template%</argument>
-                <argument key="resetting.template">%fos_user.resetting.email.template%</argument>
-                <argument key="from_email" type="collection">
-                    <argument key="confirmation">%fos_user.registration.confirmation.from_email%</argument>
-                    <argument key="resetting">%fos_user.resetting.email.from_email%</argument>
-                </argument>
-            </argument>
-            <tag name="fos_user.requires_swift" />
-        </service>
-
-        <service id="fos_user.mailer.twig_swift" class="FOS\UserBundle\Mailer\TwigSwiftMailer" public="false">
-            <argument type="service" id="mailer" />
-            <argument type="service" id="router" />
-            <argument type="service" id="twig" />
-            <argument type="collection">
-                <argument key="template" type="collection">
-                    <argument key="confirmation">%fos_user.registration.confirmation.template%</argument>
-                    <argument key="resetting">%fos_user.resetting.email.template%</argument>
-                </argument>
-                <argument key="from_email" type="collection">
-                    <argument key="confirmation">%fos_user.registration.confirmation.from_email%</argument>
-                    <argument key="resetting">%fos_user.resetting.email.from_email%</argument>
-                </argument>
-            </argument>
-            <tag name="fos_user.requires_swift" />
-        </service>
-
-        <service id="fos_user.mailer.noop" class="FOS\UserBundle\Mailer\NoopMailer" public="false" />
+        <service id="fos_user.mailer.default" class="FOS\UserBundle\Mailer\NoopMailer" public="false" />
     </services>
 
 </container>
diff --git a/Tests/DependencyInjection/FOSUserExtensionTest.php b/Tests/DependencyInjection/FOSUserExtensionTest.php
@@ -114,18 +114,6 @@ public function testDisableRegistration()
         $config['registration'] = false;
         $loader->load([$config], $this->configuration);
         $this->assertNotHasDefinition('fos_user.registration.form.factory');
-
-        $mailer = $this->configuration->getDefinition('fos_user.mailer.default');
-        $parameters = $this->configuration->getParameterBag()->resolveValue(
-            $mailer->getArgument(3)
-        );
-        $this->assertSame(
-            [
-                'confirmation' => ['no-registration@acme.com' => 'Acme Ltd'],
-                'resetting' => ['admin@acme.org' => 'Acme Corp'],
-            ],
-            $parameters['from_email']
-        );
     }
 
     public function testDisableResetting()
@@ -136,18 +124,6 @@ public function testDisableResetting()
         $config['resetting'] = false;
         $loader->load([$config], $this->configuration);
         $this->assertNotHasDefinition('fos_user.resetting.form.factory');
-
-        $mailer = $this->configuration->getDefinition('fos_user.mailer.default');
-        $parameters = $this->configuration->getParameterBag()->resolveValue(
-            $mailer->getArgument(3)
-        );
-        $this->assertSame(
-            [
-                'confirmation' => ['admin@acme.org' => 'Acme Corp'],
-                'resetting' => ['no-resetting@acme.com' => 'Acme Ltd'],
-            ],
-            $parameters['from_email']
-        );
     }
 
     public function testDisableProfile()