@brief is removed completely

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 892039dc5a302bd30fa44db0cdb6c52a9856fb62..925b24c9e7b6ace3705e901014e0ed7022770f1d 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -7,11 +7,10 @@ namespace Friendica;
 use Exception;
 use Friendica\App\Arguments;
 use Friendica\App\BaseURL;
-use Friendica\App\Page;
 use Friendica\App\Authentication;
 use Friendica\Core\Config\Cache\ConfigCache;
-use Friendica\Core\Config\Configuration;
-use Friendica\Core\Config\PConfiguration;
+use Friendica\Core\Config\IConfiguration;
+use Friendica\Core\Config\IPConfiguration;
 use Friendica\Core\L10n\L10n;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
@@ -29,7 +28,7 @@ use Psr\Log\LoggerInterface;
  *
  * class: App
  *
- * @brief Our main application structure for the life of this page.
+ * Our main application structure for the life of this page.
  *
  * Primarily deals with the URL that got us here
  * and tries to make some sense of it, and
@@ -40,10 +39,6 @@ use Psr\Log\LoggerInterface;
  */
 class App
 {
-       /**
-        * @var Page The current page environment
-        */
-       public $page;
        public $profile;
        public $profile_uid;
        public $user;
@@ -57,8 +52,6 @@ class App
        public $argv;
        /** @deprecated 2019.09 - use App\Arguments->getArgc() */
        public $argc;
-       /** @deprecated 2019.09 - Use App\Module->getName() instead */
-       public $module;
        public $timezone;
        public $interactive = true;
        public $identities;
@@ -90,7 +83,7 @@ class App
        private $currentMobileTheme;
 
        /**
-        * @var Configuration The config
+        * @var IConfiguration The config
         */
        private $config;
 
@@ -124,6 +117,11 @@ class App
         */
        private $process;
 
+       /**
+        * @var IPConfiguration
+        */
+       private $pConfig;
+
        /**
         * Returns the current config cache of this node
         *
@@ -147,7 +145,7 @@ class App
 
        /**
         * @param Database        $database The Friendica Database
-        * @param Configuration   $config   The Configuration
+        * @param IConfiguration   $config   The Configuration
         * @param App\Mode        $mode     The mode of this Friendica app
         * @param BaseURL         $baseURL  The full base URL of this Friendica app
         * @param LoggerInterface $logger   The current app logger
@@ -155,8 +153,9 @@ class App
         * @param L10n            $l10n     The translator instance
         * @param App\Arguments   $args     The Friendica Arguments of the call
         * @param Core\Process    $process  The process methods
+        * @param IPConfiguration $pConfig  Personal configuration
         */
-       public function __construct(Database $database, Configuration $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, App\Module $module, App\Page $page, Core\Process $process)
+       public function __construct(Database $database, IConfiguration $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, Core\Process $process, IPConfiguration $pConfig)
        {
                $this->database = $database;
                $this->config   = $config;
@@ -167,11 +166,10 @@ class App
                $this->l10n     = $l10n;
                $this->args     = $args;
                $this->process  = $process;
+               $this->pConfig  = $pConfig;
 
                $this->argv         = $args->getArgv();
                $this->argc         = $args->getArgc();
-               $this->module       = $module->getName();
-               $this->page         = $page;
 
                $this->load();
        }
@@ -344,7 +342,7 @@ class App
                        // 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_uid]);
-                       if ($this->database->isResult($user) && !Core\PConfig::get(local_user(), 'system', 'always_my_theme')) {
+                       if ($this->database->isResult($user) && !$this->pConfig->get(local_user(), 'system', 'always_my_theme')) {
                                $page_theme = $user['theme'];
                        }
                }
@@ -376,8 +374,8 @@ class App
                if ($this->profile_uid && ($this->profile_uid != local_user())) {
                        // 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 (!Core\PConfig::get(local_user(), 'system', 'always_my_theme')) {
-                               $page_mobile_theme = Core\PConfig::get($this->profile_uid, 'system', 'mobile-theme');
+                       if (!$this->pConfig->get(local_user(), 'system', 'always_my_theme')) {
+                               $page_mobile_theme = $this->pConfig->get($this->profile_uid, 'system', 'mobile-theme');
                        }
                }
 
@@ -395,8 +393,6 @@ class App
        }
 
        /**
-        * @brief Return full URL to theme which is currently in effect.
-        *
         * Provide a sane default if nothing is chosen or the specified theme does not exist.
         *
         * @return string
@@ -436,12 +432,13 @@ class App
         *
         * @param App\Module     $module The determined module
         * @param App\Router     $router
-        * @param PConfiguration $pconfig
+        * @param IPConfiguration $pconfig
         * @param Authentication $auth The Authentication backend of the node
+        * @param App\Page $page The Friendica page printing container
         * @throws HTTPException\InternalServerErrorException
         * @throws \ImagickException
         */
-       public function runFrontend(App\Module $module, App\Router $router, PConfiguration $pconfig, Authentication $auth)
+       public function runFrontend(App\Module $module, App\Router $router, IPConfiguration $pconfig, Authentication $auth, App\Page $page)
        {
                $moduleName = $module->getName();
 
@@ -570,7 +567,7 @@ class App
                        }
 
                        // Initialize module that can set the current theme in the init() method, either directly or via App->profile_uid
-                       $this->page['page_title'] = $moduleName;
+                       $page['page_title'] = $moduleName;
 
                        // determine the module class and save it to the module instance
                        // @todo there's an implicit dependency due SESSION::start(), so it has to be called here (yet)
@@ -582,7 +579,7 @@ class App
                        ModuleHTTPException::rawContent($e);
                }
 
-               $this->page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig);
+               $page->run($this, $this->baseURL, $this->mode, $module, $this->l10n, $this->config, $pconfig);
        }
 
        /**