Extract config methods into AppHelper

diff --git a/src/App.php b/src/App.php
index 12b1cb13562776522a542b86f13d41fe0b3c0a2b..585c9b026a2268dc4aa9df88fcff3f2661c150c3 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -240,21 +240,25 @@ class App
        /**
         * Returns the current config cache of this node
         *
+        * @deprecated 2024.12 Use AppHelper::getConfigCache() instead
+        *
         * @return Cache
         */
        public function getConfigCache()
        {
-               return $this->config->getCache();
+               return $this->appHelper->getConfigCache();
        }
 
        /**
         * The basepath of this app
         *
+        * @deprecated 2024.12 Use AppHelper::getBasePath() instead
+        *
         * @return string Base path from configuration
         */
        public function getBasePath(): string
        {
-               return $this->config->get('system', 'basepath');
+               return $this->appHelper->getBasePath();
        }
 
        /**
@@ -414,12 +418,14 @@ class App
        /**
         * Provide a sane default if nothing is chosen or the specified theme does not exist.
         *
+        * @deprecated 2024.12 Use AppHelper::getCurrentThemeStylesheetPath() instead
+        *
         * @return string Current theme's stylesheet path
         * @throws Exception
         */
        public function getCurrentThemeStylesheetPath(): string
        {
-               return Core\Theme::getStylesheetPath($this->appHelper->getCurrentTheme());
+               return $this->appHelper->getCurrentThemeStylesheetPath();
        }
 
        /**

diff --git a/src/AppHelper.php b/src/AppHelper.php
index e9cf6c9167ab7b77eb0e70a2ebffa826087bb2a4..103d7ddf91df8c8fdba68e0219661e43c03cd2b4 100644 (file)
--- a/src/AppHelper.php
+++ b/src/AppHelper.php
@@ -11,6 +11,7 @@ use DateTimeZone;
 use Exception;
 use Friendica\App\Mode;
 use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\Config\ValueObject\Cache;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
@@ -265,6 +266,37 @@ final class AppHelper
                return $this->theme_info[$index] ?? $default;
        }
 
+       /**
+        * Provide a sane default if nothing is chosen or the specified theme does not exist.
+        *
+        * @return string Current theme's stylesheet path
+        * @throws Exception
+        */
+       public function getCurrentThemeStylesheetPath(): string
+       {
+               return Theme::getStylesheetPath($this->getCurrentTheme());
+       }
+
+       /**
+        * Returns the current config cache of this node
+        *
+        * @return Cache
+        */
+       public function getConfigCache(): Cache
+       {
+               return $this->config->getCache();
+       }
+
+       /**
+        * The basepath of this app
+        *
+        * @return string Base path from configuration
+        */
+       public function getBasePath(): string
+       {
+               return $this->config->get('system', 'basepath');
+       }
+
        /**
         * Computes the current theme name based on the node settings, the page owner settings and the user settings
         *