Merge pull request #12562 from MrPetovan/bug/notices

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

diff --git a/src/Console/ArchiveContact.php b/src/Console/ArchiveContact.php
index 4055e486699e6c749858583da0c0b5986615ad1e..7e1b07af2479973ecd56e4470da8ce540eee8a35 100644 (file)
--- a/src/Console/ArchiveContact.php
+++ b/src/Console/ArchiveContact.php
@@ -1,10 +1,30 @@
 <?php
+/**
+ * @copyright Copyright (C) 2010-2023, 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\App;
-use Friendica\Core\L10n;
 use Friendica\Database\Database;
+use Friendica\DI;
+use Friendica\Model\Contact;
 use Friendica\Util\Strings;
 use RuntimeException;
 
@@ -30,7 +50,7 @@ class ArchiveContact extends \Asika\SimpleConsole\Console
         */
        private $dba;
        /**
-        * @var L10n\L10n
+        * @var \Friendica\Core\L10n
         */
        private $l10n;
 
@@ -51,7 +71,7 @@ HELP;
                return $help;
        }
 
-       public function __construct(App\Mode $appMode, Database $dba, L10n\L10n $l10n, array $argv = null)
+       public function __construct(App\Mode $appMode, Database $dba, \Friendica\Core\L10n $l10n, array $argv = null)
        {
                parent::__construct($argv);
 
@@ -60,7 +80,7 @@ HELP;
                $this->l10n = $l10n;
        }
 
-       protected function doExecute()
+       protected function doExecute(): int
        {
                if ($this->getOption('v')) {
                        $this->out('Class: ' . __CLASS__);
@@ -83,9 +103,9 @@ HELP;
 
                $nurl = Strings::normaliseLink($this->getArgument(0));
                if (!$this->dba->exists('contact', ['nurl' => $nurl, 'archive' => false])) {
-                       throw new RuntimeException(L10n::t('Could not find any unarchived contact entry for this URL (%s)', $nurl));
+                       throw new RuntimeException(DI::l10n()->t('Could not find any unarchived contact entry for this URL (%s)', $nurl));
                }
-               if ($this->dba->update('contact', ['archive' => true], ['nurl' => $nurl])) {
+               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.');