inject and use user manager to delete command instead of using old static oc_user way

diff --git a/core/command/user/delete.php b/core/command/user/delete.php
index f64b40e4921518bfc932d71eba0a622d922e9409..d5ec3ee0bdefe52044d47c00970c178c82e07e9e 100644 (file)
--- a/core/command/user/delete.php
+++ b/core/command/user/delete.php
@@ -14,6 +14,17 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputArgument;
 
 class Delete extends Command {
+       /** @var \OC\User\Manager */
+       protected $userManager;
+
+       /**
+        * @param \OC\User\Manager $userManager
+        */
+       public function __construct(\OC\User\Manager $userManager) {
+               $this->userManager = $userManager;
+               parent::__construct();
+       }
+
        protected function configure() {
                $this
                        ->setName('user:delete')
@@ -26,7 +37,7 @@ class Delete extends Command {
        }
 
        protected function execute(InputInterface $input, OutputInterface $output) {
-               $wasSuccessful = \OC_User::deleteUser($input->getArgument('uid'));
+               $wasSuccessful = $this->userManager->get($input->getArgument('uid'))->delete();
                if($wasSuccessful === true) {
                        $output->writeln('The specified user was deleted');
                        return;

diff --git a/core/register_command.php b/core/register_command.php
index 690e9879c475cb2869f14ebf86c1f1cdd1d37460..5aa55be3e2c4299b4a616d9c5f5e589fff8efad8 100644 (file)
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -22,6 +22,6 @@ $application->add(new OC\Core\Command\Maintenance\Repair($repair, \OC::$server->
 $application->add(new OC\Core\Command\User\Report());
 $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
 $application->add(new OC\Core\Command\User\LastSeen());
-$application->add(new OC\Core\Command\User\Delete());
+$application->add(new OC\Core\Command\User\Delete(\OC::$server->getUserManager()));
 $application->add(new OC\Core\Command\L10n\CreateJs());