Inline runFrontend() call into App::processRequest() method

This commit is contained in:
Art4 2024-12-20 10:07:59 +00:00
parent ee5b210682
commit 9e4f39b4fb
2 changed files with 15 additions and 14 deletions

View file

@ -29,16 +29,4 @@ $dice = $dice->addRule(Friendica\App\Mode::class, ['call' => [['determineRunMode
$a = \Friendica\App::fromDice($dice); $a = \Friendica\App::fromDice($dice);
$a->processRequest(); $a->processRequest($request, $start_time);
$a->runFrontend(
$dice->create(\Friendica\App\Router::class),
$dice->create(\Friendica\Core\PConfig\Capability\IManagePersonalConfigValues::class),
$dice->create(\Friendica\Security\Authentication::class),
$dice->create(\Friendica\App\Page::class),
$dice->create(\Friendica\Content\Nav::class),
$dice->create(Friendica\Module\Special\HTTPException::class),
new \Friendica\Util\HTTPInputData($request->getServerParams()),
$start_time,
$request->getServerParams()
);

View file

@ -34,6 +34,7 @@ use Friendica\Util\DateTimeFormat;
use Friendica\Util\HTTPInputData; use Friendica\Util\HTTPInputData;
use Friendica\Util\HTTPSignature; use Friendica\Util\HTTPSignature;
use Friendica\Util\Profiler; use Friendica\Util\Profiler;
use Psr\Http\Message\ServerRequestInterface;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
/** /**
@ -154,7 +155,7 @@ class App
$this->appHelper = $appHelper; $this->appHelper = $appHelper;
} }
public function processRequest(): void public function processRequest(ServerRequestInterface $request, float $start_time): void
{ {
$this->load( $this->load(
$this->container->create(DbaDefinition::class), $this->container->create(DbaDefinition::class),
@ -162,6 +163,18 @@ class App
); );
$this->mode->setExecutor(Mode::INDEX); $this->mode->setExecutor(Mode::INDEX);
$this->runFrontend(
$this->container->create(\Friendica\App\Router::class),
$this->container->create(\Friendica\Core\PConfig\Capability\IManagePersonalConfigValues::class),
$this->container->create(\Friendica\Security\Authentication::class),
$this->container->create(\Friendica\App\Page::class),
$this->container->create(\Friendica\Content\Nav::class),
$this->container->create(\Friendica\Module\Special\HTTPException::class),
new \Friendica\Util\HTTPInputData($request->getServerParams()),
$start_time,
$request->getServerParams()
);
} }
/** /**