Merge branch '4.2' into dev/vaddy42

dotani1111 · Dec 12, 2023 · 33494d0 · 33494d0
2 parents 13ebabe + cae3bf9
commit 33494d0
Show file tree

Hide file tree

Showing 5 changed files with 513 additions and 210 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
     "service": "ec-cube",
     "workspaceFolder": "/var/www/html",
     "settings": {
-        "intelephense.environment.phpVersion": "7.3",
+        "intelephense.environment.phpVersion": "7.4",
         "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",

diff --git a/app/config/eccube/packages/doctrine.yaml b/app/config/eccube/packages/doctrine.yaml
@@ -25,6 +25,7 @@ doctrine:
         types:
             datetime: 'Eccube\Doctrine\DBAL\Types\UTCDateTimeType'
             datetimetz: 'Eccube\Doctrine\DBAL\Types\UTCDateTimeTzType'
+        default_connection: 'default'
     orm:
         auto_generate_proxy_classes: '%kernel.debug%'
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware