Merge branch 'refs/heads/4.3' into dependabot/composer/symfony/polyfi…

…ll-php73-1.31.0
EC-CUBE · Nov 13, 2024 · 248b457 · 248b457
2 parents 332b885 + 988168d
commit 248b457
Show file tree

Hide file tree

Showing 50 changed files with 717 additions and 769 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -156,14 +156,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/deny-test.yml b/.github/workflows/deny-test.yml
@@ -97,14 +97,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Prepare test
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
@@ -100,14 +100,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/e2e-test-throttling.yml b/.github/workflows/e2e-test-throttling.yml
@@ -111,17 +111,14 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Install fonts
         run: sudo apt install fonts-ipafont fonts-ipaexfont
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -86,17 +86,14 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Install fonts
         run: sudo apt install fonts-ipafont fonts-ipaexfont
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/plugin-test.yml b/.github/workflows/plugin-test.yml
@@ -102,14 +102,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"
@@ -254,14 +251,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"
@@ -406,14 +400,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"
@@ -561,14 +552,11 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: Run chromedriver
         run: |
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/vaddy-1.yml b/.github/workflows/vaddy-1.yml
@@ -45,9 +45,6 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: "VAddy: install"
         working-directory: /tmp
@@ -134,7 +131,7 @@ jobs:
         run: |
           echo "APP_ENV=codeception" > .env
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/vaddy-2.yml b/.github/workflows/vaddy-2.yml
@@ -46,9 +46,6 @@ jobs:
 
       - name: setup-chromedriver
         uses: nanasess/setup-chromedriver@master
-        with:
-          # ChromeDriverのバージョンを指定
-          chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
 
       - name: "VAddy: install"
         working-directory: /tmp
@@ -135,7 +132,7 @@ jobs:
         run: |
           echo "APP_ENV=codeception" > .env
           export DISPLAY=:99
-          chromedriver --url-base=/wd/hub &
+          chromedriver --url-base=/wd/hub --port=9515 &
           echo ">>> Started chrome-driver"
           sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
           echo ">>> Started xvfb"

diff --git a/.github/workflows/vaddy/prepare/action.yml b/.github/workflows/vaddy/prepare/action.yml
@@ -31,10 +31,6 @@ runs:
 
     - name: setup-chromedriver
       uses: nanasess/setup-chromedriver@master
-      with:
-        # ChromeDriverのバージョンを指定
-        chromedriver-version: '127.0.6533.119'  # 特定のバージョンを指定
-
 
     - name: Install fonts
       shell: bash
@@ -142,7 +138,7 @@ runs:
       run: |
         echo "APP_ENV=codeception" > .env
         export DISPLAY=:99
-        chromedriver --url-base=/wd/hub &
+        chromedriver --url-base=/wd/hub --port=9515 &
         echo ">>> Started chrome-driver"
         sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
         echo ">>> Started xvfb"

diff --git a/codeception/_support/Page/Admin/AbstractAdminPage.php b/codeception/_support/Page/Admin/AbstractAdminPage.php
@@ -36,7 +36,7 @@ protected function goPage($url, $pageTitle = '')
             return $this->atPage($pageTitle);
         } else {
             $this->tester->wait(5);
-            $this->tester->waitForJS("return location.pathname + location.search == '${adminUrl}'");
+            $this->tester->waitForJS("return location.pathname + location.search == '{$adminUrl}'");
         }
 
         return $this;

diff --git a/codeception/_support/Page/Admin/ApiWebHookPage.php b/codeception/_support/Page/Admin/ApiWebHookPage.php
@@ -37,7 +37,7 @@ public function 削除($i)
     {
         $this->tester->click(['xpath' => "//*[@id=\"page_admin_api_webhook\"]/div[1]/div[3]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[3]/div/div[2]//a[contains(@class, 'action-delete')]"]);
         $this->tester->waitForElementVisible(['xpath' => "//*[@id=\"page_admin_api_webhook\"]/div[1]/div[3]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[3]/div/div[2]//a[contains(@class, 'btn-ec-delete')]"]);
-        $this->tester->click(['xpath' => "//*[@id=\"page_admin_api_webhook\"]/div[1]/div[3]/div[2]/div/div/div[2]/div/table/tbody/tr[${i}]/td[3]/div/div[2]//a[contains(@class, 'btn-ec-delete')]"]);
+        $this->tester->click(['xpath' => "//*[@id=\"page_admin_api_webhook\"]/div[1]/div[3]/div[2]/div/div/div[2]/div/table/tbody/tr[{$i}]/td[3]/div/div[2]//a[contains(@class, 'btn-ec-delete')]"]);
         return $this;
     }
 }
