Merge pull request #12153 from nupplaphil/feat/woodpecker

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

diff --git a/src/Core/Console.php b/src/Core/Console.php
index 828a0ea4d360ef28cdb67b017727fc71cba24555..f51e33bd503e1966b285abaf5f22747d0eb2690a 100644 (file)
--- a/src/Core/Console.php
+++ b/src/Core/Console.php
@@ -23,6 +23,7 @@ namespace Friendica\Core;
 
 use Dice\Dice;
 use Friendica;
 
 use Dice\Dice;
 use Friendica;

+use Friendica\App;

 
 /**
  * Description of Console
 
 /**
  * Description of Console


@@ -60,11 +61,13 @@ Commands:
        lock                   Edit site locks
        maintenance            Set maintenance mode for this node
        movetoavatarcache      Move cached avatars to the file based avatar cache
        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)
        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
        serverblock            Manage blocked servers
        storage                Manage storage backend
        relay                  Manage ActivityPub relay servers


@@ -92,11 +95,13 @@ HELP;
                'globalcommunitysilence' => Friendica\Console\GlobalCommunitySilence::class,
                'lock'                   => Friendica\Console\Lock::class,
                'maintenance'            => Friendica\Console\Maintenance::class,
                '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,
                '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,
                'serverblock'            => Friendica\Console\ServerBlock::class,
                'storage'                => Friendica\Console\Storage::class,
                'test'                   => Friendica\Console\Test::class,


@@ -117,7 +122,7 @@ HELP;
                $this->dice = $dice;
        }
 
                $this->dice = $dice;
        }
 

-       protected function doExecute()
+       protected function doExecute(): int

        {
                if ($this->getOption('v')) {
                        $this->out('Executable: ' . $this->executable);
        {
                if ($this->getOption('v')) {
                        $this->out('Executable: ' . $this->executable);


@@ -129,7 +134,7 @@ HELP;
                $command = null;
 
                if ($this->getOption('version')) {
                $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
 
                        return 0;
                } elseif ((count($this->options) === 0 || $this->getOption($this->customHelpOptions) === true || $this->getOption($this->customHelpOptions) === 1) && count($this->args) === 0