Provide $_SERVER to App::processConsole()

diff --git a/bin/console.php b/bin/console.php
index ad612f43639682bb62bd8b0a76ad91572ba2243f..a20f3f7e025348bd31fda63a0deaad6737b7fbe6 100755 (executable)
--- 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 546f207e08143158529fa21012c016d79871e9ad..25f902eacd5431555077b90be3d3d1ca90ce75a7 100755 (executable)
--- 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 156f96185662f5ec53afac6f03a019db3db6cff6..b96dfa0e5138ce0cd4c815837143ffebd124160f 100755 (executable)
--- 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 a79d8836a73fc746afd9832984f5d2de86bdfbab..b72a8e251434e3706c44b3a97b5ce5ab60e81b7d 100755 (executable)
--- 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 8af9ec9272f80bdaf5b4c15f9f9d04ed72ddb420..6bdb20d45c957bfb51e66ec16f85630821e9a891 100644 (file)
--- 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));