Merge pull request #8222 from annando/ap-gnusocial

[friendica.git] / src / Core / Renderer.php

diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index fd5e73302512f0d8328690958941d2e356b8415c..eca22bdcd3f17faae68691bb9fd3871e74b90730 100644 (file)
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -6,27 +6,27 @@
 namespace Friendica\Core;
 
 use Exception;
-use Friendica\BaseObject;
+use Friendica\DI;
 use Friendica\Render\FriendicaSmarty;
 use Friendica\Render\ITemplateEngine;
 
 /**
- * @brief This class handles Renderer related functions.
+ * This class handles Renderer related functions.
  */
-class Renderer extends BaseObject
+class Renderer
 {
        /**
-        * @brief An array of registered template engines ('name'=>'class name')
+        * An array of registered template engines ('name'=>'class name')
         */
        public static $template_engines = [];
 
        /**
-        * @brief An array of instanced template engines ('name'=>'instance')
+        * An array of instanced template engines ('name'=>'instance')
         */
        public static $template_engine_instance = [];
 
        /**
-        * @brief An array for all theme-controllable parameters
+        * An array for all theme-controllable parameters
         *
         * Mostly unimplemented yet. Only options 'template_engine' and
         * beyond are used.
@@ -50,7 +50,7 @@ class Renderer extends BaseObject
        ];
 
        /**
-        * @brief This is our template processor
+        * This is our template processor
         *
         * @param string|FriendicaSmarty $s    The string requiring macro substitution or an instance of FriendicaSmarty
         * @param array                  $vars Key value pairs (search => replace)
@@ -61,10 +61,9 @@ class Renderer extends BaseObject
        public static function replaceMacros($s, array $vars = [])
        {
                $stamp1 = microtime(true);
-               $a = self::getApp();
 
                // pass $baseurl to all templates if it isn't set
-               $vars = array_merge(['$baseurl' => $a->getBaseURL()], $vars);
+               $vars = array_merge(['$baseurl' => DI::baseUrl()->get()], $vars);
 
                $t = self::getTemplateEngine();
 
@@ -75,13 +74,13 @@ class Renderer extends BaseObject
                        exit();
                }
 
-               $a->getProfiler()->saveTimestamp($stamp1, "rendering", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "rendering", System::callstack());
 
                return $output;
        }
 
        /**
-        * @brief Load a given template $s
+        * Load a given template $s
         *
         * @param string $s    Template to load.
         * @param string $root Optional.
@@ -92,7 +91,7 @@ class Renderer extends BaseObject
        public static function getMarkupTemplate($s, $root = '')
        {
                $stamp1 = microtime(true);
-               $a = self::getApp();
+               $a = DI::app();
                $t = self::getTemplateEngine();
 
                try {
@@ -102,13 +101,13 @@ class Renderer extends BaseObject
                        exit();
                }
 
-               $a->getProfiler()->saveTimestamp($stamp1, "file", System::callstack());
+               DI::profiler()->saveTimestamp($stamp1, "file", System::callstack());
 
                return $template;
        }
 
        /**
-        * @brief Register template engine class
+        * Register template engine class
         *
         * @param string $class
         */
@@ -127,7 +126,7 @@ class Renderer extends BaseObject
        }
 
        /**
-        * @brief Return template engine instance.
+        * Return template engine instance.
         *
         * If $name is not defined, return engine defined by theme,
         * or default
@@ -136,7 +135,7 @@ class Renderer extends BaseObject
         */
        public static function getTemplateEngine()
        {
-               $template_engine = defaults(self::$theme, 'template_engine', 'smarty3');
+               $template_engine = (self::$theme['template_engine'] ?? '') ?: 'smarty3';
 
                if (isset(self::$template_engines[$template_engine])) {
                        if (isset(self::$template_engine_instance[$template_engine])) {
@@ -154,7 +153,7 @@ class Renderer extends BaseObject
        }
 
        /**
-        * @brief Returns the active template engine.
+        * Returns the active template engine.
         *
         * @return string the active template engine
         */