github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-21 08:22:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: validate required cli install args (#4093)

Browse Source
This commit is contained in:
Sami Mazouz 2024-11-29 11:17:30 +01:00 committed by GitHub
parent 5fbb9fe9a7
commit 7f001dfe3b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
framework/core/src/Install/Console/UserDataProvider.php
View File

@ -13,6 +13,7 @@ use Flarum\Install\AdminUser;
use Flarum\Install\BaseUrl;
use Flarum\Install\DatabaseConfig;
use Flarum\Install\Installation;
use Flarum\Install\ValidationFailed;
use Illuminate\Support\Str;
use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\InputInterface;
@ -50,13 +51,13 @@ class UserDataProvider implements DataProviderInterface
};
if (in_array($driver, ['mysql', 'pgsql'])) {
$host = $this->ask('Database host (required):');
$host = $this->ask('Database host (required):', required: true);
if (Str::contains($host, ':')) {
list($host, $port) = explode(':', $host, 2);
}
$user = $this->ask('Database user (required):');
$user = $this->ask('Database user (required):', required: true);
$password = $this->secret('Database password:');
}
@ -64,7 +65,7 @@ class UserDataProvider implements DataProviderInterface
$driver,
$host ?? null,
intval($port),
$this->ask('Database name (required):'),
$this->ask('Database name (required):', required: true),
$user ?? null,
$password ?? null,
$this->ask('Prefix:')
@ -83,7 +84,7 @@ class UserDataProvider implements DataProviderInterface
return new AdminUser(
$this->ask('Admin username (Default: admin):', 'admin'),
$this->askForAdminPassword(),
$this->ask('Admin email address (required):')
$this->ask('Admin email address (required):', required: true)
);
}
@ -119,10 +120,20 @@ class UserDataProvider implements DataProviderInterface
];
}
private function ask(string $question, ?string $default = null): mixed
private function ask(string $question, ?string $default = null, bool $required = false): mixed
{
$question = new Question("<question>$question</question> ", $default);
if ($required) {
$question->setValidator(function ($value) {
if (empty($value)) {
throw new ValidationFailed('This value is required');
}
return $value;
});
}
return $this->questionHelper->ask($this->input, $this->output, $question);
}