Merge branch '4.1' into 4.1/seo

EC-CUBE · Jul 6, 2021 · 42679be · 42679be
2 parents 148df88 + 8c3ae69
commit 42679be
Show file tree

Hide file tree

Showing 478 changed files with 7,524 additions and 5,187 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -58,9 +58,7 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: |
-          sudo composer selfupdate --1
-          composer install --dev --no-interaction -o --apcu-autoloader
+        run: composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup EC-CUBE
         env:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -6,6 +6,16 @@ jobs:
   deploy:
     name: Deploy
     runs-on: ubuntu-18.04
+    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
@@ -27,13 +37,35 @@ jobs:
             ${{ runner.os }}-composer-
 
       - name: Install to Composer
-        run: |
-          sudo composer selfupdate --1
-          composer install --no-scripts --no-dev --no-interaction --optimize-autoloader
+        run: composer install --no-scripts --no-dev --no-interaction --optimize-autoloader
 
       - name: Translate to templates
         run: php bin/template_jp.php
 
+      - name: Setup to EC-CUBE
+        env:
+          APP_ENV: 'prod'
+          DATABASE_URL: postgres://postgres:[email protected]:5432/eccube_db
+          DATABASE_SERVER_VERSION: 11
+        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: Install Plugins
+        env:
+          APP_ENV: 'prod'
+          DATABASE_URL: postgres://postgres:[email protected]:5432/eccube_db
+          DATABASE_SERVER_VERSION: 11
+        run: |
+          bin/console eccube:composer:require "ec-cube/Api:^2.0"
+
+      - name: Pre Install Plugins
+        env:
+          PGPASSWORD: 'password'
+        run: psql eccube_db -h 127.0.0.1 -U postgres -c "select * from dtb_plugin;" -A -F, --pset footer > src/Eccube/Resource/doctrine/import_csv/ja/dtb_plugin.csv
+
       - name: Packaging
         working-directory: ../
         env:
@@ -53,12 +85,13 @@ jobs:
           rm -rf $GITHUB_WORKSPACE/LICENSE.txt
           rm -rf $GITHUB_WORKSPACE/README.md
           rm -rf $GITHUB_WORKSPACE/codeception.yml
