Merge branch '4.3' into dependabot/composer/knplabs/knp-paginator-bundle-6.8.0

ji-eunsoo · web-flow · commit d0be9b194534 · 2025-05-21T16:25:27.000+09:00
diff --git a/.github/actions/composer/action.yml b/.github/actions/composer/action.yml
@@ -2,14 +2,10 @@ runs:
   using: "Composite"
   steps:
     - name: Get Composer Cache Directory
+      uses: actions/cache@v4
       id: composer-cache
-      run: |
-        echo "::set-output name=dir::$(composer config cache-files-dir)"
-      shell: bash
-
-    - uses: actions/cache@v3
       with:
-        path: ${{ steps.composer-cache.outputs.dir }}
+        path: ${{ github.workspace }}/vendor
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
           ${{ runner.os }}-composer-
diff --git a/.github/codecov.yml b/.github/codecov.yml
@@ -0,0 +1,10 @@
+# Do not fail GitHub Actions status check
+# https://docs.codecov.com/docs/quick-start#tips-and-tricks
+coverage:
+  status:
+    project:
+      default:
+        informational: true
+    patch:
+      default:
+        informational: true
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   phpunit:
     name: PHPUnit
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -47,7 +47,7 @@ jobs:
 
       - name: Setup pcov
         run: |
-          sudo apt-fast install -y php8.3-pcov
+          sudo apt-get install -y php8.3-pcov
           sudo phpenmod -s cli pcov
 
       - name: Initialize Composer
@@ -82,7 +82,7 @@ jobs:
           path: coverage1.xml
   codeception:
     name: Codeception
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -176,7 +176,7 @@ jobs:
 
       - name: Setup pcov
         run: |
-          sudo apt-fast install -y php8.3-pcov
+          sudo apt-get install -y php8.3-pcov
           sudo phpenmod -s cli pcov
 
       - name: Setup codeception
diff --git a/.github/workflows/deny-test.yml b/.github/workflows/deny-test.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   deploy:
     name: Deny check
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     services:
       postgres:
         image: postgres:14
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -5,7 +5,7 @@ on:
 jobs:
   deploy:
     name: Deploy
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     services:
       postgres:
         image: postgres:14
diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-22.04 ]
+        operating-system: [ ubuntu-24.04 ]
         php: [ '8.1', '8.2', '8.3' ]
         db: [ pgsql ]
         group: [ admin01 ]
diff --git a/.github/workflows/e2e-test-throttling.yml b/.github/workflows/e2e-test-throttling.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   codeception:
     name: Codeception
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   codeception:
     name: Codeception
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/plugin-test.yml b/.github/workflows/plugin-test.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-22.04 ]
+        operating-system: [ ubuntu-24.04 ]
         php: [ '8.1' ]
         db: [ pgsql, mysql ]
         method:
@@ -93,7 +93,7 @@ jobs:
         env:
           PGPASSWORD: 'password'
         run: |
-          sudo apt-fast install -y postgresql-client
+          sudo apt-get install -y postgresql-client
           psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';"
 
       - name: Update baseinfo with mysql
@@ -159,7 +159,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-22.04 ]
+        operating-system: [ ubuntu-24.04 ]
         php: [ '8.1' ]
         db: [ pgsql, mysql ]
         method:
@@ -207,12 +207,10 @@ jobs:
         uses: actions/checkout@master
 
       - name: Get Composer Cache Directory
+        uses: actions/cache@v4
         id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v4
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ github.workspace }}/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-
@@ -242,7 +240,7 @@ jobs:
         env:
           PGPASSWORD: 'password'
         run: |
-          sudo apt-fast install -y postgresql-client
+          sudo apt-get install -y postgresql-client
           psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';"
 
       - name: Update baseinfo with mysql
@@ -308,7 +306,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-22.04 ]
+        operating-system: [ ubuntu-24.04 ]
         php: [ '8.1' ]
         db: [ pgsql, mysql ]
         method:
@@ -357,11 +355,9 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v4
+        uses: actions/cache@v4
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ github.workspace }}/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-
@@ -391,7 +387,7 @@ jobs:
         env:
           PGPASSWORD: 'password'
         run: |
-          sudo apt-fast install -y postgresql-client
+          sudo apt-get install -y postgresql-client
           psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';"
 
       - name: Update baseinfo with mysql
@@ -457,7 +453,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-22.04 ]
+        operating-system: [ ubuntu-24.04 ]
         php: [ '8.1' ]
         db: [ pgsql, mysql ]
         method:
@@ -509,11 +505,9 @@ jobs:
 
       - name: Get Composer Cache Directory
         id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v4
+        uses: actions/cache@v4
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: ${{ github.workspace }}/vendor
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
             ${{ runner.os }}-composer-
@@ -543,7 +537,7 @@ jobs:
         env:
           PGPASSWORD: 'password'
         run: |
-          sudo apt-fast install -y postgresql-client
+          sudo apt-get install -y postgresql-client
           psql eccube_db -h 127.0.0.1 -U postgres -c "update dtb_base_info set authentication_key='test';"
 
       - name: Update baseinfo with mysql
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-22.04 ]
+        operating-system: [ ubuntu-24.04 ]
         php: [ '8.1', '8.2', '8.3' ]
         db: [ mysql, pgsql, sqlite3 ]
         include:
diff --git a/.github/workflows/vaddy-1.yml b/.github/workflows/vaddy-1.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   vaddy:
     name: VAddy
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:
diff --git a/.github/workflows/vaddy-2.yml b/.github/workflows/vaddy-2.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   vaddy:
     name: VAddy
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         include:
diff --git a/.github/workflows/vaddy/prepare/action.yml b/.github/workflows/vaddy/prepare/action.yml
@@ -54,14 +54,10 @@ runs:
             StrictHostKeyChecking no' >> ${HOME}/.ssh/config
 
     - name: Get Composer Cache Directory
+      uses: actions/cache@v4
       id: composer-cache
-      shell: bash
-      run: |
-        echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-    - uses: actions/cache@v1
       with:
-        path: ${{ steps.composer-cache.outputs.dir }}
+        path: ${{ github.workspace }}/vendor
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
           ${{ runner.os }}-composer-
diff --git a/.github/workflows/vaddyscan.yml b/.github/workflows/vaddyscan.yml
@@ -3,7 +3,7 @@ on: push
 jobs:
   vaddy:
     name: VAddy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
 #      matrix:
diff --git a/.github/workflows/zaproxy.yml b/.github/workflows/zaproxy.yml
@@ -12,15 +12,15 @@ on:
 jobs:
   prune:
     name: Prune Docker images
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Prune Docker images
         run: docker image prune --force
         
   build:
     name: Build
     needs: prune
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@master
@@ -44,7 +44,7 @@ jobs:
   scan:
     name: Scan
     needs: build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -249,7 +249,7 @@ jobs:
     name: Merge alerts
     needs: scan
     if: ${{ always() }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Download all artifacts
         uses: actions/download-artifact@v3
diff --git a/codeception/_support/Page/Admin/OrderManagePage.php b/codeception/_support/Page/Admin/OrderManagePage.php
@@ -222,6 +222,7 @@ public function 一括メール送信()
 
     public function 一括メール送信_キャンセル()
     {
+        $this->tester->wait(1);
         $this->tester->click(['id' => 'bulkSendMail']);
         $this->tester->waitForElementVisible(['id' => 'sentUpdateModal']);
         $this->tester->wait(1);
diff --git a/codeception/_support/Page/Front/ProductListPage.php b/codeception/_support/Page/Front/ProductListPage.php
@@ -18,6 +18,7 @@ class ProductListPage extends AbstractFrontPage
     public static function at($I)
     {
         $page = new self($I);
+        $page->tester->wait(1);
         $page->tester->seeInCurrentUrl('/products/list');
 
         return $page;
@@ -63,6 +64,7 @@ public function カートに入れる($index, $num = 1, $category1 = null, $cate
             }
         }
         $this->tester->click(['class' => 'add-cart']);
+        $this->tester->wait(1);
         $this->tester->waitForElementVisible(['css' => 'div.ec-modal-box']);
 
         return $this;
diff --git a/codeception/acceptance/EA07BasicinfoCest.php b/codeception/acceptance/EA07BasicinfoCest.php
diff --git a/codeception/acceptance/EF05MypageCest.php b/codeception/acceptance/EF05MypageCest.php
diff --git a/codeception/acceptance/EF09ThrottlingCest.php b/codeception/acceptance/EF09ThrottlingCest.php
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock
