Allow port configuration for database adapter (#1008)

config/vufind/config.ini

@@ -450,6 +450,14 @@ sms = enabled
 
 ; This section needs to be changed to match your database connection information
 [Database]
+; Connection string format is [platform]://[username]:[password]@[host]:[port]/[db]
+; where:
+; [platform] = database platform (mysql, oci8 or pgsql)
+; [username] = username for connection
+; [password] = password for connection (optional)
+; [host] = host of database server
+; [port] = port of database server (optional)
+; [db] = database name
 database          = mysql://root@localhost/vufind
 
 ; If your database (e.g. PostgreSQL) uses a schema, you can set it here:

module/VuFind/src/VuFind/Db/AdapterFactory.php

@@ -146,7 +146,13 @@ public function getAdapterFromConnectionString($connectionString,
         list($type, $details) = explode('://', $connectionString);
         preg_match('/(.+)@([^@]+)\/(.+)/', $details, $matches);
         $credentials = isset($matches[1]) ? $matches[1] : null;
-        $host = isset($matches[2]) ? $matches[2] : null;
+        if (isset($matches[2])) {
+            if (strpos($matches[2], ':') !== false) {
+                list($host, $port) = explode(':', $matches[2]);
+            } else {
+                $host = $matches[2];
+            }
+        }
         $dbName = isset($matches[3]) ? $matches[3] : null;
         if (strstr($credentials, ':')) {
             list($username, $password) = explode(':', $credentials, 2);
@@ -160,12 +166,14 @@ public function getAdapterFromConnectionString($connectionString,
         // Set up default options:
         $options = [
             'driver' => $this->getDriverName($type),
-            'hostname' => $host,
+            'hostname' => isset($host) ? $host : null,
             'username' => $username,
             'password' => $password,
             'database' => $dbName
         ];
-
+        if (!empty($port)) {
+            $options['port'] = $port;
+        }
         return $this->getAdapterFromOptions($options);
     }
 }