Friendica/friendica-github
1
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2025-02-06 23:38:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Provide $_SERVER to App::processConsole()

Browse source
This commit is contained in:
Art4 2025-01-22 13:47:58 +00:00
parent 15446f35a5
commit c9bcc45d7c
5 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/console.php
View file

@ -19,4 +19,4 @@ $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__));
$app = \Friendica\App::fromContainer($container); $app = \Friendica\App::fromContainer($container);
$app->processConsole($_SERVER['argv'] ?? []); $app->processConsole($_SERVER);

4
bin/daemon.php
View file

@ -24,11 +24,13 @@ chdir(dirname(__DIR__));
require dirname(__DIR__) . '/vendor/autoload.php'; require dirname(__DIR__) . '/vendor/autoload.php';
// BC: Add console command as second argument
$argv = $_SERVER['argv'] ?? []; $argv = $_SERVER['argv'] ?? [];
array_splice($argv, 1, 0, "daemon"); array_splice($argv, 1, 0, "daemon");
$_SERVER['argv'] = $argv;
$container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__)); $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__));
$app = \Friendica\App::fromContainer($container); $app = \Friendica\App::fromContainer($container);
$app->processConsole($argv); $app->processConsole($_SERVER);

4
bin/jetstream.php
View file

@ -19,11 +19,13 @@ chdir(dirname(__DIR__));
require dirname(__DIR__) . '/vendor/autoload.php'; require dirname(__DIR__) . '/vendor/autoload.php';
// BC: Add console command as second argument
$argv = $_SERVER['argv'] ?? []; $argv = $_SERVER['argv'] ?? [];
array_splice($argv, 1, 0, "jetstream"); array_splice($argv, 1, 0, "jetstream");
$_SERVER['argv'] = $argv;
$container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__)); $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__));
$app = \Friendica\App::fromContainer($container); $app = \Friendica\App::fromContainer($container);
$app->processConsole($argv); $app->processConsole($_SERVER);

4
bin/worker.php
View file

@ -21,11 +21,13 @@ chdir(dirname(__DIR__));
require dirname(__DIR__) . '/vendor/autoload.php'; require dirname(__DIR__) . '/vendor/autoload.php';
// BC: Add console command as second argument
$argv = $_SERVER['argv'] ?? []; $argv = $_SERVER['argv'] ?? [];
array_splice($argv, 1, 0, "worker"); array_splice($argv, 1, 0, "worker");
$_SERVER['argv'] = $argv;
$container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__)); $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__));
$app = \Friendica\App::fromContainer($container); $app = \Friendica\App::fromContainer($container);
$app->processConsole($argv); $app->processConsole($_SERVER);

5
src/App.php
View file

@ -181,8 +181,11 @@ class App
); );
} }
public function processConsole(array $argv): void
public function processConsole(array $serverParams): void
{ {
$argv = $serverParams['argv'] ?? [];
$this->setupContainerForAddons(); $this->setupContainerForAddons();
$this->setupLogChannel($this->determineLogChannel($argv)); $this->setupLogChannel($this->determineLogChannel($argv));