X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FNewPassword.php;h=118428866c6d20974e0dd4a8bd500133aaa4bed4;hb=0e05ff68686270d87447c570e28543a5bcc7e755;hp=dc6943817f2722ce235fcbe18ef5b1ecf85b2c7c;hpb=c9cce8492e5b2607b2a092474d1de4d188b7a2c9;p=friendica.git

diff --git a/src/Console/NewPassword.php b/src/Console/NewPassword.php
index dc6943817f..118428866c 100644
--- a/src/Console/NewPassword.php
+++ b/src/Console/NewPassword.php
@@ -1,25 +1,54 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 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
- *
- * License: AGPLv3 or later, same as Friendica
- *
- * @author Michael Vogel <heluecht@pirati.ca>
  */
 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 +66,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 +92,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);
 		}