Move DI dependency for App class

index.php

@@ -45,7 +45,6 @@ $a->runFrontend(
 	$dice->create(\Friendica\Core\PConfig\Capability\IManagePersonalConfigValues::class),
 	$dice->create(\Friendica\Security\Authentication::class),
 	$dice->create(\Friendica\App\Page::class),
-	$dice->create(\Friendica\Core\Session\Capability\IHandleUserSessions::class),
 	new \Friendica\Util\HTTPInputData($_SERVER),
 	$start_time
 );

src/App.php

@@ -134,6 +134,11 @@ class App
 	 */
 	private $session;
 
+	/**
+	 * @var IHandleUserSessions
+	 */
+	private $userSession;
+
 	/**
 	 * Set the user ID
 	 *
@@ -158,7 +163,7 @@ class App
 
 	public function isLoggedIn(): bool
 	{
-		return DI::userSession()->getLocalUserId() && $this->user_id && ($this->user_id == DI::userSession()->getLocalUserId());
+		return $this->userSession->getLocalUserId() && $this->user_id && ($this->user_id == $this->userSession->getLocalUserId());
 	}
 
 	/**
@@ -172,7 +177,7 @@ class App
 
 		$adminlist = explode(',', str_replace(' ', '', $admin_email));
 
-		return DI::userSession()->getLocalUserId() && $admin_email && $this->database->exists('user', ['uid' => $this->getLoggedInUserId(), 'email' => $adminlist]);
+		return $this->userSession->getLocalUserId() && $admin_email && $this->database->exists('user', ['uid' => $this->getLoggedInUserId(), 'email' => $adminlist]);
 	}
 
 	/**
@@ -337,7 +342,7 @@ class App
 	 * @param IManagePersonalConfigValues $pConfig  Personal configuration
 	 * @param IHandleSessions             $session  The Session handler
 	 */
-	public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, IManagePersonalConfigValues $pConfig, IHandleSessions $session)
+	public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, IManagePersonalConfigValues $pConfig, IHandleSessions $session, IHandleUserSessions $userSession)
 	{
 		$this->database    = $database;
 		$this->config      = $config;
@@ -349,6 +354,7 @@ class App
 		$this->args        = $args;
 		$this->pConfig     = $pConfig;
 		$this->session     = $session;
+		$this->userSession = $userSession;
 
 		$this->load();
 	}
@@ -496,11 +502,11 @@ class App
 
 		$page_theme = null;
 		// Find the theme that belongs to the user whose stuff we are looking at
-		if (!empty($this->profile_owner) && ($this->profile_owner != DI::userSession()->getLocalUserId())) {
+		if (!empty($this->profile_owner) && ($this->profile_owner != $this->userSession->getLocalUserId())) {
 			// Allow folks to override user themes and always use their own on their own site.
 			// This works only if the user is on the same server
 			$user = $this->database->selectFirst('user', ['theme'], ['uid' => $this->profile_owner]);
-			if ($this->database->isResult($user) && !DI::userSession()->getLocalUserId()) {
+			if ($this->database->isResult($user) && !$this->userSession->getLocalUserId()) {
 				$page_theme = $user['theme'];
 			}
 		}
@@ -529,10 +535,10 @@ class App
 
 		$page_mobile_theme = null;
 		// Find the theme that belongs to the user whose stuff we are looking at
-		if (!empty($this->profile_owner) && ($this->profile_owner != DI::userSession()->getLocalUserId())) {
+		if (!empty($this->profile_owner) && ($this->profile_owner != $this->userSession->getLocalUserId())) {
 			// Allow folks to override user themes and always use their own on their own site.
 			// This works only if the user is on the same server
-			if (!DI::userSession()->getLocalUserId()) {
+			if (!$this->userSession->getLocalUserId()) {
 				$page_mobile_theme = $this->pConfig->get($this->profile_owner, 'system', 'mobile-theme');
 			}
 		}
@@ -593,13 +599,12 @@ class App
 	 * @param Authentication              $auth       The Authentication backend of the node
 	 * @param App\Page                    $page       The Friendica page printing container
 	 * @param HTTPInputData               $httpInput  A library for processing PHP input streams
-	 * @param IHandleUserSessions         $userSessions The UserSession class
 	 * @param float                       $start_time The start time of the overall script execution
 	 *
 	 * @throws HTTPException\InternalServerErrorException
 	 * @throws \ImagickException
 	 */
-	public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, HTTPInputData $httpInput, IHandleUserSessions $userSessions, float $start_time)
+	public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, HTTPInputData $httpInput, float $start_time)
 	{
 		$this->profiler->set($start_time, 'start');
 		$this->profiler->set(microtime(true), 'classinit');
@@ -630,7 +635,7 @@ class App
 			}
 
 			// ZRL
-			if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !DI::userSession()->getLocalUserId()) {
+			if (!empty($_GET['zrl']) && $this->mode->isNormal() && !$this->mode->isBackend() && !$this->userSession->getLocalUserId()) {
 				// Only continue when the given profile link seems valid
 				// Valid profile links contain a path with "/profile/" and no query parameters
 				if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == '') &&
@@ -738,7 +743,7 @@ class App
 			$response = $module->run($input);
 			$this->profiler->set(microtime(true) - $timestamp, 'content');
 			if ($response->getHeaderLine(ICanCreateResponses::X_HEADER) === ICanCreateResponses::TYPE_HTML) {
-				$page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $userSessions->getLocalUserId());
+				$page->run($this, $this->baseURL, $this->args, $this->mode, $response, $this->l10n, $this->profiler, $this->config, $pconfig, $this->userSession->getLocalUserId());
 			} else {
 				$page->exit($response);
 			}