From b461d44910e53494fa89e4b42d5605a0cdc08902 Mon Sep 17 00:00:00 2001
From: chihiro-adachi <chihiro_adachi@lockon.co.jp>
Date: Tue, 28 Feb 2017 09:45:49 +0900
Subject: [PATCH] =?UTF-8?q?TransactionListener=E3=81=8C=E5=8B=95=E4=BD=9C?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=81=AE=E5=AF=BE?=
 =?UTF-8?q?=E5=BF=9C=20-=20Terminate=E3=82=A4=E3=83=99=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=81=8CSwiftMailer->TransactionListener=E3=81=AE=E9=A0=86?=
 =?UTF-8?q?=E3=81=AB=E5=AE=9F=E8=A1=8C=E3=81=95=E3=82=8C=E3=82=8B=E3=81=9F?=
 =?UTF-8?q?=E3=82=81=E3=80=81SwiftMailer=E3=81=8C=E5=A4=B1=E6=95=97?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=A8TransactionListener=E3=81=AE?=
 =?UTF-8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88=E5=87=A6=E7=90=86=E3=81=8C?=
 =?UTF-8?q?=E8=B5=B0=E3=82=89=E3=81=AA=E3=81=84=20-=20SwiftMailer=E3=81=AE?=
 =?UTF-8?q?spool=E3=82=92=E7=84=A1=E5=8A=B9=E3=81=AB=E3=81=97=E3=80=81$app?=
 =?UTF-8?q?[=E2=80=98mailer=E2=80=99]->send()=E5=91=BC=E3=81=B3=E5=87=BA?=
 =?UTF-8?q?=E3=81=97=E6=99=82=E3=81=AB=E3=83=A1=E3=83=BC=E3=83=AB=E9=80=81?=
 =?UTF-8?q?=E4=BF=A1=E5=87=A6=E7=90=86=E3=82=92=E8=A1=8C=E3=81=86=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Eccube/Resource/config/mail.yml.dist             | 1 +
 src/Eccube/ServiceProvider/EccubeServiceProvider.php | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Eccube/Resource/config/mail.yml.dist b/src/Eccube/Resource/config/mail.yml.dist
index 5c622e65e25..cb4f31503a5 100644
--- a/src/Eccube/Resource/config/mail.yml.dist
+++ b/src/Eccube/Resource/config/mail.yml.dist
@@ -7,3 +7,4 @@ mail:
     encryption: null
     auth_mode: null
     charset_iso_2022_jp: false
+    spool: false
diff --git a/src/Eccube/ServiceProvider/EccubeServiceProvider.php b/src/Eccube/ServiceProvider/EccubeServiceProvider.php
index 19a975f5cb5..061412ce876 100644
--- a/src/Eccube/ServiceProvider/EccubeServiceProvider.php
+++ b/src/Eccube/ServiceProvider/EccubeServiceProvider.php
@@ -427,7 +427,6 @@ public function register(Container $app)
 
     public function subscribe(Container $app, EventDispatcherInterface $dispatcher)
     {
-        // FIXME TransactionListener::onKernelTerminate が動作しないため暫定的に無効
-        // $dispatcher->addSubscriber(new TransactionListener($app));
+        $dispatcher->addSubscriber(new TransactionListener($app));
     }
 }