refactor: removed usage of old Template class (#2969)

thorsten · Jul 7, 2024 · ecf2d4a · ecf2d4a
1 parent 24e0272
commit ecf2d4a
Show file tree

Hide file tree

Showing 47 changed files with 141 additions and 600 deletions.
diff --git a/phpmyfaq/404.php b/phpmyfaq/404.php
@@ -16,6 +16,8 @@
  */
 
 use phpMyFAQ\Enums\SessionActionType;
+use phpMyFAQ\Template\TwigWrapper;
+use Twig\Extension\DebugExtension;
 
 if (!defined('IS_VALID_PHPMYFAQ')) {
     http_response_code(400);
@@ -24,4 +26,6 @@
 
 $faqSession->userTracking(SessionActionType::NOT_FOUND->value, 0);
 
-$template->parse('mainPageContent', []);
+$twig = new TwigWrapper(PMF_ROOT_DIR . '/assets/templates');
+$twig->addExtension(new DebugExtension());
+$twigTemplate = $twig->loadTemplate('./404.twig');
diff --git a/phpmyfaq/add.php b/phpmyfaq/add.php
@@ -99,6 +99,7 @@
 
 // Twig template variables
 $templateVars = [
+    ... $templateVars,
     'baseHref' => $faqSystem->getSystemUri($faqConfig),
     'msgNewContentHeader' => Translation::get('msgNewContentHeader'),
     'msgNewContentAddon' => Translation::get('msgNewContentAddon'),
@@ -140,7 +141,4 @@
     ];
 }
 
-$template->addRenderedTwigOutput(
-    'mainPageContent',
-    $twigTemplate->render($templateVars)
-);
+return $templateVars;
diff --git a/phpmyfaq/ask.php b/phpmyfaq/ask.php
@@ -63,6 +63,7 @@
 $twigTemplate = $twig->loadTemplate('./ask.twig');
 
 $templateVars = [
+    ... $templateVars,
     'baseHref' => $faqSystem->getSystemUri($faqConfig),
     'msgMatchingQuestions' => Translation::get('msgMatchingQuestions'),
     'msgFinishSubmission' => Translation::get('msgFinishSubmission'),
@@ -90,7 +91,4 @@
     }
 }
 
-$template->addRenderedTwigOutput(
-    'mainPageContent',
-    $twigTemplate->render($templateVars)
-);
+return $templateVars;
diff --git a/phpmyfaq/assets/templates/add.twig b/phpmyfaq/assets/templates/add.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
 {% if noCategories == true %}
 <div class="alert alert-danger">{{ msgFormDisabledDueToMissingCategories|raw }}</div>
@@ -109,3 +112,5 @@
 <script src="{{ baseHref }}admin/assets/js/editor/tinymce.min.js?{{ currentTimestamp }}"></script>
 {% endif %}
 {% endif %}
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/ask.twig b/phpmyfaq/assets/templates/ask.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
   {% if noCategories == true %}
   <div class="alert alert-danger">{{ msgFormDisabledDueToMissingCategories|raw }}</div>
@@ -76,3 +79,4 @@
   </form>
   {% endif %}
 </section>
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/attachment.twig b/phpmyfaq/assets/templates/attachment.twig
@@ -1,7 +1,11 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 {% if attachmentErrors %}
 <section>
   {% for item in attachmentErrors %}
     <li>{{ item }}</li>
   {% endfor %}
 </section>
 {% endif %}
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/bookmarks.twig b/phpmyfaq/assets/templates/bookmarks.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <!-- @todo Toasts -> have to be moved to header and footer.twig --->
 <div class="toast-container position-fixed top-0 start-50 translate-middle-x mt-5 p-3">
   <div id="pmf-notification" class="toast align-items-center text-bg-primary shadow border-0" role="alert"
@@ -59,3 +62,5 @@
 
   </div>
 </div>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/contact.twig b/phpmyfaq/assets/templates/contact.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
   <h1>{{ pageHeader }}</h1>
   <p>{{ msgContactOwnText|raw }}</p>
