X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/a6633642232efd164d4708967ab59e498fbff896..refs/pull/3099/head:/app/Console/Commands/CreateAdmin.php diff --git a/app/Console/Commands/CreateAdmin.php b/app/Console/Commands/CreateAdmin.php index 3d1a3dca0..149444420 100644 --- a/app/Console/Commands/CreateAdmin.php +++ b/app/Console/Commands/CreateAdmin.php @@ -4,6 +4,7 @@ namespace BookStack\Console\Commands; use BookStack\Auth\UserRepo; use Illuminate\Console\Command; +use Symfony\Component\Console\Command\Command as SymfonyCommand; class CreateAdmin extends Command { @@ -38,8 +39,9 @@ class CreateAdmin extends Command /** * Execute the console command. * - * @return mixed * @throws \BookStack\Exceptions\NotFoundException + * + * @return mixed */ public function handle() { @@ -48,11 +50,15 @@ class CreateAdmin extends Command $email = $this->ask('Please specify an email address for the new admin user'); } if (mb_strlen($email) < 5 || !filter_var($email, FILTER_VALIDATE_EMAIL)) { - return $this->error('Invalid email address provided'); + $this->error('Invalid email address provided'); + + return SymfonyCommand::FAILURE; } if ($this->userRepo->getByEmail($email) !== null) { - return $this->error('A user with the provided email already exists!'); + $this->error('A user with the provided email already exists!'); + + return SymfonyCommand::FAILURE; } $name = trim($this->option('name')); @@ -60,7 +66,9 @@ class CreateAdmin extends Command $name = $this->ask('Please specify an name for the new admin user'); } if (mb_strlen($name) < 2) { - return $this->error('Invalid name provided'); + $this->error('Invalid name provided'); + + return SymfonyCommand::FAILURE; } $password = trim($this->option('password')); @@ -68,9 +76,10 @@ class CreateAdmin extends Command $password = $this->secret('Please specify a password for the new admin user'); } if (mb_strlen($password) < 5) { - return $this->error('Invalid password provided, Must be at least 5 characters'); - } + $this->error('Invalid password provided, Must be at least 5 characters'); + return SymfonyCommand::FAILURE; + } $user = $this->userRepo->create(['email' => $email, 'name' => $name, 'password' => $password]); $this->userRepo->attachSystemRole($user, 'admin'); @@ -79,5 +88,7 @@ class CreateAdmin extends Command $user->save(); $this->info("Admin account with email \"{$user->email}\" successfully created!"); + + return SymfonyCommand::SUCCESS; } }