diff --git a/codeception/_support/Page/Admin/AuthorityManagePage.php b/codeception/_support/Page/Admin/AuthorityManagePage.php
@@ -45,8 +45,8 @@ public function 行削除($rowNum)
 
     public function 入力($rowNum, $role, $url)
     {
-        $this->tester->selectOption(['css' => "form #table-authority tbody tr:nth-child(${rowNum}) td:nth-child(1) select"], $role);
-        $this->tester->fillField(['css' => "form #table-authority tbody tr:nth-child(${rowNum}) td:nth-child(2) input"], $url);
+        $this->tester->selectOption(['css' => "form #table-authority tbody tr:nth-child({$rowNum}) td:nth-child(1) select"], $role);
+        $this->tester->fillField(['css' => "form #table-authority tbody tr:nth-child({$rowNum}) td:nth-child(2) input"], $url);
 
         return $this;
     }

diff --git a/codeception/_support/Page/Admin/BlockManagePage.php b/codeception/_support/Page/Admin/BlockManagePage.php
@@ -38,13 +38,13 @@ public function 新規入力()
     public function 編集($rowNum)
     {
         $rowNum++;
-        $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) a[data-bs-original-title=編集]");
+        $this->tester->click(".c-contentsArea .list-group > li:nth-child({$rowNum}) a[data-bs-original-title=編集]");
     }
 
     public function 削除($rowNum)
     {
         $rowNum++;
-        $this->tester->click(".c-contentsArea .list-group > li:nth-child(${rowNum}) [data-bs-original-title=削除] a");
+        $this->tester->click(".c-contentsArea .list-group > li:nth-child({$rowNum}) [data-bs-original-title=削除] a");
         return $this;
     }
 

diff --git a/codeception/_support/Page/Admin/CategoryManagePage.php b/codeception/_support/Page/Admin/CategoryManagePage.php
@@ -52,14 +52,14 @@ public function カテゴリ作成()
 
     public function 一覧_選択($rowNum)
     {
-        $this->tester->click("body > div.c-container > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child(${rowNum}) > div > div.col.d-flex.align-items-center > a");
+        $this->tester->click("body > div.c-container > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child({$rowNum}) > div > div.col.d-flex.align-items-center > a");
 
         return $this;
     }
 
     public function 一覧_編集($rowNum)
     {
-        $this->tester->click("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child(${rowNum}) > div > div.col-auto.text-end > a:nth-child(3)");
+        $this->tester->click("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child({$rowNum}) > div > div.col-auto.text-end > a:nth-child(3)");
 
         return $this;
     }
@@ -80,7 +80,7 @@ public function 一覧_インライン編集_決定($rowNum)
 
     public function 一覧_削除($rowNum)
     {
-        $this->tester->click("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child(${rowNum}) > div > div.col-auto.text-end > div > a");
+        $this->tester->click("body > div > div.c-contentsArea > div.c-contentsArea__cols > div.c-contentsArea__primaryCol > div > div > div > div > ul > li:nth-child({$rowNum}) > div > div.col-auto.text-end > div > a");
 
         return $this;
     }

diff --git a/codeception/_support/Page/Admin/ClassCategoryManagePage.php b/codeception/_support/Page/Admin/ClassCategoryManagePage.php
@@ -50,28 +50,28 @@ public function 分類作成()
 
     public function 一覧_編集($rowNum)
     {
-        $this->tester->click("ul.list-group > li:nth-child(${rowNum}) a:nth-child(3)");
+        $this->tester->click("ul.list-group > li:nth-child({$rowNum}) a:nth-child(3)");
 
         return $this;
     }
 
     public function 一覧_入力_分類名($row, $value)
     {
-        $this->tester->fillField(['css' => "ul.list-group > li:nth-child(${row}) form input[type=text]"], $value);
+        $this->tester->fillField(['css' => "ul.list-group > li:nth-child({$row}) form input[type=text]"], $value);
 
         return $this;
     }
 
     public function 一覧_分類作成($row)
     {
-        $this->tester->click("ul.list-group > li:nth-child(${row}) form button[type=submit]");
+        $this->tester->click("ul.list-group > li:nth-child({$row}) form button[type=submit]");
 
         return $this;
     }
 
     public function 一覧_削除($rowNum)
     {
-        $this->tester->click("ul.list-group > li:nth-child(${rowNum}) > div > div.col-auto.text-end > div > a");
+        $this->tester->click("ul.list-group > li:nth-child({$rowNum}) > div > div.col-auto.text-end > div > a");
 
         return $this;
     }
