From 751b3ae3f81712738f8226042b8829ae94c8eb48 Mon Sep 17 00:00:00 2001
From: JiaJia Ji <kingjia90@gmail.com>
Date: Wed, 25 Sep 2024 10:23:17 +0200
Subject: [PATCH 1/2] remove twig deferred extension usages

---
 composer.json                                      | 4 ----
 templates/areas/wysiwyg-with-images/view.html.twig | 5 -----
 templates/areas/wysiwyg/view.html.twig             | 5 -----
 templates/includes/content-headline.html.twig      | 1 -
 templates/layouts/layout.html.twig                 | 9 ++++-----
 templates/layouts/print_catalog.html.twig          | 8 ++++----
 6 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/composer.json b/composer.json
index 653d5159..4dd034cf 100644
--- a/composer.json
+++ b/composer.json
@@ -28,15 +28,11 @@
     "pimcore/ecommerce-framework-bundle": "*",
     "pimcore/web-to-print-bundle": "*",
     "pimcore/newsletter-bundle": "*",
-    "rybakit/twig-deferred-extension": "^3.0",
     "symfony/runtime": "^6.2",
     "symfony/intl": "^6.2",
     "symfony/dotenv": "^6.2",
     "gotenberg/gotenberg-php": "^1.1 || ^2.0"
   },
-  "conflict": {
-     "twig/twig": "^3.9.0"
-  },  
   "suggest": {
     "pimcore/elasticsearch-client": "Required for Elastic Search service"
   },
diff --git a/templates/areas/wysiwyg-with-images/view.html.twig b/templates/areas/wysiwyg-with-images/view.html.twig
index 97df9cc0..96125944 100644
--- a/templates/areas/wysiwyg-with-images/view.html.twig
+++ b/templates/areas/wysiwyg-with-images/view.html.twig
@@ -2,11 +2,6 @@
 
 {% set content = pimcore_wysiwyg('content') %}
 
-{# add autogenerated meta description #}
-{% if document.getDescription() is empty %}
-    {% do pimcore_head_meta().setDescription(content.getData(), 160) %}
-{% endif %}
-
 <section class="area-wysiwyg">
     <div class="row">
         <div class="col-sm-8">
diff --git a/templates/areas/wysiwyg/view.html.twig b/templates/areas/wysiwyg/view.html.twig
index 70a8682c..c776788e 100644
--- a/templates/areas/wysiwyg/view.html.twig
+++ b/templates/areas/wysiwyg/view.html.twig
@@ -1,10 +1,5 @@
 {% set content = pimcore_wysiwyg('content') %}
 
-{# add autogenerated meta description #}
-{% if document.getDescription() is empty %}
-    {% do pimcore_head_meta().setDescription(content.getData(), 160) %}
-{% endif %}
-
 <section class="area-wysiwyg">
     {% apply pimcore_glossary %}
         {{ content|raw }}
diff --git a/templates/includes/content-headline.html.twig b/templates/includes/content-headline.html.twig
index 15e65d6e..1af4f459 100644
--- a/templates/includes/content-headline.html.twig
+++ b/templates/includes/content-headline.html.twig
@@ -1,5 +1,4 @@
 {% set headline = pimcore_input('headline') %}
-{% do pimcore_head_title(headline.getData()) %}
 
 <div class="page-header">
     {# we need to pipe the editable through the raw filter here as we saved it to a variable #}
diff --git a/templates/layouts/layout.html.twig b/templates/layouts/layout.html.twig
index ab4c20d0..49712ddb 100644
--- a/templates/layouts/layout.html.twig
+++ b/templates/layouts/layout.html.twig
@@ -54,8 +54,7 @@
             {% set isPortal = ((isPortal is defined) and isPortal) %}
         {% endapply %}
 
-        {# we're using the deferred extension here to make sure this block is rendered after all helper calls #}
-        {% block layout_head_meta deferred %}
+        {% block layout_head_meta %}
             {{ pimcore_head_title() }}
             {{ pimcore_head_meta() }}
 
@@ -65,7 +64,7 @@
 
         {% endblock %}
 
-        {% block head_stylesheets deferred %}
+        {% block head_stylesheets %}
             {{ pimcore_head_link() }}
         {% endblock %}
 
@@ -200,12 +199,12 @@
         {{ pimcore_inc(document.getProperty('footer')) }}
 
         {# output scripts added before #}
-        {% block headscripts deferred %}
+        {% block headscripts %}
             {{ pimcore_head_script() }}
         {% endblock %}
 
 
-        {% block inlinescripts deferred %}
+        {% block inlinescripts %}
             {{ pimcore_inline_script() }}
         {% endblock %}
     </body>
diff --git a/templates/layouts/print_catalog.html.twig b/templates/layouts/print_catalog.html.twig
index add6f368..9fc25493 100644
--- a/templates/layouts/print_catalog.html.twig
+++ b/templates/layouts/print_catalog.html.twig
@@ -3,7 +3,7 @@
 <html lang="">
 <head>
 
-    {% block head_stylesheets deferred %}
+    {% block head_stylesheets %}
         {{ pimcore_head_link() }}
     {% endblock %}
 
@@ -24,11 +24,11 @@
 
 
 
-    {% block headscripts deferred %}
+    {% block headscripts %}
         {{ pimcore_head_script() }}
     {% endblock %}
 
-    {% block register_definition deferred %}
+    {% block register_definition %}
         <style type="text/css">
             {{ pimcore_placeholder('register-title-definition') }}
         </style>
@@ -43,7 +43,7 @@
 
 
 
-{% block inlinescripts deferred %}
+{% block inlinescripts %}
     {{ pimcore_inline_script() }}
 {% endblock %}
 

From 59b65d22993de674ef6afe93bbf655c56130c5b7 Mon Sep 17 00:00:00 2001
From: JiaJia Ji <kingjia90@gmail.com>
Date: Wed, 25 Sep 2024 12:03:08 +0200
Subject: [PATCH 2/2] Update services.yaml

---
 config/services.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/config/services.yaml b/config/services.yaml
index 3ab58bf9..f7b66e32 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -223,8 +223,3 @@ services:
         arguments:
             - !service { class: PDO, factory: [ '@database_connection', 'getNativeConnection' ] }
             - { lock_mode: 0 }
-
-    # the deferred extension is needed for placeholder helpers to work
-    # as otherwise the placeholder block would be rendered before any
-    # content was added (e.g. headTitle)
-    Twig\DeferredExtension\DeferredExtension: ~