Merge pull request #5000 from nanasess/4.1-beta2-merge

4.1-feature ブランチを 4.1-beta2 ブランチに取り込み
EC-CUBE · Apr 5, 2021 · 4574bdd · 4574bdd
2 parents f844905 + 7542ae3
commit 4574bdd
Show file tree

Hide file tree

Showing 244 changed files with 16,218 additions and 2,330 deletions.
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/.env.dist b/.env.dist
@@ -41,6 +41,7 @@ MAILER_URL=null://localhost
 #ECCUBE_ADMIN_ROUTE=admin
 #ECCUBE_USER_DATA_ROUTE=user_data
 #ECCUBE_ADMIN_ALLOW_HOSTS=[]
+#ECCUBE_ADMIN_DENY_HOSTS=[]
 #ECCUBE_FORCE_SSL=false
 #ECCUBE_TEMPLATE_CODE=default
 #ECCUBE_AUTH_MAGIC=<change.me>

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -0,0 +1,89 @@
+name: Coverage
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - '*'
+    paths:
+      - '**'
+      - '!*.md'
+  pull_request:
+    paths:
+      - '**'
+      - '!*.md'
+jobs:
+  phpunit:
+    name: PHPUnit
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ ubuntu-18.04 ]
+        php: [ 7.4 ]
+        db: [ pgsql ]
+        include:
+          - db: pgsql
+            database_url: postgres://postgres:password@127.0.0.1:5432/eccube_db
+            database_server_version: 11
+    services:
+      postgres:
+        image: postgres:11
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    steps:
+      - 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: composer install --dev --no-interaction -o --apcu-autoloader
+
+      - name: Setup EC-CUBE
+        env:
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+        run: |
+          bin/console doctrine:database:create
+          bin/console doctrine:schema:create
+          bin/console eccube:fixtures:load
+
+      - name: PHPUnit
+        env:
+          APP_ENV: 'test'
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          MAILER_URL: 'smtp://localhost:1025'
+        continue-on-error: true
+        run: |
+          bin/phpunit --version
+          phpdbg -dmemory_limit=-1 -qrr bin/phpunit --exclude-group cache-clear,cache-clear-install,update-schema-doctrine --coverage-clover=coverage1.xml
+      - name: Upload coverage
+        uses: codecov/codecov-action@v1
+        with:
+          files: ./coverage1.xml
+          # token: ${{ secrets.CODECOV_TOKEN }}
+          flags: tests
+          # yml: ./codecov.yml
+          fail_ci_if_error: true
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -77,23 +77,21 @@ jobs:
           rm -rf $GITHUB_WORKSPACE/.gitignore
           rm -rf $GITHUB_WORKSPACE/.buildpath
           rm -rf $GITHUB_WORKSPACE/.gitmodules
-          rm -rf $GITHUB_WORKSPACE/.scrutinizer.yml
-          rm -rf $GITHUB_WORKSPACE/.travis.yml
-          rm -rf $GITHUB_WORKSPACE/appveyor.yml
-          rm -rf $GITHUB_WORKSPACE/.coveralls.yml
           rm -rf $GITHUB_WORKSPACE/.php_cs.dist
           rm -rf $GITHUB_WORKSPACE/phpunit.xml.dist
+          rm -rf $GITHUB_WORKSPACE/phpstan.neon.dist
           rm -rf $GITHUB_WORKSPACE/app.json
           rm -rf $GITHUB_WORKSPACE/Procfile
           rm -rf $GITHUB_WORKSPACE/LICENSE.txt
           rm -rf $GITHUB_WORKSPACE/README.md
