Remove dependency for ServerRequestInterface in App::load()

This commit is contained in:
Art4 2025-01-22 11:56:23 +00:00
parent b9f5a4f745
commit bf28afb651

View file

@ -159,7 +159,7 @@ class App
$this->appHelper = $this->container->create(AppHelper::class); $this->appHelper = $this->container->create(AppHelper::class);
$this->load( $this->load(
$request, $request->getServerParams(),
$this->container->create(DbaDefinition::class), $this->container->create(DbaDefinition::class),
$this->container->create(ViewDefinition::class), $this->container->create(ViewDefinition::class),
); );
@ -272,7 +272,7 @@ class App
/** /**
* Load the whole app instance * Load the whole app instance
*/ */
private function load(ServerRequestInterface $request, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition) private function load(array $serverParams, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
{ {
if ($this->config->get('system', 'ini_max_execution_time') !== false) { if ($this->config->get('system', 'ini_max_execution_time') !== false) {
set_time_limit((int)$this->config->get('system', 'ini_max_execution_time')); set_time_limit((int)$this->config->get('system', 'ini_max_execution_time'));
@ -294,7 +294,7 @@ class App
if ($this->mode->has(Mode::DBAVAILABLE)) { if ($this->mode->has(Mode::DBAVAILABLE)) {
Core\Hook::loadHooks(); Core\Hook::loadHooks();
$loader = (new Config())->createConfigFileManager($this->appHelper->getBasePath(), $request->getServerParams()); $loader = (new Config())->createConfigFileManager($this->appHelper->getBasePath(), $serverParams);
Core\Hook::callAll('load_config', $loader); Core\Hook::callAll('load_config', $loader);
// Hooks are now working, reload the whole definitions with hook enabled // Hooks are now working, reload the whole definitions with hook enabled