@@ -65,3 +68,5 @@
   </div>
   <!-- PLEASE DO NOT REMOVE THE COPYRIGHT NOTICE - THANK YOU -->
 </section>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/faq.twig b/phpmyfaq/assets/templates/faq.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <!-- @todo Toasts -> have to be moved to header and footer.twig --->
 <div class="toast-container position-fixed top-0 start-50 translate-middle-x mt-5 p-3">
   <div id="pmf-notification" class="toast align-items-center text-bg-primary shadow border-0" role="alert"
@@ -229,3 +232,5 @@
     </div>
   </div>
 </div>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/glossary.twig b/phpmyfaq/assets/templates/glossary.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
   <h1>{{ pageHeader }}</h1>
   <article>
@@ -15,3 +18,5 @@
     </div>
   </div>
 </section>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/login.twig b/phpmyfaq/assets/templates/login.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <div class="col-12">
   {% if useSslForLogins %}
   <p>
@@ -79,3 +82,5 @@
     </div>
   </div>
 </div>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/news.twig b/phpmyfaq/assets/templates/news.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <div class="row g-5">
   <div class="col-md-8">
     <h2 class="pb-4 mb-4 border-bottom">{{ newsHeader }}</h2>
@@ -70,3 +73,5 @@
     </div>
   </div>
 </div>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/open-questions.twig b/phpmyfaq/assets/templates/open-questions.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
   <h1>{{ pageHeader }}</h1>
   <p>{{ msgQuestionText }}</p>
@@ -48,3 +51,5 @@
     {% endif %}
   </table>
 </section>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/overview.twig b/phpmyfaq/assets/templates/overview.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
   <h1>{{ pageHeader }}</h1>
 
@@ -27,3 +30,5 @@
     {% set lastCategory = faq['category_id'] %}
   {% endfor %}
 </section>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/password.twig b/phpmyfaq/assets/templates/password.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
 
   <div class="row mb-2">
@@ -48,3 +51,5 @@
   </div>
 
 </section>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/register.twig b/phpmyfaq/assets/templates/register.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
   <h1>{{ pageHeader }}</h1>
   <p>{{ msgRegistrationCredentials }} {{ msgRegistrationNote }}</p>
@@ -55,3 +58,5 @@
     </div>
   </form>
 </section>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/request-removal.twig b/phpmyfaq/assets/templates/request-removal.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
   <h1>{{ pageHeader }}</h1>
   <p>{{ msgUserRemovalText }}</p>
@@ -88,3 +91,5 @@
     </div>
   </form>
 </section>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/search.twig b/phpmyfaq/assets/templates/search.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <div class="row g-5">
   <div class="col-md-8">
     <h2 class="pb-4 mb-4 border-bottom">{{ pageHeader }}</h2>
@@ -116,3 +119,5 @@
     </div>
   </div>
 </div>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/share-by-email.twig b/phpmyfaq/assets/templates/share-by-email.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
   <div class="row mb-2">
     <div class="col">
@@ -89,3 +92,5 @@
     </div>
   </form>
 </section>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/show.twig b/phpmyfaq/assets/templates/show.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <div class="row g-5">
   <div class="col-md-8">
     <h2 class="pb-4 mb-4 border-bottom">{{ categoryHeader }}</h2>
@@ -26,3 +29,5 @@
     </div>
   </div>
 </div>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/sitemap.twig b/phpmyfaq/assets/templates/sitemap.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <section class="col-12">
   <h1>{{ pageHeader }}</h1>
 
@@ -18,3 +21,5 @@
     {% endfor %}
   </ul>
 </section>
+
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/startpage.twig b/phpmyfaq/assets/templates/startpage.twig
@@ -141,4 +141,4 @@
   </div>
 </div>
 
-{% endblock content %}
+{% endblock %}
diff --git a/phpmyfaq/assets/templates/ucp.twig b/phpmyfaq/assets/templates/ucp.twig
@@ -1,3 +1,6 @@
+{% extends 'index.twig' %}
+
+{% block content %}
 <div class="row">
   <div class="col-4 pmf-personal-gravatar">
     <div class="card shadow mb-4">
@@ -225,3 +228,5 @@
     </div>
   </div>
 </div>
+
+{% endblock %}