-          rm -rf $GITHUB_WORKSPACE/codeception.sh
           rm -rf $GITHUB_WORKSPACE/codeception.yml
           rm -rf $GITHUB_WORKSPACE/var/*
           rm -rf $GITHUB_WORKSPACE/.env
           rm -rf $GITHUB_WORKSPACE/codeception
           rm -rf $GITHUB_WORKSPACE/tests
           rm -rf $GITHUB_WORKSPACE/.github
+          rm -rf $GITHUB_WORKSPACE/zap
+          rm -rf $GITHUB_WORKSPACE/docker-compose-owaspzap.yml
           find $GITHUB_WORKSPACE -name "dummy" -print0 | xargs -0 rm -rf
           find $GITHUB_WORKSPACE -name ".git*" -and ! -name ".gitkeep" -print0 | xargs -0 rm -rf
           find $GITHUB_WORKSPACE -name ".git*" -type d -print0 | xargs -0 rm -rf

diff --git a/.github/workflows/e2e-bc-test.yml b/.github/workflows/e2e-bc-test.yml
@@ -0,0 +1,134 @@
+name: Backward compatibility testing to Front template
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - '*'
+    paths:
+      - '**'
+      - '!*.md'
+  pull_request:
+    paths:
+      - '**'
+      - '!*.md'
+jobs:
+  codeception:
+    name: Codeception
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [ 4.0.0, 4.0.1, 4.0.2, 4.0.3, 4.0.4, 4.0.5 ]
+        operating-system: [ ubuntu-18.04 ]
+        php: [ 7.3 ]
+        db: [ pgsql ]
+        group: [ front ]
+        include:
+          - db: pgsql
+            database_url: postgres://postgres:password@127.0.0.1:5432/eccube_db
+            database_server_version: 11
+          - group: front
+            app_env: 'codeception'
+
+    services:
+      postgres:
+        image: postgres:11
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+        ports:
+          - 5432:5432
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+      mailcatcher:
+        image: schickling/mailcatcher
+        ports:
+          - 1080:1080
+          - 1025:1025
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: Checkout to front templates
+        env:
+          ECCUBE_VERSION: ${{ matrix.version }}
+        run: |
+          git remote add upstream https://github.com/EC-CUBE/ec-cube.git
+          git fetch upstream --tags
+          git checkout refs/tags/${ECCUBE_VERSION} src/Eccube/Resource/template/default
+          git checkout refs/tags/${ECCUBE_VERSION} html/template/default
+
+      - 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 to EC-CUBE
+        env:
+          APP_ENV: ${{ matrix.app_env }}
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+        run: |
+          echo "APP_ENV=${APP_ENV}" > .env
+          bin/console doctrine:database:create --env=dev
+          bin/console doctrine:schema:create --env=dev
+          bin/console eccube:fixtures:load --env=dev
+
+      - name: setup-chromedriver
+        uses: nanasess/setup-chromedriver@master
+
+      - name: Run chromedriver
+        run: |
+          export DISPLAY=:99
+          chromedriver --url-base=/wd/hub &
+          echo ">>> Started chrome-driver"
+          sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+          echo ">>> Started xvfb"
+
+      - name: Start PHP Development Server
+        env:
+          APP_ENV: 'codeception'
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          MAILER_URL: 'smtp://localhost:1025'
+          ECCUBE_PACKAGE_API_URL: 'http://localhost:8080'
+        run: php -S localhost:8000 &
+
+      - name: Codeception
+        env:
+          APP_ENV: ${{ matrix.app_env }}
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          MAILER_URL: 'smtp://localhost:1025'
+          ECCUBE_PACKAGE_API_URL: 'http://localhost:8080'
+          GROUP: ${{ matrix.group }}
+          SYMFONY_DEPRECATIONS_HELPER: weak
+        run: vendor/bin/codecept -vvv run acceptance --env chrome,github_action -g ${GROUP}
+      - name: Upload evidence
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: codeception-${{ matrix.group }}-evidence
+          path: codeception/_output/
+      - name: Upload logs
+        if: failure()
+        uses: actions/upload-artifact@v2
+        with:
+          name: codeception-${{ matrix.group }}-logs
+          path: var/log/
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -0,0 +1,32 @@
+name: PHPStan
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - '*'
+    paths:
+      - '**'
+      - '!*.md'
+  pull_request:
+    paths:
+      - '**'
+      - '!*.md'
+
+jobs:
+  phpstan:
+    name: PHPStan
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: "Checkout"
+      uses: actions/checkout@v2
+    - name: Setup PHP
+      uses: nanasess/setup-php@master
+      with:
+        php-version: '7.4'
+    - name: composer install
+      run: composer install --dev --no-interaction -o --apcu-autoloader
+    - name: PHPStan
+      run: vendor/bin/phpstan analyze src/ --error-format=github
diff --git a/.github/workflows/plugin-test.yml b/.github/workflows/plugin-test.yml
@@ -226,6 +226,7 @@ jobs:
 
       - name: Install to Composer
         run: composer install --dev --no-interaction -o --apcu-autoloader
+
       - name: Setup to EC-CUBE
         env:
           APP_ENV: 'codeception'
@@ -367,6 +368,7 @@ jobs:
 
       - name: Install to Composer
         run: composer install --dev --no-interaction -o --apcu-autoloader
+
       - name: Setup to EC-CUBE
         env:
           APP_ENV: 'codeception'
@@ -511,6 +513,7 @@ jobs:
 
       - name: Install to Composer
         run: composer install --dev --no-interaction -o --apcu-autoloader
+
       - name: Setup to EC-CUBE
         env:
           APP_ENV: 'codeception'

diff --git a/.gitignore b/.gitignore
@@ -2,48 +2,44 @@
 !.gitmodule
 composer.phar
 /vendor/
-/node_modules/
+node_modules
 /var/*
 !/var/.gitkeep
-/app/cache/*
-!/app/cache/.gitkeep
-/app/log/*
-!/app/log/.gitkeep
+!/var/.htaccess
 /app/Plugin/*
 !/app/Plugin/.gitkeep
-!/app/Plugin/ExamplePlugin
 /app/PluginData/*
 !/app/PluginData/.gitkeep
 /app/template/*
 !/app/template/admin
 !/app/template/default
 !/app/template/user_data
+!/app/template/smartphone
 /app/proxy/entity/*
 !/app/proxy/entity/.gitkeep
 /html/plugin/*
 !/html/plugin/.gitkeep
-/html/install/temp/*
 /html/upload/save_image/*
 !/html/upload/save_image/.gitkeep
+!/html/upload/save_image/no_image_product.png
 /html/upload/temp_image/*
 !/html/upload/temp_image/.gitkeep
-/html/upload/temp_plugin/*
 /html/template/*
 !/html/template/admin
 !/html/template/default
 !/html/template/install
 /html/user_data/*
+!/html/user_data/.gitkeep
 !/html/user_data/assets/css/customize.css
 !/html/user_data/assets/js/customize.js
-!/html/user_data/.gitkeep
-/src/Eccube/Resource/config/*.dist.php
 /tests/tmp/*
 /reports/*
 .idea
 .vscode/
 *.php~
 .env
 .maintenance
+*.neon
 
 ###> symfony/phpunit-bridge ###
 .phpunit