From c4f15706ee2e056d2843956fb95da7a6d712f049 Mon Sep 17 00:00:00 2001 From: Philipp Date: Mon, 6 Jan 2025 18:59:22 +0100 Subject: [PATCH] Add cons --- src/Console/AbstractConsole.php | 5 +++-- src/Core/Console.php | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Console/AbstractConsole.php b/src/Console/AbstractConsole.php index be804b43b8..f9c413b915 100644 --- a/src/Console/AbstractConsole.php +++ b/src/Console/AbstractConsole.php @@ -10,6 +10,7 @@ declare(strict_types=1); namespace Friendica\Console; use Asika\SimpleConsole\Console; +use Friendica\Core\Console as CoreConsole; use Friendica\Core\Logger\Capability\LogChannel; /** @@ -25,13 +26,13 @@ abstract class AbstractConsole extends Console public const LOG_CHANNEL = LogChannel::CONSOLE; /** - * Checks, if the Console command was executed outside of`bin/console.php` and prints the correct execution + * Checks, if the Console command was executed outside `bin/console.php` and prints the correct execution * * @param string $command the current command */ protected function checkDeprecated(string $command): void { - if (substr($this->executable, -strlen('bin/console.php')) !== 'bin/console.php') { + if (substr($this->executable, -strlen(CoreConsole::getDefaultExecutable())) === CoreConsole::getDefaultExecutable()) { $this->out(sprintf("'%s' is deprecated and will removed. Please use 'bin/console.php %s' instead", $this->executable, $command)); } } diff --git a/src/Core/Console.php b/src/Core/Console.php index 34461c0dae..d138a9dfa9 100644 --- a/src/Core/Console.php +++ b/src/Core/Console.php @@ -16,6 +16,17 @@ use Friendica\Core\Logger\Capability\LogChannel; */ class Console extends \Asika\SimpleConsole\Console { + /** @var string The default executable for a console call */ + private const CONSOLE_EXECUTABLE = 'bin/console.php'; + + /** + * @return string The default executable for a console call + */ + public static function getDefaultExecutable(): string + { + return self::CONSOLE_EXECUTABLE; + } + // Disables the default help handling protected $helpOptions = []; protected array $customHelpOptions = ['h', 'help', '?'];