Merge branch 'develop' into mark-internal-code

diff --cc bin/daemon.php
index c3d945d9415251fb938be002399012cb432d1792,25f902eacd5431555077b90be3d3d1ca90ce75a7..162a92948f7972b50b507254c52ba8c407386434
--- 1/bin/daemon.php
--- 2/bin/daemon.php
+++ b/bin/daemon.php
@@@ -24,10 -24,10 +24,12 @@@ chdir(dirname(__DIR__))
  
  require dirname(__DIR__) . '/vendor/autoload.php';
  
 +fwrite(STDOUT, '`bin/daemon.php` is deprecated since 2024.02 and will be removed in 5 months, please use `bin/console.php daemon` instead.' . \PHP_EOL);
 +
+ // 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__));
  

diff --cc bin/jetstream.php
index 2aa1886c6e1e0a2fb7d089306ec427ded9634b49,b96dfa0e5138ce0cd4c815837143ffebd124160f..c97557dbb0f89f2c91e5e20f4909fca8e2e12457
--- 1/bin/jetstream.php
--- 2/bin/jetstream.php
+++ b/bin/jetstream.php
@@@ -19,10 -19,10 +19,12 @@@ chdir(dirname(__DIR__))
  
  require dirname(__DIR__) . '/vendor/autoload.php';
  
 +fwrite(STDOUT, '`bin/jetstream.php` is deprecated since 2024.02 and will be removed in 5 months, please use `bin/console.php jetstream` instead.' . \PHP_EOL);
 +
+ // 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__));
  

diff --cc bin/worker.php
index f099bc8e66f8dc0458bdf1c8040c51a6b4e482f4,b72a8e251434e3706c44b3a97b5ce5ab60e81b7d..f319bd766f1a3c13664f5cfa59bef8117bb3461e
--- 1/bin/worker.php
--- 2/bin/worker.php
+++ b/bin/worker.php
@@@ -21,10 -21,10 +21,12 @@@ chdir(dirname(__DIR__))
  
  require dirname(__DIR__) . '/vendor/autoload.php';
  
 +fwrite(STDOUT, '`bin/worker.php` is deprecated since 2024.02 and will be removed in 5 months, please use `bin/console.php worker` instead.' . \PHP_EOL);
 +
+ // 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__));
  

diff --cc src/App.php
index b756a847d97df37fa63c2cce944e71c8504c8bd1,564da764f94717181ac2f87a11e55333f050c865..5623f9a4137387bbe9bb24a7f911f0a9d9b46fa4
--- 1/src/App.php
--- 2/src/App.php
+++ b/src/App.php
@@@ -185,11 -180,11 +187,13 @@@ class Ap
                );
        }
  
 -
 +      /**
 +       * @internal
 +       */
-       public function processConsole(array $argv): void
+       public function processConsole(array $serverParams): void
        {
+               $argv = $serverParams['argv'] ?? [];
+ 
                $this->setupContainerForAddons();
  
                $this->setupLogChannel($this->determineLogChannel($argv));
@@@ -203,10 -208,7 +217,10 @@@
                (\Friendica\Core\Console::create($this->container, $argv))->execute();
        }
  
-       public function processEjabberd(): void
 +      /**
 +       * @internal
 +       */
+       public function processEjabberd(array $serverParams): void
        {
                $this->setupContainerForAddons();