Merge remote-tracking branch 'upstream/develop' into search

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

diff --git a/src/Core/Console.php b/src/Core/Console.php
index 28bf8523dc8ad3cd92af27c31b5b1c2324eab5b9..fefe02999459c91684e9ea45243934f792160b3e 100644 (file)
--- a/src/Core/Console.php
+++ b/src/Core/Console.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,6 +23,7 @@ namespace Friendica\Core;
 
 use Dice\Dice;
 use Friendica;
+use Friendica\App;
 
 /**
  * Description of Console
@@ -59,11 +60,14 @@ Commands:
        autoinstall            Starts automatic installation of friendica based on values from htconfig.php
        lock                   Edit site locks
        maintenance            Set maintenance mode for this node
+       movetoavatarcache      Move cached avatars to the file based avatar cache
+       mergecontacts          Merge duplicated contact entries
        user                   User management
        php2po                 Generate a messages.po file from a strings.php file
        po2php                 Generate a strings.php file from a messages.po file
        typo                   Checks for parse errors in Friendica files
        postupdate             Execute pending post update scripts (can last days)
+       relocate               Update node base URL
        serverblock            Manage blocked servers
        storage                Manage storage backend
        relay                  Manage ActivityPub relay servers
@@ -91,10 +95,13 @@ HELP;
                'globalcommunitysilence' => Friendica\Console\GlobalCommunitySilence::class,
                'lock'                   => Friendica\Console\Lock::class,
                'maintenance'            => Friendica\Console\Maintenance::class,
+               'mergecontacts'          => Friendica\Console\MergeContacts::class,
+               'movetoavatarcache'      => Friendica\Console\MoveToAvatarCache::class,
                'php2po'                 => Friendica\Console\PhpToPo::class,
                'postupdate'             => Friendica\Console\PostUpdate::class,
                'po2php'                 => Friendica\Console\PoToPhp::class,
                'relay'                  => Friendica\Console\Relay::class,
+               'relocate'               => Friendica\Console\Relocate::class,
                'serverblock'            => Friendica\Console\ServerBlock::class,
                'storage'                => Friendica\Console\Storage::class,
                'test'                   => Friendica\Console\Test::class,
@@ -115,7 +122,7 @@ HELP;
                $this->dice = $dice;
        }
 
-       protected function doExecute()
+       protected function doExecute(): int
        {
                if ($this->getOption('v')) {
                        $this->out('Executable: ' . $this->executable);
@@ -127,7 +134,7 @@ HELP;
                $command = null;
 
                if ($this->getOption('version')) {
-                       $this->out('Friendica Console version ' . FRIENDICA_VERSION);
+                       $this->out('Friendica Console version ' . App::VERSION);
 
                        return 0;
                } elseif ((count($this->options) === 0 || $this->getOption($this->customHelpOptions) === true || $this->getOption($this->customHelpOptions) === 1) && count($this->args) === 0