Merge remote-tracking branch 'upstream/master' into dependabot/npm_an…

…d_yarn/typescript-eslint/parser-5.62.0
EC-CUBE · Feb 4, 2024 · 35dfb12 · 35dfb12
2 parents 5dcf7d7 + 21c0025
commit 35dfb12
Show file tree

Hide file tree

Showing 43 changed files with 544 additions and 840 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -51,13 +51,13 @@ jobs:
           - 1025:1025
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Get Composer Cache Directory
       id: composer-cache
       run: |
         echo "::set-output name=dir::$(composer config cache-files-dir)"
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -78,10 +78,10 @@ jobs:
 
       - name: Checkout code
         if: github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'prereleased' )
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Checkout code
         if: github.event_name == 'schedule' && env.DEPLOY == 1
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.TAG_NAME }}
 
@@ -180,7 +180,7 @@ jobs:
 
       - name: Upload binaries to release of TGZ
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz
@@ -189,7 +189,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip
@@ -198,7 +198,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of TGZ md5 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz.checksum.md5
@@ -207,7 +207,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of TGZ sha1 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz.checksum.sha1
@@ -216,7 +216,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of TGZ sha256 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.tar.gz.checksum.sha256
@@ -225,7 +225,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP md5 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip.checksum.md5
@@ -234,7 +234,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP sha1 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip.checksum.sha1
@@ -243,7 +243,7 @@ jobs:
           overwrite: true
       - name: Upload binaries to release of ZIP sha256 checksum
         if: env.DEPLOY == 1
-        uses: svenstaro/upload-release-action@v1-release
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: ${{ runner.workspace }}/${{ env.TAG_NAME }}.zip.checksum.sha256

diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
 
     steps:
       - name: downcase REPO
@@ -32,29 +32,53 @@ jobs:
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV}
-          echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
+          echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV}
+          echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
+      - if: ${{ matrix.php == 5.5 }}
+        run: |
+          echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
+          echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
+          echo "APCU=" >>  ${GITHUB_ENV}
           echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
-      - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
+      - if: ${{ matrix.php == 5.6 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
-          echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
+          echo "APCU=" >>  ${GITHUB_ENV}
           echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
-      - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+      - if: ${{ matrix.php == 7.0 }}
+        run: |
+          echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
+          echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
+          echo "APCU=apcu" >>  ${GITHUB_ENV}
+          echo "FORCE_YES=" >>  ${GITHUB_ENV}
+          echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+      - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }}
         run: |
           echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
           echo "APCU=apcu" >>  ${GITHUB_ENV}
           echo "FORCE_YES=" >>  ${GITHUB_ENV}
+          echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
       - if: ${{ matrix.php >= 7.4 }}
         run: |
           echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV}
           echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
           echo "APCU=apcu" >>  ${GITHUB_ENV}
           echo "FORCE_YES=" >>  ${GITHUB_ENV}
+          echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+          echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       ## Used when creating multi-platform images
       # - name: Set up QEMU
       #   uses: docker/setup-qemu-action@v2
@@ -65,15 +89,15 @@ jobs:
         run: echo "COMPOSE_FILE=docker-compose.yml:docker-compose.pgsql.yml:docker-compose.owaspzap.yml:docker-compose.owaspzap.daemon.yml" >> $GITHUB_ENV
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -86,7 +110,7 @@ jobs:
             type=match,prefix=${{ matrix.php }}-apache-,pattern=eccube2-weekly-(.*),group=1
 
       - name: Build and export to Docker
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: .
           load: true
@@ -97,6 +121,9 @@ jobs:
             GD_OPTIONS=${{ env.GD_OPTIONS }}
             EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }}
             APCU=${{ env.APCU }}
+            FORCE_YES=${{ env.FORCE_YES }}
+            APT_REPO=${{ env.APT_REPO }}
+            APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}
 
       - name: Setup to EC-CUBE
         env:
@@ -129,7 +156,7 @@ jobs:
       - run: git checkout composer.*
       ## 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@v4
+        uses: docker/build-push-action@v5
         if: success()
         with:
           context: .
@@ -142,16 +169,19 @@ jobs:
             GD_OPTIONS=${{ env.GD_OPTIONS }}
             EXT_INSTALL_ARGS=${{ env.EXT_INSTALL_ARGS }}
             APCU=${{ env.APCU }}
