Merge branch 'develop' into trunk

.env.example

@@ -8,7 +8,6 @@ DB_PASSWORD='database_password'
 
 # Optional database variables
 DB_HOST='localhost'
-DB_PORT='3306'
 DB_PREFIX='wp_'
 
 WP_ENV='development'

config/application.php

@@ -90,15 +90,7 @@ if (env('DB_SSL')) {
 Config::define('DB_NAME', env('DB_NAME'));
 Config::define('DB_USER', env('DB_USER'));
 Config::define('DB_PASSWORD', env('DB_PASSWORD'));
-Config::define(
-    'DB_HOST',
-    (env('DB_PORT') ?
-        sprintf(
-            '%s:%s',
-            env('DB_HOST'),
-            env('DB_PORT')
-        ) : env('DB_HOST')) ?: 'localhost'
-);
+Config::define('DB_HOST', env('DB_HOST') ?: 'localhost');
 Config::define('DB_CHARSET', 'utf8mb4');
 Config::define('DB_COLLATE', '');
 $table_prefix = env('DB_PREFIX') ?: 'wp_';

manifest.yaml

@@ -8,7 +8,6 @@ data:
   DB_USER: "${APP_DB_USER}"
   DB_PASSWORD: "${APP_DB_PASSWORD}"
   DB_HOST: "${APP_DB_HOST}"
-  DB_PORT: "${APP_DB_PORT}"
   DB_PREFIX: "wp01_"
   WP_ENV: "${APP_WP_ENV}"
   WP_HOME: "https://${REDIRECT}${APP_DOMAIN}"