1
0
mirror of https://github.com/flarum/core.git synced 2025-08-20 15:21:49 +02:00

Merge pull request #989 from nielstholenaar/master

Fixes #825
This commit is contained in:
Franz Liedke
2017-02-03 17:51:07 +01:00
committed by GitHub
4 changed files with 10 additions and 1 deletions

View File

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

View File

@@ -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,

View File

@@ -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([