github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-02 23:23:52 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fixes #825

Browse Source
This commit is contained in:
Niels Tholenaar 2016-06-20 12:15:25 +02:00
parent 85dd911d4d
commit 65da26228c
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/core/src/Install/Console/DefaultsDataProvider.php
View File

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

4
framework/core/src/Install/Console/InstallCommand.php
View File

@ -133,7 +133,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',
]
);
@ -203,6 +204,7 @@ class InstallCommand extends AbstractCommand
'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci',
'prefix' => $dbConfig['prefix'],
'port' => $dbConfig['port'],
'strict' => false
],
'url' => $this->baseUrl,

1
framework/core/src/Install/Controller/InstallController.php
View File

@ -58,6 +58,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([

5
framework/core/views/install/install.php
View File

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