mirror of
https://github.com/friendica/friendica
synced 2024-12-22 18:40:17 +00:00
Fix method order in App class
This commit is contained in:
parent
9ebdd9f95c
commit
e320b010c7
1 changed files with 29 additions and 29 deletions
58
src/App.php
58
src/App.php
|
@ -105,6 +105,35 @@ class App implements AppHelper
|
||||||
*/
|
*/
|
||||||
private $appHelper;
|
private $appHelper;
|
||||||
|
|
||||||
|
public function __construct(
|
||||||
|
Request $request,
|
||||||
|
Authentication $auth,
|
||||||
|
IManageConfigValues $config,
|
||||||
|
Mode $mode,
|
||||||
|
BaseURL $baseURL,
|
||||||
|
LoggerInterface $logger,
|
||||||
|
Profiler $profiler,
|
||||||
|
L10n $l10n,
|
||||||
|
Arguments $args,
|
||||||
|
IHandleUserSessions $session,
|
||||||
|
DbaDefinition $dbaDefinition,
|
||||||
|
ViewDefinition $viewDefinition
|
||||||
|
) {
|
||||||
|
$this->requestId = $request->getRequestId();
|
||||||
|
$this->auth = $auth;
|
||||||
|
$this->config = $config;
|
||||||
|
$this->mode = $mode;
|
||||||
|
$this->baseURL = $baseURL;
|
||||||
|
$this->profiler = $profiler;
|
||||||
|
$this->logger = $logger;
|
||||||
|
$this->l10n = $l10n;
|
||||||
|
$this->args = $args;
|
||||||
|
$this->session = $session;
|
||||||
|
$this->appHelper = DI::apphelper();
|
||||||
|
|
||||||
|
$this->load($dbaDefinition, $viewDefinition);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set the profile owner ID
|
* Set the profile owner ID
|
||||||
*
|
*
|
||||||
|
@ -264,35 +293,6 @@ class App implements AppHelper
|
||||||
return $this->appHelper->getBasePath();
|
return $this->appHelper->getBasePath();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function __construct(
|
|
||||||
Request $request,
|
|
||||||
Authentication $auth,
|
|
||||||
IManageConfigValues $config,
|
|
||||||
Mode $mode,
|
|
||||||
BaseURL $baseURL,
|
|
||||||
LoggerInterface $logger,
|
|
||||||
Profiler $profiler,
|
|
||||||
L10n $l10n,
|
|
||||||
Arguments $args,
|
|
||||||
IHandleUserSessions $session,
|
|
||||||
DbaDefinition $dbaDefinition,
|
|
||||||
ViewDefinition $viewDefinition
|
|
||||||
) {
|
|
||||||
$this->requestId = $request->getRequestId();
|
|
||||||
$this->auth = $auth;
|
|
||||||
$this->config = $config;
|
|
||||||
$this->mode = $mode;
|
|
||||||
$this->baseURL = $baseURL;
|
|
||||||
$this->profiler = $profiler;
|
|
||||||
$this->logger = $logger;
|
|
||||||
$this->l10n = $l10n;
|
|
||||||
$this->args = $args;
|
|
||||||
$this->session = $session;
|
|
||||||
$this->appHelper = DI::apphelper();
|
|
||||||
|
|
||||||
$this->load($dbaDefinition, $viewDefinition);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load the whole app instance
|
* Load the whole app instance
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in a new issue