Allow database port definitions in config-userfrosting.php

Author: Netrilix

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Fixed some minor error screen layout issues
 - Make User::fresh() compatible with Eloquent\Model v5.2.40+
 - Update composer require to allow for Fortress 1.x bugfixes
+- Allow database port definitions in config-userfrosting.php
 
 ## v0.3.1.18
 

userfrosting/config-userfrosting-example.php

@@ -41,6 +41,7 @@
             ],
             'db'            =>  [
                 'db_host'  => 'localhost',
+                'db_port'  => '', // Leave blank to use the default port for your database driver (eg. 3306 for MySQL)
                 'db_name'  => 'userfrosting',
                 'db_user'  => 'admin',
                 'db_pass'  => 'password',
@@ -90,6 +91,7 @@
             ],
             'db'            =>  [
                 'db_host'  => 'localhost',
+                'db_port'  => '', // Leave blank to use the default port for your database driver (eg. 3306 for MySQL)
                 'db_name'  => 'userfrosting',
                 'db_user'  => 'admin',
                 'db_pass'  => 'password',

userfrosting/initialize.php

@@ -40,7 +40,7 @@
 
 $dbx = $app->config('db');
 
-$capsule->addConnection([
+$connection_array = [
     'driver'    => 'mysql',
     'host'      => $dbx['db_host'],
     'database'  => $dbx['db_name'],
@@ -49,7 +49,15 @@
     'charset'   => 'utf8',
     'collation' => 'utf8_unicode_ci',
     'prefix'    => ''
-]);
+];
+
+// This is for backwards compatibility. Pre-0.3.1.19 configuration files won't have $dbx['db_port'] defined at all.
+if (isset($dbx['db_port']))
+{
+    $connection_array['port'] = $dbx['db_port'];
+}
+
+$capsule->addConnection($connection_array);
 
 // Register as global connection
 $capsule->setAsGlobal();