+            FORCE_YES=${{ env.FORCE_YES }}
+            APT_REPO=${{ env.APT_REPO }}
+            APT_SECURITY_REPO=${{ env.APT_SECURITY_REPO }}
 
       - name: Upload evidence
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux-php${{ matrix.php }}-evidence
           path: 'test-results/'
       - name: Upload logs
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: linux-php${{ matrix.php }}-logs
           path: data/logs
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # - name: Create ADMIN_DIR
     #   run: |
@@ -72,13 +72,13 @@ jobs:
 
     - name: Upload evidence
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-php${{ matrix.tag }}-${{ matrix.db }}-evidence
         path: 'test-results/'
     - name: Upload logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-php${{ matrix.php }}-${{ matrix.db }}-logs
         path: data/logs
@@ -89,7 +89,7 @@ jobs:
       fail-fast: false
       matrix:
         db: [ 'pgsql', 'mysql' ]
-        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1' ]
+        php: [ '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
         include:
           - db: mysql
             dbport: '3306'
@@ -109,25 +109,53 @@ jobs:
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql mbstring" >> ${GITHUB_ENV}
-        echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
-    - if: ${{ matrix.php == 5.5 || matrix.php == 5.6 }}
+        echo "APCU=apcu-4.0.11" >> ${GITHUB_ENV}
+        echo "FORCE_YES=--force-yes" >> ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
+    - if: ${{ matrix.php == 5.5 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
-        echo "APCU=apcu-4.0.11" >>  ${GITHUB_ENV}
-    - if: ${{ matrix.php >= 7.0 && matrix.php <= 7.3 }}
+        echo "APCU=" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive/debian-security" >> ${GITHUB_ENV}
+    - if: ${{ matrix.php == 5.6 }}
+      run: |
+        echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
+        echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
+        echo "APCU=" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=--force-yes" >>  ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+    - if: ${{ matrix.php == 7.0 }}
+      run: |
+        echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
+        echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
+        echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
+        echo "APT_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=cloudfront.debian.net/debian-archive" >> ${GITHUB_ENV}
+    - if: ${{ matrix.php >= 7.1 && matrix.php <= 7.3 }}
       run: |
         echo "GD_OPTIONS=--with-freetype-dir=/usr/include --with-jpeg-dir=/usr/include" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
         echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
+        echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
     - if: ${{ matrix.php >= 7.4 }}
       run: |
         echo "GD_OPTIONS=--with-freetype --with-jpeg" >> ${GITHUB_ENV}
         echo "EXT_INSTALL_ARGS=gd zip mysqli pgsql opcache" >> ${GITHUB_ENV}
         echo "APCU=apcu" >>  ${GITHUB_ENV}
+        echo "FORCE_YES=" >>  ${GITHUB_ENV}
+        echo "APT_REPO=deb.debian.org" >> ${GITHUB_ENV}
+        echo "APT_SECURITY_REPO=security.debian.org" >> ${GITHUB_ENV}
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup environment
       env:
@@ -142,7 +170,7 @@ jobs:
         sudo chown -R 1001:1000 zap
         sudo chmod -R g+w zap
         sh -c 'echo "<?php" >> data/config/config.php'
-        docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU}" .
+        docker build -t ec-cube2 --build-arg PHP_VERSION_TAG="${PHP_VERSION_TAG}" --build-arg GD_OPTIONS="${GD_OPTIONS}" --build-arg EXT_INSTALL_ARGS="${EXT_INSTALL_ARGS}" --build-arg APCU="${APCU}" --build-arg FORCE_YES="${FORCE_YES}" --build-arg APT_REPO="${APT_REPO}" --build-arg APT_SECURITY_REPO="${APT_SECURITY_REPO}" .
         docker tag ec-cube2 ghcr.io/ec-cube/ec-cube2-php:${PHP_VERSION_TAG}-apache
         TAG=${PHP_VERSION_TAG}-apache docker-compose up -d
 
@@ -185,13 +213,13 @@ jobs:
       run: yarn test:e2e e2e-tests/test/installer/installer.test.ts
     - name: Upload logs
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-php${{ matrix.php }}-${{ matrix.db }}-logs
         path: html/install/temp/install.log*
     - name: Upload evidence
       if: failure()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-php${{ matrix.php }}-${{ matrix.db }}-evidence
         path: 'test-results/'