From: Art4 <art4@wlabs.de>
Date: Wed, 22 Jan 2025 19:46:49 +0000 (+0000)
Subject: Merge branch 'develop' into mark-internal-code
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=179ccbc08c63ccfb734dcea302997daf9050f060;p=friendica.git

Merge branch 'develop' into mark-internal-code
---

179ccbc08c63ccfb734dcea302997daf9050f060
diff --cc bin/daemon.php
index c3d945d941,25f902eacd..162a92948f
--- a/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 2aa1886c6e,b96dfa0e51..c97557dbb0
--- a/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 f099bc8e66,b72a8e2514..f319bd766f
--- a/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 b756a847d9,564da764f9..5623f9a413
--- a/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();
  	}
  
 +	/**
 +	 * @internal
 +	 */
- 	public function processEjabberd(): void
+ 	public function processEjabberd(array $serverParams): void
  	{
  		$this->setupContainerForAddons();