From c9bcc45d7cb578eaddcdf38afa55cd94669bd702 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 22 Jan 2025 13:47:58 +0000
Subject: [PATCH] Provide $_SERVER to App::processConsole()

---
 bin/console.php   | 2 +-
 bin/daemon.php    | 4 +++-
 bin/jetstream.php | 4 +++-
 bin/worker.php    | 4 +++-
 src/App.php       | 5 ++++-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/bin/console.php b/bin/console.php
index ad612f4363..a20f3f7e02 100755
--- a/bin/console.php
+++ b/bin/console.php
@@ -19,4 +19,4 @@ $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__));
 
 $app = \Friendica\App::fromContainer($container);
 
-$app->processConsole($_SERVER['argv'] ?? []);
+$app->processConsole($_SERVER);
diff --git a/bin/daemon.php b/bin/daemon.php
index 546f207e08..25f902eacd 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -24,11 +24,13 @@ chdir(dirname(__DIR__));
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
+// BC: Add console command as second argument
 $argv = $_SERVER['argv'] ?? [];
 array_splice($argv, 1, 0, "daemon");
+$_SERVER['argv'] = $argv;
 
 $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__));
 
 $app = \Friendica\App::fromContainer($container);
 
-$app->processConsole($argv);
+$app->processConsole($_SERVER);
diff --git a/bin/jetstream.php b/bin/jetstream.php
index 156f961856..b96dfa0e51 100755
--- a/bin/jetstream.php
+++ b/bin/jetstream.php
@@ -19,11 +19,13 @@ chdir(dirname(__DIR__));
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
+// BC: Add console command as second argument
 $argv = $_SERVER['argv'] ?? [];
 array_splice($argv, 1, 0, "jetstream");
+$_SERVER['argv'] = $argv;
 
 $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__));
 
 $app = \Friendica\App::fromContainer($container);
 
-$app->processConsole($argv);
+$app->processConsole($_SERVER);
diff --git a/bin/worker.php b/bin/worker.php
index a79d8836a7..b72a8e2514 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -21,11 +21,13 @@ chdir(dirname(__DIR__));
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
+// BC: Add console command as second argument
 $argv = $_SERVER['argv'] ?? [];
 array_splice($argv, 1, 0, "worker");
+$_SERVER['argv'] = $argv;
 
 $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__));
 
 $app = \Friendica\App::fromContainer($container);
 
-$app->processConsole($argv);
+$app->processConsole($_SERVER);
diff --git a/src/App.php b/src/App.php
index 8af9ec9272..6bdb20d45c 100644
--- a/src/App.php
+++ b/src/App.php
@@ -181,8 +181,11 @@ class App
 		);
 	}
 
-	public function processConsole(array $argv): void
+
+	public function processConsole(array $serverParams): void
 	{
+		$argv = $serverParams['argv'] ?? [];
+
 		$this->setupContainerForAddons();
 
 		$this->setupLogChannel($this->determineLogChannel($argv));