@@ -99,21 +99,21 @@ public function CSV出力項目設定()
 
     public function 一覧_上に($rowNum)
     {
-        $this->tester->dragAndDropBy("ul.list-group > li:nth-child(${rowNum})", 0, -60);
+        $this->tester->dragAndDropBy("ul.list-group > li:nth-child({$rowNum})", 0, -60);
 
         return $this;
     }
 
     public function 一覧_下に($rowNum)
     {
-        $this->tester->dragAndDropBy("ul.list-group > li:nth-child(${rowNum})", 0, 60);
+        $this->tester->dragAndDropBy("ul.list-group > li:nth-child({$rowNum})", 0, 60);
 
         return $this;
     }
 
     public function 一覧_名称($rowNum)
     {
-        return "ul.list-group > li:nth-child(${rowNum}) > div > div.col.d-flex.align-items-center";
+        return "ul.list-group > li:nth-child({$rowNum}) > div > div.col.d-flex.align-items-center";
     }
 
     public static function XPathでタグを取得する($textEl)

diff --git a/codeception/_support/Page/Admin/ClassNameManagePage.php b/codeception/_support/Page/Admin/ClassNameManagePage.php
@@ -62,19 +62,19 @@ public function 規格作成()
 
     public function 規格編集($rowNum)
     {
-        $this->tester->click("ul.list-group > li:nth-child(${rowNum}) > form > div:nth-child(6) > button");
+        $this->tester->click("ul.list-group > li:nth-child({$rowNum}) > form > div:nth-child(6) > button");
 
         return $this;
     }
 
     public function 一覧_名称($rowNum)
     {
-        return "ul.list-group > li:nth-child(${rowNum}) > div > div.col.d-flex.align-items-center > a";
+        return "ul.list-group > li:nth-child({$rowNum}) > div > div.col.d-flex.align-items-center > a";
     }
 
     public function 一覧_分類登録($rowNum)
     {
-        $this->tester->click("ul.list-group > li:nth-child(${rowNum}) > div > div.col.d-flex.align-items-center > a");
+        $this->tester->click("ul.list-group > li:nth-child({$rowNum}) > div > div.col.d-flex.align-items-center > a");
 
         return $this;
     }
@@ -88,15 +88,15 @@ public function 一覧_分類登録2()
 
     public function 一覧_編集($rowNum)
     {
-        $this->tester->click("ul.list-group > li:nth-child(${rowNum}) > div > div.col-auto.text-end > a.action-edit");
+        $this->tester->click("ul.list-group > li:nth-child({$rowNum}) > div > div.col-auto.text-end > a.action-edit");
 
         return $this;
     }
 
     public function 一覧_削除($rowNum)
     {
         ++$rowNum;
-        $this->tester->click("ul.list-group > li:nth-child(${rowNum}) > div > div.col-auto.text-end > div > a");
+        $this->tester->click("ul.list-group > li:nth-child({$rowNum}) > div > div.col-auto.text-end > div > a");
 
         return $this;
     }
@@ -124,14 +124,14 @@ public function CSV出力項目設定()
 
     public function 一覧_上に($rowNum)
     {
-        $this->tester->dragAndDropBy("ul.list-group > li:nth-child(${rowNum})", 0, -60);
+        $this->tester->dragAndDropBy("ul.list-group > li:nth-child({$rowNum})", 0, -60);
 
         return $this;
     }
 
     public function 一覧_下に($rowNum)
     {
-        $this->tester->dragAndDropBy("ul.list-group > li:nth-child(${rowNum})", 0, 60);
+        $this->tester->dragAndDropBy("ul.list-group > li:nth-child({$rowNum})", 0, 60);
 
         return $this;
     }