Merge remote-tracking branch 'origin/4.3' into hotfix/issue-6273

EC-CUBE · Oct 9, 2024 · b783a36 · b783a36
2 parents f0c3423 + 16f7157
commit b783a36
Show file tree

Hide file tree

Showing 25 changed files with 234 additions and 210 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -6,6 +6,8 @@ updates:
       interval: "weekly"
     allow:
       - dependency-type: "all"
+    ignore:
+      - dependency-name: "twig/twig"
 
   # GitHub アクションの依存関係を維持する
   - package-ecosystem: "github-actions"

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -160,7 +160,7 @@ jobs:
       - 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
@@ -101,7 +101,7 @@ jobs:
       - 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
@@ -104,7 +104,7 @@ jobs:
       - 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
@@ -118,7 +118,7 @@ jobs:
       - 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
@@ -93,7 +93,7 @@ jobs:
       - 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
@@ -106,7 +106,7 @@ jobs:
       - 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"
@@ -255,7 +255,7 @@ jobs:
       - 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"
@@ -404,7 +404,7 @@ jobs:
       - 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"
@@ -556,7 +556,7 @@ jobs:
       - 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
@@ -131,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
@@ -132,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
@@ -138,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/.github/workflows/zaproxy.yml b/.github/workflows/zaproxy.yml
@@ -1,4 +1,11 @@
 name: OWASP ZAP
+
+# このGitHub Actionsワークフローは手動でトリガー可能です。
+# 手動で実行するには、以下の手順に従ってください：
+# 1. GitHubリポジトリの「Actions」タブに移動します。
+# 2. 「OWASP ZAP」ワークフローを選択します。
+# 3. 「Run workflow」ボタンをクリックします。
+# 4. 必要に応じて、表示される入力フォームでパラメータを指定し、「Run workflow」を再度クリックして実行します。
 on:
   workflow_dispatch:
 

diff --git a/composer.json b/composer.json
@@ -99,9 +99,9 @@
         "symfony/workflow": "^6.4",
         "symfony/yaml": "^6.4",
         "tecnickcom/tcpdf": "^6.2",
-        "twig/extra-bundle": "^3.3",
+        "twig/extra-bundle": "3.8.0",
         "twig/intl-extra": "^3.3",
-        "twig/twig": "^3.8",
+        "twig/twig": "3.8.0",
         "vlucas/phpdotenv": "v5.6.0"
     },
     "require-dev": {