Merge pull request #989 from nielstholenaar/master

Fixes #825

src/Install/Console/DefaultsDataProvider.php

@@ -20,6 +20,7 @@ class DefaultsDataProvider implements DataProviderInterface
         'username' => 'root',
         'password' => 'root',
         'prefix'   => '',
+        'port'     => '3306',
     ];
 
     protected $baseUrl = 'http://flarum.dev';

src/Install/Console/InstallCommand.php

@@ -134,7 +134,8 @@ class InstallCommand extends AbstractCommand
                     'host' => 'required',
                     'database' => 'required|string',
                     'username' => 'required|string',
-                    'prefix' => 'alpha_dash|max:10'
+                    'prefix' => 'alpha_dash|max:10',
+                    'port'   => 'required|integer|min:1|max:65535',
                 ]
             );
 
@@ -204,6 +205,7 @@ class InstallCommand extends AbstractCommand
                 'charset'   => 'utf8mb4',
                 'collation' => 'utf8mb4_unicode_ci',
                 'prefix'    => $dbConfig['prefix'],
+                'port'      => $dbConfig['port'],
                 'strict'    => false
             ],
             'url'   => $this->baseUrl,

src/Install/Controller/InstallController.php

@@ -59,6 +59,7 @@ class InstallController implements ControllerInterface
             'username' => array_get($input, 'mysqlUsername'),
             'password' => array_get($input, 'mysqlPassword'),
             'prefix'   => array_get($input, 'tablePrefix'),
+            'port'     => array_get($input, 'mysqlPort'),
         ]);
 
         $data->setAdminUser([

views/install/install.php

@@ -33,6 +33,11 @@
       <input type="password" name="mysqlPassword">
     </div>
 
+    <div class="FormField">
+      <label>MySQL Port</label>
+      <input type="number" name="mysqlPort">
+    </div>
+
     <div class="FormField">
       <label>Table Prefix</label>
       <input type="text" name="tablePrefix">