mirror of
https://github.com/friendica/friendica
synced 2024-12-22 17:20:16 +00:00
Inline runFrontend() call into App::processRequest() method
This commit is contained in:
parent
ee5b210682
commit
9e4f39b4fb
2 changed files with 15 additions and 14 deletions
14
index.php
14
index.php
|
@ -29,16 +29,4 @@ $dice = $dice->addRule(Friendica\App\Mode::class, ['call' => [['determineRunMode
|
|||
|
||||
$a = \Friendica\App::fromDice($dice);
|
||||
|
||||
$a->processRequest();
|
||||
|
||||
$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()
|
||||
);
|
||||
$a->processRequest($request, $start_time);
|
||||
|
|
15
src/App.php
15
src/App.php
|
@ -34,6 +34,7 @@ use Friendica\Util\DateTimeFormat;
|
|||
use Friendica\Util\HTTPInputData;
|
||||
use Friendica\Util\HTTPSignature;
|
||||
use Friendica\Util\Profiler;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
|
@ -154,7 +155,7 @@ class App
|
|||
$this->appHelper = $appHelper;
|
||||
}
|
||||
|
||||
public function processRequest(): void
|
||||
public function processRequest(ServerRequestInterface $request, float $start_time): void
|
||||
{
|
||||
$this->load(
|
||||
$this->container->create(DbaDefinition::class),
|
||||
|
@ -162,6 +163,18 @@ class App
|
|||
);
|
||||
|
||||
$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()
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue