Conflictの解消

dotani1111 · May 29, 2023 · 94edb59 · 94edb59
2 parents 18cc8a8 + 56310f7
commit 94edb59
Show file tree

Hide file tree

Showing 212 changed files with 5,539 additions and 2,262 deletions.
diff --git a/.env.dist b/.env.dist
@@ -30,12 +30,6 @@ DATABASE_CHARSET=utf8
 MAILER_DSN=null://null
 ###< symfony/mailer ###
 
-###> symfony/lock ###
-# Choose one of the stores below
-# postgresql+advisory://db_user:db_password@localhost/db_name
-LOCK_DSN=semaphore
-###< symfony/lock ###
-
 ###> APPLICATION CONFIG ###
 # EC-CUBE Configs. The default value is defined in app/config/packages/eccube.yaml.
 # Please remove commented out and enable it if you want to change.

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,8 @@
+<!-- ****************************************************************************
+脆弱性報告 (Vulnerability report)
+脆弱性のご報告は弊社[問い合わせフォーム](https://www.ec-cube.net/contact/)からお願いします。
+**************************************************************************** -->
+
 ## 概要(Overview)
 
 

diff --git a/.github/ISSUE_TEMPLATE/1_Bug_report.yml b/.github/ISSUE_TEMPLATE/1_Bug_report.yml
@@ -0,0 +1,29 @@
+name: 🐛 不具合報告(Bug Report)
+description: 脆弱性に関する報告はこちらからしないでください。
+labels: bug
+body:
+  - type: textarea
+    id: overview
+    attributes:
+      label: 概要(Overview)
+    validations:
+      required: true
+  - type: textarea
+    id: procedure
+    attributes:
+      label: 再現手順(Procedure)
+    validations:
+      required: true
+  - type: textarea
+    id: affected-versions
+    attributes:
+      label: 環境(Environment)
+      description:
+      placeholder: |
+        EC-CUBE: 4.2.x
+        PHP: 8.x.x
+        DB:
+           PostgresSQL x.x.x
+           MySQL x.x.x
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/2_Feature_request.yml b/.github/ISSUE_TEMPLATE/2_Feature_request.yml
@@ -0,0 +1,17 @@
+name: 🚀 改善要望(Feature Request)
+description: こんな機能が欲しいなど
+body:
+  - type: textarea
+    id: overview
+    attributes:
+      label: 概要(Overview)
+      description:
+    validations:
+      required: true
+  - type: textarea
+    id: example
+    attributes:
+      label: 期待する内容(Expect) or 要望(Requirement)
+      description:
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: 脆弱性報告(Vulnerability Report)
+    url: https://www.ec-cube.net/contact/
+    about: 公式サイトのお問い合わせフォームへ(概要と再現手順を必ずご記載ください)
+  - name: 質問(Question)
+    url: https://xoops.ec-cube.net/
+    about: 開発中に困ったことの相談や質問などは開発コミュニティへ
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,10 @@
 <!-- 以下を参考にコメントを作成してください。 -->
 
+<!-- ****************************************************************************
+脆弱性報告 (Vulnerability report)
+脆弱性のご報告は弊社[問い合わせフォーム](https://www.ec-cube.net/contact/)からお願いします。
+**************************************************************************** -->
+
 ## 概要(Overview・Refs Issue)
 <!-- PullRequestの目的、関連するIssue番号など -->
 

diff --git a/.github/actions/composer/action.yml b/.github/actions/composer/action.yml
@@ -0,0 +1,19 @@
+runs:
+  using: "Composite"
+  steps:
+    - name: Get Composer Cache Directory
+      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 }}
+        key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-composer-
+
+    - name: composer install
+      run: composer install --dev --no-interaction -o --apcu-autoloader
+      shell: bash
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -15,12 +15,11 @@ on:
 jobs:
   phpunit:
     name: PHPUnit
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
-        php: [ 7.4 ]
+        php: [ 8.1 ]
         db: [ pgsql ]
         include:
           - db: pgsql
@@ -41,30 +40,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v1
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
       - name: Setup PHP
         uses: nanasess/setup-php@master
         with:
           php-version: ${{ matrix.php }}
