Merge pull request #5764 from nanasess/fix-remove-cache-installer

[4.2] インストーラでのプラグイン有効化/無効化時にキャッシュ削除が失敗する場合があるのを修正

src/Eccube/Controller/InstallPluginController.php

@@ -20,11 +20,14 @@
 use Eccube\Service\PluginService;
 use Eccube\Service\SystemService;
 use Eccube\Util\CacheUtil;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\Routing\Annotation\Route;
 
 class InstallPluginController extends InstallController
@@ -77,14 +80,15 @@ public function plugins(Request $request)
      * @param SystemService $systemService
      * @param PluginService $pluginService
      * @param string $code
+     * @param EventDispatcherInterface $dispatcher
      *
      * @return JsonResponse
      *
      * @throws BadRequestHttpException
      * @throws NotFoundHttpException
      * @throws PluginException
      */
-    public function pluginEnable(Request $request, SystemService $systemService, PluginService $pluginService, $code)
+    public function pluginEnable(Request $request, SystemService $systemService, PluginService $pluginService, $code, EventDispatcherInterface $dispatcher)
     {
         if (!$request->isXmlHttpRequest()) {
             throw new BadRequestHttpException();
@@ -122,7 +126,12 @@ public function pluginEnable(Request $request, SystemService $systemService, Plu
                 }
             }
 
-            $this->cacheUtil->clearCache();
+            // KernelEvents::TERMINATE で強制的にキャッシュを削除する
+            // see https://github.com/EC-CUBE/ec-cube/issues/5498#issuecomment-1205904083
+            $dispatcher->addListener(KernelEvents::TERMINATE, function () {
+                $fs = new Filesystem();
+                $fs->remove($this->getParameter('kernel.project_dir').'/var/cache/'.env('APP_ENV', 'prod'));
+            });
 
             return $this->json(['success' => true, 'log' => $log]);
         } else {