-          rm -rf $GITHUB_WORKSPACE/app/Plugin/*
+          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
+          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/dockerbuild.yml b/.github/workflows/dockerbuild.yml
@@ -0,0 +1,112 @@
+name: Testing dockerbuild
+on:
+  push:
+    paths:
+      - 'Dockerfile'
+      - 'dockerbuild/*'
+      - 'docker-compose*.yml'
+      - '.github/workflows/dockerbuild.yml'
+  pull_request:
+    paths:
+      - 'Dockerfile'
+      - 'dockerbuild/*'
+      - 'docker-compose*.yml'
+      - '.github/workflows/dockerbuild.yml'
+
+jobs:
+  dockerbuild:
+    name: dockerbuild
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      fail-fast: false
+      matrix:
+        operating-system: [ ubuntu-18.04 ]
+        php: [ 7.3 ]
+        db: [ pgsql ]
+        group: [ admin01 ]
+        include:
+          - db: pgsql
+            database_url: postgres://dbuser:[email protected]:15432/eccubedb
+            database_server_version: 11
+          - group: admin01
+            app_env: 'codeception'
+          # - group: admin02
+          #   app_env: 'codeception'
+          # - group: admin03
+          #   app_env: 'codeception'
+          # - group: front
+          #   app_env: 'codeception'
+          # - group: installer
+          #   app_env: 'install'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@master
+
+      - name: docker build
+        run: docker-compose build
+
+      - 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: |
+          docker-compose -f docker-compose.yml -f docker-compose.pgsql.yml up -d
+          docker-compose -f docker-compose.yml -f docker-compose.pgsql.yml exec -T ec-cube  bin/console doctrine:schema:create --env=dev
+          docker-compose -f docker-compose.yml -f docker-compose.pgsql.yml exec -T ec-cube  bin/console eccube:fixtures:load --env=dev
+          sed -i 's!APP_ENV: "dev"!APP_ENV: "prod"!g' docker-compose.yml
+          docker-compose -f docker-compose.yml -f docker-compose.pgsql.yml up -d
+
+      - 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: Codeception
+        env:
+          APP_ENV: ${{ matrix.app_env }}
+          DATABASE_URL: ${{ matrix.database_url }}
+          DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
+          MAILER_URL: 'smtp://localhost:1025'
+          GROUP: ${{ matrix.group }}
+          SYMFONY_DEPRECATIONS_HELPER: weak
+        run: |
+          echo "APP_ENV=${APP_ENV}" > .env
+          vendor/bin/codecept -vvv run acceptance --env chrome,github_action_docker -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/e2e-bc-test.yml b/.github/workflows/e2e-bc-test.yml
@@ -78,9 +78,7 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: |
-          sudo composer selfupdate --1
-          composer install --dev --no-interaction -o --apcu-autoloader
+        run: composer install --dev --no-interaction -o --apcu-autoloader
       - name: Setup to EC-CUBE
         env:
           APP_ENV: ${{ matrix.app_env }}

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -75,9 +75,7 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: |
-          sudo composer selfupdate --1
-          composer install --dev --no-interaction -o --apcu-autoloader
+        run: composer install --dev --no-interaction -o --apcu-autoloader
       - name: Setup to EC-CUBE
         env:
           APP_ENV: ${{ matrix.app_env }}

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -27,8 +27,6 @@ jobs:
       with:
         php-version: '7.4'
     - name: composer install
-      run: |
-        sudo composer selfupdate --1
-        composer install --dev --no-interaction -o --apcu-autoloader
+      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
@@ -83,9 +83,7 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: |
-          sudo composer selfupdate --1
-          composer install --dev --no-interaction -o --apcu-autoloader
+        run: composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup to EC-CUBE
         env:
@@ -134,7 +132,7 @@ jobs:
       - name: Run package-api
         run: |
           if [[ ! -d ${PWD}/repos ]]; then mkdir -p ${PWD}/repos ; fi
-          docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api
+          docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api:composer2
 
       - name: Codeception
         env:
@@ -227,9 +225,7 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: Install to Composer
-        run: |
-          sudo composer selfupdate --1
-          composer install --dev --no-interaction -o --apcu-autoloader
+        run: composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup to EC-CUBE
         env:
@@ -278,7 +274,7 @@ jobs:
       - name: Run package-api
         run: |
           if [[ ! -d ${PWD}/repos ]]; then mkdir -p ${PWD}/repos ; fi
-          docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api
+          docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api:composer2
 
       - name: Run to Codeception
         env:
@@ -371,9 +367,7 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: Install to Composer
-        run: |
-          sudo composer selfupdate --1
-          composer install --dev --no-interaction -o --apcu-autoloader
+        run: composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup to EC-CUBE
         env:
@@ -422,7 +416,7 @@ jobs:
       - name: Run package-api
         run: |
           if [[ ! -d ${PWD}/repos ]]; then mkdir -p ${PWD}/repos ; fi
-          docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api
+          docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api:composer2
 
       - name: Run to Codeception
         env:
@@ -518,9 +512,7 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: Install to Composer
-        run: |
-          sudo composer selfupdate --1
-          composer install --dev --no-interaction -o --apcu-autoloader
+        run: composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup to EC-CUBE
         env:
@@ -569,7 +561,7 @@ jobs:
       - name: Run package-api
         run: |
           if [[ ! -d ${PWD}/repos ]]; then mkdir -p ${PWD}/repos ; fi
-          docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api
+          docker run -d --rm -v ${PWD}/repos:/repos -e MOCK_REPO_DIR=/repos -p 8080:8080 eccube/mock-package-api:composer2
 
       - name: Run to Codeception
         env:

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -72,9 +72,7 @@ jobs:
           php-version: ${{ matrix.php }}
 
       - name: composer install
-        run: |
-          sudo composer selfupdate --1
-          composer install --dev --no-interaction -o --apcu-autoloader
+        run: composer install --dev --no-interaction -o --apcu-autoloader
 
       - name: Setup EC-CUBE
         env:

diff --git a/.htaccess b/.htaccess
@@ -1,15 +1,22 @@
 DirectoryIndex index.php index.html .ht
 
+<Files ~ "/index.php">
+    order deny,allow
+    allow from all
+</Files>
+
+<FilesMatch "(?<!\.gif|\.png|\.jpg|\.jpeg|\.css|\.ico|\.js|\.svg|\.map)$">
+    SetEnvIf Request_URI "/vendor/" deny_dir
+    Order allow,deny
+    Deny from env=deny_dir
+    Allow from all
+</FilesMatch>
+
 <FilesMatch "^composer|^COPYING|^\.env|^\.maintenance|^Procfile|^app\.json|^gulpfile\.js|^package\.json|^package-lock\.json|web\.config|^Dockerfile|^\.editorconfig|\.(ini|lock|dist|git|sh|bak|swp|env|twig|yml|yaml|dockerignore|sample)$">
     order allow,deny
     deny from all
 </FilesMatch>
 
-<Files ~ "index.php">
-    order deny,allow
-    allow from all
-</Files>
-
 <IfModule mod_setenvif.c>
   SetEnvIf Request_URI "\.(jpe?g|png)$" _image_request
 </IfModule>
@@ -26,7 +33,7 @@ DirectoryIndex index.php index.html .ht
     Header append Vary Accept env=_image_request
 </IfModule>
 
-# デザインテンプレートを適用するため10Mで設定 
+# デザインテンプレートを適用するため10Mで設定
 <IfModule mod_php7.c>
     php_value upload_max_filesize 10M
 </IfModule>
@@ -38,7 +45,7 @@ DirectoryIndex index.php index.html .ht
     #Options +FollowSymLinks +SymLinksIfOwnerMatch
 
     RewriteEngine On
-    
+
     # Acceptヘッダがimage/webpを含む場合
     RewriteCond %{HTTP_ACCEPT} image/webp
     RewriteCond %{SCRIPT_FILENAME}.webp -f

diff --git a/.php_cs.dist b/.php_cs.dist
@@ -18,6 +18,7 @@ $rules = [
     'phpdoc_summary' => false,
     'phpdoc_scalar' => false,
     'phpdoc_annotation_without_dot' => false,
+    'no_superfluous_phpdoc_tags' => false,
     'increment_style' => false,
     'yoda_style' => false,
     'header_comment' => ['header' => $header],