Merge pull request #13704 from MrPetovan/bug/13693-infinite-indentation-level

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

diff --git a/src/Core/Console.php b/src/Core/Console.php
index be5f315987a9c06e311008d332d4b3f23de19d20..fefe02999459c91684e9ea45243934f792160b3e 100644 (file)
--- a/src/Core/Console.php
+++ b/src/Core/Console.php
@@ -1,6 +1,6 @@
 <?php
 /**
 <?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
  *
  *
  * @license GNU AGPL version 3 or any later version
  *


@@ -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,6 +61,7 @@ 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
        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


@@ -93,6 +95,7 @@ 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,
                'movetoavatarcache'      => Friendica\Console\MoveToAvatarCache::class,
                'php2po'                 => Friendica\Console\PhpToPo::class,
                'postupdate'             => Friendica\Console\PostUpdate::class,


@@ -119,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);


@@ -131,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