Merge remote-tracking branch 'upstream/4.1-feature' into feature/supp…

…ort_option_require_kana

.devcontainer/devcontainer.json

@@ -0,0 +1,25 @@
+{
+    "name": "eccube",
+    "dockerComposeFile": [
+        "../docker-compose.yml"
+    ],
+    "service": "ec-cube",
+    "workspaceFolder": "/var/www/html",
+    "settings": {
+        "intelephense.environment.phpVersion": "7.3",
+        "php-cs-fixer.allowRisky": false,
+        "php-cs-fixer.config": "/var/www/html/.php_cs.dist",
+        "php-cs-fixer.executablePath": "/var/www/html/vendor/bin/php-cs-fixer",
+        "php-cs-fixer.lastDownload": 0,
+        "php-cs-fixer.onsave": true,
+        "php.suggest.basic": false,
+        "php.validate.enable": false,
+        "terminal.integrated.shell.linux": null
+    },
+    "extensions": [
+        "junstyle.php-cs-fixer",
+        "bmewburn.vscode-intelephense-client",
+        "mblode.twig-language-2",
+        "EditorConfig.EditorConfig"
+    ]
+}

.editorconfig

@@ -16,6 +16,9 @@ indent_size = 4
 indent_style = space
 indent_size = 2
 
+[*.md]
+trim_trailing_whitespace = false
+
 [codeception/**.{yml,yaml}]
 indent_style = space
 indent_size = 4

.env.dist

@@ -3,8 +3,10 @@
 # https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
 
 ###> symfony/framework-bundle ###
-APP_ENV=dev
-APP_DEBUG=1
+# For production servers, use: "APP_ENV=prod" and "APP_DEBUG=0"
+# For local development, use: "APP_ENV=dev" and "APP_DEBUG=1"
+APP_ENV=prod
+APP_DEBUG=0
 #TRUSTED_PROXIES=127.0.0.1,127.0.0.2
 #TRUSTED_HOSTS=localhost,example.com
 ###< symfony/framework-bundle ###

.env.install

@@ -1,4 +1,4 @@
 ###> symfony/framework-bundle ###
 APP_ENV=install
-APP_DEBUG=1
+APP_DEBUG=0
 ###< symfony/framework-bundle ###