Merge pull request #1885 from chihiro-adachi/fix-trans-cache

translatorのキャッシュを削除するように修正
EC-CUBE · Oct 27, 2016 · 5dc55eb · 5dc55eb
2 parents bc1f947 + 30c84e9
commit 5dc55eb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/Eccube/Controller/Admin/Store/PluginController.php b/src/Eccube/Controller/Admin/Store/PluginController.php
@@ -28,7 +28,6 @@
 use Eccube\Common\Constant;
 use Eccube\Controller\AbstractController;
 use Eccube\Exception\PluginException;
-use Eccube\Util\Cache;
 use Eccube\Util\Str;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
@@ -200,8 +199,6 @@ public function update(Application $app, Request $request, $id)
 
                     $app->addSuccess('admin.plugin.update.complete', 'admin');
 
-                    Cache::clear($app, false);
-
                     return $app->redirect($app->url('admin_store_plugin'));
 
                 } catch (PluginException $e) {
@@ -578,9 +575,6 @@ public function upgrade(Application $app, Request $request, $action, $id, $versi
 
                                 $service->update($Plugin, $tmpDir.'/'.$tmpFile);
                                 $app->addSuccess('admin.plugin.update.complete', 'admin');
-
-                                Cache::clear($app, false);
-
                             }
 
                             $fs = new Filesystem();

diff --git a/src/Eccube/Service/PluginService.php b/src/Eccube/Service/PluginService.php
@@ -26,6 +26,7 @@
 
 use Eccube\Common\Constant;
 use Eccube\Exception\PluginException;
+use Eccube\Util\Cache;
 use Eccube\Util\Str;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Yaml\Yaml;
@@ -48,6 +49,7 @@ public function install($path, $source = 0)
 
         try {
             $this->app->removePluginConfigCache();
+            Cache::clear($this->app, false);
             $tmp = $this->createTempDir();
 
             $this->unpackPluginArchive($path, $tmp); //一旦テンポラリに展開
@@ -269,6 +271,7 @@ public function uninstall(\Eccube\Entity\Plugin $plugin)
     {
         $pluginDir = $this->calcPluginDir($plugin->getCode());
         $this->app->removePluginConfigCache();
+        Cache::clear($this->app, false);
         $this->callPluginManagerMethod(Yaml::parse(file_get_contents($pluginDir.'/'.self::CONFIG_YML)), 'disable');
         $this->callPluginManagerMethod(Yaml::parse(file_get_contents($pluginDir.'/'.self::CONFIG_YML)), 'uninstall');
         $this->unregisterPlugin($plugin);
@@ -308,6 +311,7 @@ public function enable(\Eccube\Entity\Plugin $plugin, $enable = true)
         $em = $this->app['orm.em'];
         try {
             $this->app->removePluginConfigCache();
+            Cache::clear($this->app, false);
             $pluginDir = $this->calcPluginDir($plugin->getCode());
             $em->getConnection()->beginTransaction();
             $plugin->setEnable($enable ? Constant::ENABLED : Constant::DISABLED);
@@ -330,6 +334,7 @@ public function update(\Eccube\Entity\Plugin $plugin, $path)
         $tmp = null;
         try {
             $this->app->removePluginConfigCache();
+            Cache::clear($this->app, false);
             $tmp = $this->createTempDir();
 
             $this->unpackPluginArchive($path, $tmp); //一旦テンポラリに展開

diff --git a/src/Eccube/Util/Cache.php b/src/Eccube/Util/Cache.php
@@ -70,6 +70,10 @@ public static function clear($app, $isAll, $isTwig = false)
                 $finder = Finder::create()->in($cacheDir.'/twig');
                 $filesystem->remove($finder);
             }
+            if (is_dir($cacheDir.'/translator')) {
+                $finder = Finder::create()->in($cacheDir.'/translator');
+                $filesystem->remove($finder);
+            }
         }
 
         return true;