Merge branch 'release/2.2.11' into craft-webpack

nystudio107 · May 26, 2020 · 5721732 · 5721732
2 parents e6d37a6 + d663956
commit 5721732
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/craft Change Log
 
+## 2.2.11 - 2020.05.26
+### Changed
+* Use DSN for database connections
+
 ## 2.2.10 - 2020.05.20
 ### Added
 * Added baked-in support for xdebug

diff --git a/cms/config/db.php b/cms/config/db.php
@@ -9,12 +9,9 @@
  */
 
 return [
-    'driver' => getenv('DB_DRIVER'),
-    'server' => getenv('DB_SERVER'),
+    'dsn' => getenv('DB_DSN'),
     'user' => getenv('DB_USER'),
     'password' => getenv('DB_PASSWORD'),
-    'database' => getenv('DB_DATABASE'),
     'schema' => getenv('DB_SCHEMA'),
     'tablePrefix' => getenv('DB_TABLE_PREFIX'),
-    'port' => getenv('DB_PORT')
 ];
diff --git a/cms/example.env b/cms/example.env
@@ -10,14 +10,11 @@ RUN_QUEUE_AUTOMATICALLY=1
 SECURITY_KEY=EOdiVBONceb8zFGJP7InMui2pMkvNACz
 
 # Craft database settings
-DB_DRIVER=mysql
-DB_SERVER=mariadb
+DB_DSN=mysql:host=mariadb;port=3306;dbname=project
 DB_USER=project
 DB_PASSWORD=project
-DB_DATABASE=project
 DB_SCHEMA=public
 DB_TABLE_PREFIX=
-DB_PORT=
 
 # URL & path settings
 ASSETS_URL=http://localhost:8000

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "craftcms/craft",
   "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.2.10",
+  "version": "2.2.11",
   "keywords": [
     "craft",
     "cms",