Move Console call into App class

diff --git a/bin/console.php b/bin/console.php
index 63412887d59d41e79478869c81262adc1074d569..404f327868549869becf66316dd2fd3f547e7759 100755 (executable)
--- a/bin/console.php
+++ b/bin/console.php
@@ -20,4 +20,7 @@ require dirname(__DIR__) . '/vendor/autoload.php';
 $dice = (new Dice())->addRules(require(dirname(__DIR__) . '/static/dependencies.config.php'));
 
 $container = \Friendica\Core\Container::fromDice($dice);
-\Friendica\Core\Console::create($container, $_SERVER['argv'] ?? [])->execute();
+
+$app = \Friendica\App::fromContainer($container);
+
+$app->processConsole($_SERVER['argv'] ?? []);

diff --git a/bin/daemon.php b/bin/daemon.php
index 18af315bc38393e47eaccef371cf7ad7d437c4df..a1c0abbfaf9de6b4eee4bbeafda044ab23ecbafb 100755 (executable)
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -32,4 +32,7 @@ $argv = $_SERVER['argv'] ?? [];
 array_splice($argv, 1, 0, "daemon");
 
 $container = \Friendica\Core\Container::fromDice($dice);
-\Friendica\Core\Console::create($container, $argv)->execute();
+
+$app = \Friendica\App::fromContainer($container);
+
+$app->processConsole($argv);

diff --git a/bin/jetstream.php b/bin/jetstream.php
index e3df667d3f9bb45f8b68b0a1f0bf2e229ba44fcb..ac33e8ff2aae8b0948e263f98f6b881fbf8e9ad4 100755 (executable)
--- a/bin/jetstream.php
+++ b/bin/jetstream.php
@@ -27,4 +27,7 @@ $argv = $_SERVER['argv'] ?? [];
 array_splice($argv, 1, 0, "jetstream");
 
 $container = \Friendica\Core\Container::fromDice($dice);
-\Friendica\Core\Console::create($container, $argv)->execute();
+
+$app = \Friendica\App::fromContainer($container);
+
+$app->processConsole($argv);

diff --git a/bin/worker.php b/bin/worker.php
index a58d657a0fc50257f6a14b38e084d7dd564793d4..fa238b66a292c7e344a9c354cfc3b4aa18231413 100755 (executable)
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -29,4 +29,7 @@ $argv = $_SERVER['argv'] ?? [];
 array_splice($argv, 1, 0, "worker");
 
 $container = \Friendica\Core\Container::fromDice($dice);
-\Friendica\Core\Console::create($container, $argv)->execute();
+
+$app = \Friendica\App::fromContainer($container);
+
+$app->processConsole($argv);

diff --git a/src/App.php b/src/App.php
index 487707f9fdfe85a5a6947e4cf1e6cb0d6c425faa..10c360319986d6ed1ab144211c567fd06fd0c1cc 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -168,6 +168,11 @@ class App
                );
        }
 
+       public function processConsole(array $argv): void
+       {
+               (\Friendica\Core\Console::create($this->container, $argv))->execute();
+       }
+
        public function processEjabberd(): void
        {
                $this->container->setup(LogChannel::AUTH_JABBERED, false);