X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FConsole%2FArchiveContact.php;h=4990d99e0bdd9de1141f181ea3ed84e5db726c75;hb=72a3ab6382551811f22391b7e82e7398628b235b;hp=cf177cf2e2a8f7925deb0287b031e7c46d6c37c4;hpb=8010ccdc216fc9caf308346ab750386caa7946e1;p=friendica.git

diff --git a/src/Console/ArchiveContact.php b/src/Console/ArchiveContact.php
index cf177cf2e2..4990d99e0b 100644
--- a/src/Console/ArchiveContact.php
+++ b/src/Console/ArchiveContact.php
@@ -1,14 +1,35 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @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\Core\L10n;
-use Friendica\Database\DBA;
+use Friendica\App;
+use Friendica\Database\Database;
+use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Util\Strings;
 use RuntimeException;
 
 /**
- * @brief tool to archive a contact on the server
+ * tool to archive a contact on the server
  *
  * With this tool you can archive a contact when you know that it isn't existing anymore.
  * Normally this does happen automatically after a few days.
@@ -20,6 +41,19 @@ class ArchiveContact extends \Asika\SimpleConsole\Console
 {
 	protected $helpOptions = ['h', 'help', '?'];
 
+	/**
+	 * @var App\Mode
+	 */
+	private $appMode;
+	/**
+	 * @var Database
+	 */
+	private $dba;
+	/**
+	 * @var \Friendica\Core\L10n
+	 */
+	private $l10n;
+
 	protected function getHelp()
 	{
 		$help = <<<HELP
@@ -37,10 +71,17 @@ HELP;
 		return $help;
 	}
 
-	protected function doExecute()
+	public function __construct(App\Mode $appMode, Database $dba, \Friendica\Core\L10n $l10n, array $argv = null)
 	{
-		$a = \Friendica\BaseObject::getApp();
+		parent::__construct($argv);
+
+		$this->appMode = $appMode;
+		$this->dba = $dba;
+		$this->l10n = $l10n;
+	}
 
+	protected function doExecute()
+	{
 		if ($this->getOption('v')) {
 			$this->out('Class: ' . __CLASS__);
 			$this->out('Arguments: ' . var_export($this->args, true));
@@ -56,16 +97,16 @@ HELP;
 			throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
 		}
 
-		if ($a->getMode()->isInstall()) {
+		if ($this->appMode->isInstall()) {
 			throw new RuntimeException('Friendica isn\'t properly installed yet.');
 		}
 
 		$nurl = Strings::normaliseLink($this->getArgument(0));
-		if (!DBA::exists('contact', ['nurl' => $nurl, 'archive' => false])) {
-			throw new RuntimeException(L10n::t('Could not find any unarchived contact entry for this URL (%s)', $nurl));
+		if (!$this->dba->exists('contact', ['nurl' => $nurl, 'archive' => false])) {
+			throw new RuntimeException(DI::l10n()->t('Could not find any unarchived contact entry for this URL (%s)', $nurl));
 		}
-		if (DBA::update('contact', ['archive' => true], ['nurl' => $nurl])) {
-			$this->out(L10n::t('The contact entries have been archived'));
+		if (Contact::update(['archive' => true], ['nurl' => $nurl])) {
+			$this->out($this->l10n->t('The contact entries have been archived'));
 		} else {
 			throw new RuntimeException('The contact archival failed.');
 		}