Merge branch 'master' of github.com:phanan/koel

This commit is contained in:
Phan An 2017-12-03 18:01:27 +01:00
commit 95595e65ca
2 changed files with 7 additions and 6 deletions

View file

@ -108,7 +108,7 @@ class Init extends Command
'DB_PORT' => '',
'DB_DATABASE' => '',
'DB_USERNAME' => '',
'DB_PASSWORD' => ''
'DB_PASSWORD' => '',
];
$config['DB_CONNECTION'] = $this->choice(
@ -117,7 +117,7 @@ class Init extends Command
'mysql' => 'MySQL/MariaDB',
'pqsql' => 'PostgreSQL',
'sqlsrv' => 'SQL Server',
'sqlite-e2e' => 'SQLite'
'sqlite-e2e' => 'SQLite',
],
'mysql'
);
@ -153,7 +153,7 @@ class Init extends Command
private function setUpAdminAccount()
{
$this->info("Let's create the admin account.");
$name = $this->ask("Your name");
$name = $this->ask('Your name');
$email = $this->ask('Your email address');
$passwordConfirmed = false;
while (!$passwordConfirmed) {
@ -189,6 +189,7 @@ class Init extends Command
if (is_dir($path) && is_readable($path)) {
Setting::set('media_path', $path);
return;
}

View file

@ -1,6 +1,6 @@
<?php
return array(
return [
/*
|----------------------------------------------------------------------
@ -22,6 +22,6 @@ return array(
| path from root folder of project application.
*/
'backupPath' => base_path('storage/dotenv-editor/backups/')
'backupPath' => base_path('storage/dotenv-editor/backups/'),
);
];