Merge branch 'refs/heads/4.3' into dependabot/npm_and_yarn/webpack-cl…

…i-5.1.4 # Conflicts: # html/template/admin/assets/css/app.css.map # html/template/admin/assets/css/app.min.css # html/template/admin/assets/css/app.min.css.map # html/template/admin/assets/css/bootstrap.css.map # html/template/admin/assets/css/bootstrap.min.css.map # html/template/default/assets/css/style.css.map # html/template/default/assets/css/style.min.css.map
EC-CUBE · Nov 6, 2024 · d3a32b5 · d3a32b5
2 parents 2e4f10c + 8d0e203
commit d3a32b5
Show file tree

Hide file tree

Showing 221 changed files with 21,857 additions and 17,776 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
@@ -76,7 +76,7 @@ jobs:
             type=ref,event=pr,prefix=${{ matrix.php }}-apache-pr-
 
       - name: Build and export to Docker
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           load: true
@@ -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"
@@ -124,7 +124,7 @@ jobs:
       ## see https://docs.github.com/ja/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#publishing-a-package-using-an-action
 
       - name: Push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: success()
         with:
           context: .

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
@@ -67,6 +67,11 @@ jobs:
       - name: Initialize Composer
         uses: ./.github/actions/composer
 
+      - name: Build Sass and JavaScript
+        run: |
+          npm ci
+          npm run build
+
       - name: Setup to EC-CUBE
         env:
           APP_ENV: ${{ matrix.app_env }}
@@ -88,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"
@@ -152,12 +157,31 @@ jobs:
           sed -i "s|%GITHUB_WORKSPACE%|${GITHUB_WORKSPACE}|g" codeception/_envs/github_action.yml
           vendor/bin/codecept -vvv run acceptance --env chrome,github_action -g ${GROUP} --html report.html
 
+      - name: Get a ScreenShots
+        run: |
+          php -S 127.0.0.1:8000 &
+          echo 'google-chrome --headless --no-sandbox --disable-gpu --screenshot=$1 --virtual-time-budget=10000 $2' > take_screenshot.sh
+          sudo sh take_screenshot.sh front_top.png http://127.0.0.1:8000
+          sudo sh take_screenshot.sh admin_top.png http://127.0.0.1:8000/admin
+
       - name: Upload evidence
         if: failure()
         uses: actions/upload-artifact@v4
         with:
           name: codeception-${{ matrix.group }}-evidence
           path: codeception/_output/
+
+      -   name: List files in current directory
+          run: ls -la
+
+      -   name: Upload ScreenShots
+          uses: actions/upload-artifact@v4
+          with:
+            name: screenshots-${{ matrix.group }}
+            path: |
+              front_top.png
+              admin_top.png
+
       - name: Upload logs
         if: failure()
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/penetration-test.yml b/.github/workflows/penetration-test.yml
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"