Remove deprecated code

[friendica.git] / src / Console / NewPassword.php

diff --git a/src/Console/NewPassword.php b/src/Console/NewPassword.php
index dc6943817f2722ce235fcbe18ef5b1ecf85b2c7c..bf5a1b7e17a8f5c89aa28545c591166e4ea0f362 100644 (file)
--- a/src/Console/NewPassword.php
+++ b/src/Console/NewPassword.php
@@ -2,13 +2,14 @@
 
 namespace Friendica\Console;
 
+use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Database\DBA;
+use Friendica\Database\Database;
 use Friendica\Model\User;
 use RuntimeException;
 
 /**
- * @brief tool to set a new password for a user
+ * tool to set a new password for a user
  *
  * With this tool, you can set a new password for a user
  *
@@ -20,6 +21,19 @@ class NewPassword extends \Asika\SimpleConsole\Console
 {
        protected $helpOptions = ['h', 'help', '?'];
 
+       /**
+        * @var App\Mode
+        */
+       private $appMode;
+       /**
+        * @var L10n
+        */
+       private $l10n;
+       /**
+        * @var Database
+        */
+       private $dba;
+
        protected function getHelp()
        {
                $help = <<<HELP
@@ -37,10 +51,17 @@ HELP;
                return $help;
        }
 
-       protected function doExecute()
+       public function __construct(App\Mode $appMode, L10n $l10n, Database $dba, array $argv = null)
        {
-               $a = \get_app();
+               parent::__construct($argv);
+
+               $this->appMode = $appMode;
+               $this->l10n = $l10n;
+               $this->dba = $dba;
+       }
 
+       protected function doExecute()
+       {
                if ($this->getOption('v')) {
                        $this->out('Class: ' . __CLASS__);
                        $this->out('Arguments: ' . var_export($this->args, true));
@@ -56,31 +77,31 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if ($a->getMode()->isInstall()) {
+               if ($this->appMode->isInstall()) {
                        throw new RuntimeException('Database isn\'t ready or populated yet');
                }
 
                $nick = $this->getArgument(0);
 
-               $user = DBA::selectFirst('user', ['uid'], ['nickname' => $nick]);
-               if (!DBA::isResult($user)) {
-                       throw new RuntimeException(L10n::t('User not found'));
+               $user = $this->dba->selectFirst('user', ['uid'], ['nickname' => $nick]);
+               if (!$this->dba->isResult($user)) {
+                       throw new RuntimeException($this->l10n->t('User not found'));
                }
 
                $password = $this->getArgument(1);
                if (is_null($password)) {
-                       $this->out(L10n::t('Enter new password: '), false);
+                       $this->out($this->l10n->t('Enter new password: '), false);
                        $password = \Seld\CliPrompt\CliPrompt::hiddenPrompt(true);
                }
 
                try {
                        $result = User::updatePassword($user['uid'], $password);
 
-                       if (!DBA::isResult($result)) {
-                               throw new \Exception(L10n::t('Password update failed. Please try again.'));
+                       if (!$this->dba->isResult($result)) {
+                               throw new \Exception($this->l10n->t('Password update failed. Please try again.'));
                        }
 
-                       $this->out(L10n::t('Password changed.'));
+                       $this->out($this->l10n->t('Password changed.'));
                } catch (\Exception $e) {
                        throw new RuntimeException($e->getMessage(), $e->getCode(), $e);
                }