Stop scrollToItem() animate twice.

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index 5c2118f73d63c0e841bf46b91731270d4f77d1ae..4a620313817fa297c4addb0544631d946ccbf36b 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -10,8 +10,8 @@ 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;
@@ -40,12 +40,6 @@ use Psr\Log\LoggerInterface;
  */
 class App
 {
-       /** @deprecated 2019.09 - use App\Arguments->getQueryString() */
-       public $query_string;
-       /**
-        * @var Page The current page environment
-        */
-       public $page;
        public $profile;
        public $profile_uid;
        public $user;
@@ -55,21 +49,13 @@ class App
        public $page_contact;
        public $content;
        public $data = [];
-       /** @deprecated 2019.09 - use App\Arguments->getCommand() */
-       public $cmd = '';
        /** @deprecated 2019.09 - use App\Arguments->getArgv() or Arguments->get() */
        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;
-       /** @deprecated 2019.09 - Use App\Mode->isMobile() instead */
-       public $is_mobile;
-       /** @deprecated 2019.09 - Use App\Mode->isTable() instead */
-       public $is_tablet;
        public $theme_info = [];
        public $category;
        // Allow themes to control internal parameters
@@ -98,7 +84,7 @@ class App
        private $currentMobileTheme;
 
        /**
-        * @var Configuration The config
+        * @var IConfiguration The config
         */
        private $config;
 
@@ -155,7 +141,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
@@ -164,7 +150,7 @@ class App
         * @param App\Arguments   $args     The Friendica Arguments of the call
         * @param Core\Process    $process  The process methods
         */
-       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)
        {
                $this->database = $database;
                $this->config   = $config;
@@ -176,15 +162,8 @@ class App
                $this->args     = $args;
                $this->process  = $process;
 
-               $this->cmd          = $args->getCommand();
                $this->argv         = $args->getArgv();
                $this->argc         = $args->getArgc();
-               $this->query_string = $args->getQueryString();
-               $this->module       = $module->getName();
-               $this->page         = $page;
-
-               $this->is_mobile = $mode->isMobile();
-               $this->is_tablet = $mode->isTablet();
 
                $this->load();
        }
@@ -449,12 +428,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();
 
@@ -583,7 +563,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)
@@ -595,7 +575,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);
        }
 
        /**