4.0 ブランチを experimental/plugin_bundle ブランチへ取り込み（コンフリクト解消）

.editorconfig

@@ -16,6 +16,9 @@ indent_size = 4
 indent_style = space
 indent_size = 2
 
+[*.md]
+trim_trailing_whitespace = false
+
 [codeception/**.{yml,yaml}]
 indent_style = space
 indent_size = 4

.github/workflows/action.yml

@@ -662,6 +662,7 @@ jobs:
           - test_dependency_plugin_update
           - test_install_error
           - install_enable_disable_enable_disable_remove_store
+          - test_enhance_plugin_entity
         include:
           - db: pgsql
             database_url: postgres://postgres:password@127.0.0.1:5432/eccube_db

.travis.yml

@@ -253,6 +253,10 @@ jobs:
         ./codeception.sh --reset
         psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test', php_path = '$(which php)';"
         ./codeception.sh EA10PluginCest:install_enable_disable_enable_disable_remove_store
+      - |
+        ./codeception.sh --reset
+        psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test', php_path = '$(which php)';"
+        ./codeception.sh EA10PluginCest:test_enhance_plugin_entity
   - <<: *e2e_test
     php: 7.3
     env: APP_ENV=codeception DATABASE_URL=mysql://root:@localhost/eccube_db DATABASE_SERVER_VERSION=5 MAILER_URL=smtp://localhost:1025 ECCUBE_PACKAGE_API_URL=http://localhost:8080 NO_FIXTURES=1
@@ -385,6 +389,10 @@ jobs:
         ./codeception.sh --reset
         mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test', php_path = '$(which php)';"
         ./codeception.sh EA10PluginCest:install_enable_disable_enable_disable_remove_store
+      - |
+        ./codeception.sh --reset
+        mysql -h 127.0.0.1 -u root eccube_db -e "update dtb_base_info set authentication_key='test', php_path = '$(which php)';"
+        ./codeception.sh EA10PluginCest:test_enhance_plugin_entity
 
   # インストーラのテスト
   - <<: *e2e_test

codeception/acceptance/EA10PluginCest.php

@@ -436,6 +436,26 @@ public function test_template_overwrite(\AcceptanceTester $I)
         $fs->remove($dir);
     }
 
+    /**
+     * @see https://github.com/EC-CUBE/ec-cube/pull/4638
+     */
+    public function test_enhance_plugin_entity(\AcceptanceTester $I)
+    {
+        $Boomerang = Boomerang_Store::start($I)
+            ->インストール()
+            ->有効化()
+            ->カート作成();
+
+        $I->see('[1]');
+
+        Boomerang10_Store::start($I, $Boomerang)
+            ->インストール()
+            ->有効化();
+
+        $Boomerang->カート一覧();
+        $I->see('[1]');
+    }
+
     public function test_bundle_install_enable_disable_remove_store(\AcceptanceTester $I)
     {
         $Bundle = Bundle_Store::start($I);
@@ -968,6 +988,32 @@ public static function start(AcceptanceTester $I)
     {
         return new self($I);
     }
+
+    public function カート一覧()
+    {
+        $this->I->amOnPage('/boomerang');
+    }
+
+    public function カート作成()
+    {
+        $this->I->amOnPage('/boomerang/new');
+        $this->I->seeCurrentUrlMatches('/^\/boomerang$/');
+        return $this;
+    }
+}
+
+class Boomerang10_Store extends Store_Plugin
+{
+    public function __construct(AcceptanceTester $I, Store_Plugin $dependency = null)
+    {
+        parent::__construct($I, 'Boomerang10', $dependency);
+        $this->columns[] = 'dtb_bar.mail';
+    }
+
+    public static function start(AcceptanceTester $I, Store_Plugin $dependency = null)
+    {
+        return new self($I, $dependency = null);
+    }
 }
 
 class Boomerang_Local extends Local_Plugin

html/template/default/assets/scss/project/_13.4.cartModal.scss

@@ -14,101 +14,65 @@ Styleguide 13.4
 */
 
 .ec-modal {
-
-  .checkbox {
-    display: none;
+  display: none;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 99999;
+  width: 100%;
+  height: 100%;
+
+  &.small {
+    width: 30%;
   }
 
-  .ec-modal-overlay {
-    opacity: 0;
-    transition: all 0.3s ease;
+  &.full {
     width: 100%;
     height: 100%;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: -100;
-    transform: scale(1);
+  }
+
+  .ec-modal-overlay {
     display: flex;
+    justify-content: center;
+    align-items: center;
     background-color: rgba(0, 0, 0, 0.3);
+    width: 100%;
+    height: 100%;
   }
 
   .ec-modal-wrap {
-    background-color: #fff;
+    position: relative;
+    border-radius: 2px;
     border: 1px solid #333;
+    background-color: #fff;
     width: 90%;
     margin: 20px;
     padding: 40px 5px;
-    border-radius: 2px;
-    transition: all 0.5s ease;
-    -ms-flex-item-align: center;
-    align-self: center;
-
-    .ec-modal-box {
-      text-align: center;
-    }
-
-    .ec-modal-box div {
-      margin-top: 20px;
-    }
-
     @include media_desktop {
-      & {
-        padding: 40px 10px;
-        width: 50%;
-        margin: 20px auto;
-      }
-    }
-
-    &.small {
-      width: 30%;
-    }
-
-    &.full {
-      width: 100%;
-      height: 100%;
+      padding: 40px 10px;
+      width: 50%;
+      margin: 20px auto;
     }
   }
 
-  .ec-modal-overlay {
-    .ec-modal-close {
-      position: absolute;
-      right: 20px;
-      top: 10px;
-      font-size: 20px;
-      height: 30px;
-      width: 20px;
-
-      &:hover {
-        cursor: pointer;
-        color: #4b5361;
-      }
+  .ec-modal-close {
+    cursor: pointer;
+    position: absolute;
+    right: 20px;
+    top: 10px;
+    font-size: 20px;
+    height: 30px;
+    width: 20px;
+    &:hover {
+      color: #4b5361;
     }
   }
 
-  .ec-modal-overlay-close {
-    display: none;
-    width: 100%;
-    height: 100%;
-    position: fixed;
-    left: 0;
-    top: 0;
+  .ec-modal-box {
+    text-align: center;
   }
 
-  input:checked {
-    ~ .ec-modal-overlay {
-      transform: scale(1);
-      opacity: 1;
-      z-index: 9997;
-      overflow: auto;
-      .ec-modal-overlay-close {
-        display: block;
-      }
-    }
-
-    ~ .ec-modal-overlay .ec-modal-wrap {
-      transform: translateY(0);
-      z-index: 9999;
-    }
+  .ec-role {
+    margin-top: 20px;
   }
 }

robots.txt

@@ -1 +1,2 @@
+User-agent: *
 Disallow: /*.csv$

src/Eccube/Form/Type/Admin/OrderType.php

@@ -426,7 +426,10 @@ public function validateOrderStatus(FormEvent $event)
         if ($oldStatus->getId() != $newStatus->getId()) {
             if (!$this->orderStateMachine->can($Order, $newStatus)) {
                 $form['OrderStatus']->addError(
-                    new FormError(trans('admin.order.failed_to_change_status__short', $oldStatus->getName(), $newStatus->getName())));
+                    new FormError(trans('admin.order.failed_to_change_status__short', [
+                        '%from%' => $oldStatus->getName(),
+                        '%to%' => $newStatus->getName(),
+                    ])));
             }
         }
     }

src/Eccube/Kernel.php

@@ -291,10 +291,12 @@ protected function addEntityExtensionPass(ContainerBuilder $container)
 
         foreach ($plugins as $code) {
             if (file_exists($pluginDir.'/'.$code.'/Entity')) {
-                $container->addCompilerPass(DoctrineOrmMappingsPass::createAnnotationMappingDriver(
-                    ['Plugin\\'.$code.'\\Entity'],
-                    ['%kernel.project_dir%/app/Plugin/'.$code.'/Entity']
-                ));
+                $paths = ['%kernel.project_dir%/app/Plugin/'.$code.'/Entity'];
+                $namespaces = ['Plugin\\'.$code.'\\Entity'];
+                $reader = new Reference('annotation_reader');
+                $driver = new Definition(AnnotationDriver::class, [$reader, $paths]);
+                $driver->addMethodCall('setTraitProxiesDirectory', [$projectDir.'/app/proxy/entity']);
+                $container->addCompilerPass(new DoctrineOrmMappingsPass($driver, $namespaces, []));
             }
         }
     }