Centralize deprecated check

nupplaphil · Jan 5, 2025 · b9dde78 · b9dde78
1 parent 77c9f54
commit b9dde78
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/Console/AbstractConsole.php b/src/Console/AbstractConsole.php
@@ -23,4 +23,16 @@ abstract class AbstractConsole extends Console
 	 * @var string
 	 */
 	public const LOG_CHANNEL = LogChannel::CONSOLE;
+
+	/**
+	 * Checks, if the Console command was executed outside of`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') {
+			$this->out(sprintf("'%s' is deprecated and will removed. Please use 'bin/console.php %s' instead", $this->executable, $command));
+		}
+	}
 }
diff --git a/src/Console/Daemon.php b/src/Console/Daemon.php
@@ -93,9 +93,7 @@ protected function getHelp(): string
 
 	protected function doExecute()
 	{
-		if (substr($this->executable, -strlen('bin/console.php')) !== 'bin/console.php') {
-			$this->out(sprintf("'%s' is deprecated and will removed. Please use 'bin/console.php daemon' instead", $this->executable));
-		}
+		$this->checkDeprecated('daemon');
 
 		if ($this->mode->isInstall()) {
 			throw new RuntimeException("Friendica isn't properly installed yet");

diff --git a/src/Console/JetstreamDaemon.php b/src/Console/JetstreamDaemon.php
@@ -79,9 +79,7 @@ protected function getHelp(): string
 
 	protected function doExecute()
 	{
-		if ($this->executable !== 'bin/console.php') {
-			$this->out(sprintf("'%s' is deprecated and will removed. Please use 'bin/console.php jetstream' instead", $this->executable));
-		}
+		$this->checkDeprecated('jetstream');
 
 		if ($this->mode->isInstall()) {
 			throw new RuntimeException("Friendica isn't properly installed yet");

diff --git a/src/Console/Worker.php b/src/Console/Worker.php
@@ -69,9 +69,7 @@ protected function getHelp(): string
 
 	protected function doExecute()
 	{
-		if ($this->executable !== 'bin/console.php') {
-			$this->out(sprintf("'%s' is deprecated and will removed. Please use 'bin/console.php worker' instead", $this->executable));
-		}
+		$this->checkDeprecated('worker');
 
 		$this->mode->setExecutor(Mode::WORKER);