Merge pull request #4231 from nobuhiko/fixUpdatePlugin

ユーザー独自プラグインのアップデートしてもスキーマがアップデートされない
EC-CUBE · Nov 26, 2019 · 37ab7e2 · 37ab7e2
2 parents d48efb0 + 98a1d9c
commit 37ab7e2
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 8 deletions.
diff --git a/app/config/eccube/packages/codeception/doctrine.yaml b/app/config/eccube/packages/codeception/doctrine.yaml
@@ -0,0 +1,30 @@
+# https://github.com/symfony/demo/blob/master/config/packages/prod/doctrine.yaml
+# https://symfony.com/doc/master/bundles/DoctrineBundle/configuration.html
+doctrine:
+    orm:
+        metadata_cache_driver:
+            type: service
+            id: doctrine.app_cache_provider
+        query_cache_driver:
+            type: service
+            id: doctrine.app_cache_provider
+        result_cache_driver:
+            type: service
+            id: doctrine.app_cache_provider
+        second_level_cache:
+            region_cache_driver:
+                type: service
+                id: doctrine.app_cache_provider
+
+services:
+    doctrine.app_cache_provider:
+        class: Symfony\Component\Cache\DoctrineProvider
+        public: false
+        arguments:
+            - '@doctrine.app_cache_pool'
+
+framework:
+    cache:
+        pools:
+            doctrine.app_cache_pool:
+                adapter: cache.app
diff --git a/codeception/_data/plugins/Horizon-1.0.1.tgz b/codeception/_data/plugins/Horizon-1.0.1.tgz
diff --git a/codeception/acceptance/EA10PluginCest.php b/codeception/acceptance/EA10PluginCest.php
@@ -793,6 +793,13 @@ public function __construct(AcceptanceTester $I)
         $this->traits['\Plugin\Horizon\Entity\CartTrait'] = 'src/Eccube/Entity/Cart';
     }
 
+    public function アップデート()
+    {
+        // アップデートで新たしいカラムが追加される
+        $this->columns[] = 'dtb_dash.new_column';
+        return parent::アップデート();
+    }
+
     public static function start(AcceptanceTester $I)
     {
         return new self($I);
@@ -810,6 +817,13 @@ public function __construct(AcceptanceTester $I)
         $this->traits['\Plugin\Horizon\Entity\CartTrait'] = 'src/Eccube/Entity/Cart';
     }
 
+    public function アップデート()
+    {
+        // アップデートで新たしいカラムが追加される
+        $this->columns[] = 'dtb_dash.new_column';
+        return parent::アップデート();
+    }
+
     public static function start(AcceptanceTester $I)
     {
         $result = new self($I);

diff --git a/codeception/acceptance/EF01TopCest.php b/codeception/acceptance/EF01TopCest.php
@@ -31,12 +31,14 @@ public function _after(\AcceptanceTester $I)
 
     private function clearDoctrineCache()
     {
-        // APP_ENV=prodで実行した際は, 直接データを投入しても反映されないため,
+        // APP_ENV=prod/codeceptionで実行した際は, 直接データを投入しても反映されないため,
         // キャッシュを削除して表示できるようにする
         $fs = new Symfony\Component\Filesystem\Filesystem();
-        $cacheDir = __DIR__.'/../../var/cache/prod/pools';
-        if ($fs->exists($cacheDir)) {
-            $fs->remove($cacheDir);
+        foreach (['prod', 'codeception'] as $env) {
+            $cacheDir = __DIR__."/../../var/cache/${env}/pools";
+            if ($fs->exists($cacheDir)) {
+                $fs->remove($cacheDir);
+            }
         }
     }
 

diff --git a/src/Eccube/Service/PluginService.php b/src/Eccube/Service/PluginService.php
@@ -282,6 +282,9 @@ public function postInstall($config, $source)
      */
     public function generateProxyAndUpdateSchema(Plugin $plugin, $config, $uninstall = false, $saveMode = true)
     {
+        // キャッシュしたメタデータを利用しないようにキャッシュドライバを外しておく
+        $this->entityManager->getMetadataFactory()->setCacheDriver(null);
+
         $this->generateProxyAndCallback(function ($generatedFiles, $proxiesDirectory) use ($saveMode) {
             $this->schemaService->updateSchema($generatedFiles, $proxiesDirectory, $saveMode);
         }, $plugin, $config, $uninstall);
@@ -747,6 +750,8 @@ public function updatePlugin(Plugin $plugin, $meta)
 
             $em->persist($plugin);
 
+            $this->generateProxyAndUpdateSchema($plugin, $meta);
+
             if ($plugin->isInitialized()) {
                 $this->callPluginManagerMethod($meta, 'update');
             }

diff --git a/src/Eccube/Util/CacheUtil.php b/src/Eccube/Util/CacheUtil.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
@@ -29,21 +30,30 @@
  */
 class CacheUtil implements EventSubscriberInterface
 {
+
+    const DOCTRINE_APP_CACHE_KEY = 'doctrine.app_cache_pool';
+
     private $clearCacheAfterResponse = false;
 
     /**
      * @var KernelInterface
      */
     protected $kernel;
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
 
     /**
      * CacheUtil constructor.
      *
      * @param KernelInterface $kernel
+     * @param ContainerInterface $container
      */
-    public function __construct(KernelInterface $kernel)
+    public function __construct(KernelInterface $kernel, ContainerInterface $container)
     {
         $this->kernel = $kernel;
+        $this->container = $container;
     }
 
     /**
@@ -100,7 +110,6 @@ public function forceClearCache(PostResponseEvent $event)
 
     /**
      * Doctrineのキャッシュを削除します.
-     * APP_ENV=prodの場合のみ実行されます.
      *
      * @param null $env
      *
@@ -110,15 +119,15 @@ public function forceClearCache(PostResponseEvent $event)
      */
     public function clearDoctrineCache()
     {
-        if ($this->kernel->getEnvironment() !== 'prod') {
+        if (!$this->container->has(self::DOCTRINE_APP_CACHE_KEY)) {
             return;
         }
         $console = new Application($this->kernel);
         $console->setAutoExit(false);
 
         $command = [
             'command' => 'cache:pool:clear',
-            'pools' => ['doctrine.app_cache_pool'],
+            'pools' => [self::DOCTRINE_APP_CACHE_KEY],
             '--no-ansi' => true,
         ];