-
-      - name: composer install
-        run: composer install --dev --no-interaction -o --apcu-autoloader
-
+
       - name: Setup pcov
         run: |
-          sudo apt-fast install -y php7.4-pcov
+          sudo apt-fast install -y php8.1-pcov
           sudo phpenmod -s cli pcov
 
+      - name: Initialize Composer
+        uses: ./.github/actions/composer
+
       - name: Setup EC-CUBE
         env:
           APP_ENV: 'test'
@@ -82,7 +70,7 @@ jobs:
           DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
           MAILER_URL: 'smtp://127.0.0.1:1025'
         continue-on-error: true
-        run: bin/phpunit --exclude-group cache-clear,cache-clear-install,update-schema-doctrine --coverage-clover=coverage1.xml
+        run: php -dpcov.enabled=1 vendor/bin/phpunit --exclude-group cache-clear,cache-clear-install,update-schema-doctrine --coverage-clover=coverage1.xml
       - name: Upload report
         if: success()
         uses: actions/upload-artifact@v2
@@ -91,12 +79,11 @@ jobs:
           path: coverage1.xml
   codeception:
     name: Codeception
-    runs-on: ${{ matrix.operating-system }}
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        operating-system: [ ubuntu-18.04 ]
-        php: [ 7.4 ]
+        php: [ 8.1 ]
         db: [ pgsql ]
         group: [ admin01, admin02, admin03, front, installer ]
         include:
@@ -134,26 +121,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@master
 
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v1
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
       - name: Setup PHP
         uses: nanasess/setup-php@master
         with:
           php-version: ${{ matrix.php }}
 
-      - name: composer install
-        run: |
-          sudo composer selfupdate
-          composer install --dev --no-interaction -o --apcu-autoloader
+      - name: Initialize Composer
+        uses: ./.github/actions/composer
+
       - name: Setup to EC-CUBE
         env:
           APP_ENV: ${{ matrix.app_env }}
@@ -182,11 +157,15 @@ jobs:
           docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api:composer2
           cp codeception/_data/plugins/*-1.0.0.tgz repos
 
-      - name: Setup xdebug
+      - name: Setup pcov
+        run: |
+          sudo apt-fast install -y php8.1-pcov
+          sudo phpenmod -s cli pcov
+
+      - name: Setup codeception
         run: |
           composer config --no-plugins allow-plugins.codeception/c3 true
           composer require --dev codeception/c3 "2.*"
-          sudo phpenmod -s cli xdebug
           sed -i "7a include __DIR__.'/c3.php';" index.php
 
       - name: Start PHP Development Server
@@ -196,7 +175,6 @@ jobs:
           DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
           MAILER_URL: 'smtp://127.0.0.1:1025'
           ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
-          XDEBUG_MODE: coverage
         run: php -S 127.0.0.1:8000 &
 
       - name: Codeception
@@ -208,9 +186,8 @@ jobs:
           ECCUBE_PACKAGE_API_URL: 'http://127.0.0.1:8080'
           GROUP: ${{ matrix.group }}
           SYMFONY_DEPRECATIONS_HELPER: weak
-          XDEBUG_MODE: coverage
         continue-on-error: true
-        run: vendor/bin/codecept -vvv run acceptance --env chrome,github_action -g ${GROUP} --skip-group excludeCoverage --coverage --coverage-xml
+        run: php -dpcov.enabled=1 vendor/bin/codecept -vvv run acceptance --env chrome,github_action -g ${GROUP} --skip-group excludeCoverage --coverage --coverage-xml
       - name: Upload outputs
         uses: actions/upload-artifact@v2
         with:

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-18.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: postgres:14
@@ -35,19 +35,8 @@ jobs:
         with:
           php-version: '7.4'
 
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v1
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
-      - name: Install to Composer
-        run: composer install --no-scripts --no-dev --no-interaction --optimize-autoloader
+      - name: Initialize Composer
+        uses: ./.github/actions/composer
 
       - name: Translate to templates
         run: php bin/template_jp.php

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -25,17 +25,6 @@ jobs:
         with:
           php-version: '7.4'
 
-      - name: Get Composer Cache Directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v1
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
       - name: Install to Composer
         run: composer install --no-scripts --no-dev --no-interaction --optimize-autoloader