Merge remote-tracking branch 'upstream/4.0' into upload-evidence

EC-CUBE · Jun 15, 2020 · 4a97293 · 4a97293
2 parents a5a3617 + aa7f803
commit 4a97293
Show file tree

Hide file tree

Showing 16 changed files with 1,673 additions and 2,406 deletions.
diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml
@@ -196,7 +196,7 @@ jobs:
         DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
         MAILER_URL: 'smtp://localhost:1025'
         ECCUBE_PACKAGE_API_URL: 'http://localhost:8080'
-      run: php -S localhost:8000 &
+      run: php -dsession.save_path=${GITHUB_WORKSPACE}/var/sessions/${APP_ENV} -S localhost:8000 &
 
     - name: Codeception
       env:
@@ -332,7 +332,7 @@ jobs:
         DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
         MAILER_URL: 'smtp://localhost:1025'
         ECCUBE_PACKAGE_API_URL: 'http://localhost:8080'
-      run: php -S localhost:8000 &
+      run: php -dsession.save_path=${GITHUB_WORKSPACE}/var/sessions/${APP_ENV} -S localhost:8000 &
 
     ## ${PWD}/repos does not exist so service cannot be started
     - name: Run package-api
@@ -473,7 +473,7 @@ jobs:
         DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
         MAILER_URL: 'smtp://localhost:1025'
         ECCUBE_PACKAGE_API_URL: 'http://localhost:8080'
-      run: php -S localhost:8000 &
+      run: php -dsession.save_path=${GITHUB_WORKSPACE}/var/sessions/${APP_ENV} -S localhost:8000 &
 
     ## ${PWD}/repos does not exist so service cannot be started
     - name: Run package-api
@@ -614,7 +614,7 @@ jobs:
         DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
         MAILER_URL: 'smtp://localhost:1025'
         ECCUBE_PACKAGE_API_URL: 'http://localhost:8080'
-      run: php -S localhost:8000 &
+      run: php -dsession.save_path=${GITHUB_WORKSPACE}/var/sessions/${APP_ENV} -S localhost:8000 &
 
     ## ${PWD}/repos does not exist so service cannot be started
     - name: Run package-api
@@ -757,7 +757,7 @@ jobs:
         DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }}
         MAILER_URL: 'smtp://localhost:1025'
         ECCUBE_PACKAGE_API_URL: 'http://localhost:8080'
-      run: php -S localhost:8000 &
+      run: php -dsession.save_path=${GITHUB_WORKSPACE}/var/sessions/${APP_ENV} -S localhost:8000 &
 
     ## ${PWD}/repos does not exist so service cannot be started
     - name: Run package-api

diff --git a/app/config/eccube/services.yaml b/app/config/eccube/services.yaml
@@ -174,6 +174,8 @@ services:
 
     native_file_session_handler:
         class: Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeFileSessionHandler
+        arguments:
+            - '%session.save_path%'
 
     Eccube\Session\Storage\Handler\SameSiteNoneCompatSessionHandler:
         arguments:

diff --git a/gulpfile.js b/gulpfile.js
@@ -12,6 +12,7 @@ const browserSync = require('browser-sync')
 // sass
 const sass = require('gulp-sass');
 const postcss = require('gulp-postcss');
+const atImport = require('postcss-import');
 const autoprefixer = require('autoprefixer');
 const cssmqpacker = require('css-mqpacker');
 const sortCSSmq = require('sort-css-media-queries');
@@ -79,6 +80,7 @@ const sassTask = () => {
     }))
     .pipe(sass())
     .pipe(postcss([
+      atImport(),
       autoprefixer(),
       cssmqpacker({
         sort: sortCSSmq