Merge pull request #40 from basdenooijer/fix-twig-deprecations

Removed deprecated twig tags
mhujer · Sep 16, 2024 · a2cde1f · a2cde1f
2 parents a1676d7 + 51a1d76
commit a2cde1f
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 47 deletions.
diff --git a/Resources/views/json-ld.html.twig b/Resources/views/json-ld.html.twig
@@ -1,24 +1,22 @@
 {% if wo_breadcrumbs()|length %}
-    {%- apply spaceless -%}
-        <script type="application/ld+json">
-        {
-            "@context": "http://schema.org",
-            "@type": "BreadcrumbList",
-            "itemListElement":
-            [
-                {% for b in breadcrumbs %}
+    <script type="application/ld+json">
+    {
+        "@context": "http://schema.org",
+        "@type": "BreadcrumbList",
+        "itemListElement":
+        [
+            {% for b in breadcrumbs %}
+                {
+                    "@type": "ListItem",
+                    "position": {{ loop.index }},
+                    "item":
                     {
-                        "@type": "ListItem",
-                        "position": {{ loop.index }},
-                        "item":
-                        {
-                            "@id": "{{ b.url }}",
-                            "name": "{% if b.translate is defined and b.translate == true %}{{- b.text | trans(b.translationParameters, translation_domain, locale) -}}{% else %}{{- b.text -}}{% endif %}"
-                        }
-                    }{% if not loop.last %},{% endif %}
-                {% endfor %}
-            ]
-        }
-        </script>
-    {%- endapply -%}
+                        "@id": "{{ b.url }}",
+                        "name": "{% if b.translate is defined and b.translate == true %}{{- b.text | trans(b.translationParameters, translation_domain, locale) -}}{% else %}{{- b.text -}}{% endif %}"
+                    }
+                }{% if not loop.last %},{% endif %}
+            {% endfor %}
+        ]
+    }
+    </script>
 {% endif %}
diff --git a/Resources/views/microdata.html.twig b/Resources/views/microdata.html.twig
@@ -1,24 +1,22 @@
 {% if wo_breadcrumbs()|length %}
-    {%- apply spaceless -%}
-        <ol id="{{ listId }}" class="{{ listClass }}" itemscope itemtype="http://schema.org/BreadcrumbList">
-            {% for b in breadcrumbs %}
-                <li{% if itemClass is defined and itemClass|length %} class="{{ itemClass }}"{% endif %} itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
-                    {% if b.url and not loop.last %}
-                    <a href="{{ b.url }}" itemprop="item"{% if linkRel is defined and linkRel|length %} rel="{{ linkRel }}"{% endif %}>
-                        {% endif %}
-                        <span itemprop="name">{% if b.translate is defined and b.translate == true %}{{- b.text | trans(b.translationParameters, translation_domain, locale) -}}{% else %}{{- b.text -}}{% endif %}</span>
-                        {% if b.url and not loop.last %}
-                    </a>
-                    {% elseif b.url %}
-                        <meta itemprop="item" content="{{ b.url }}" />
+    <ol id="{{ listId }}" class="{{ listClass }}" itemscope itemtype="http://schema.org/BreadcrumbList">
+        {% for b in breadcrumbs %}
+            <li{% if itemClass is defined and itemClass|length %} class="{{ itemClass }}"{% endif %} itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
+                {% if b.url and not loop.last %}
+                <a href="{{ b.url }}" itemprop="item"{% if linkRel is defined and linkRel|length %} rel="{{ linkRel }}"{% endif %}>
                     {% endif %}
-                    <meta itemprop="position" content="{{ loop.index }}" />
+                    <span itemprop="name">{% if b.translate is defined and b.translate == true %}{{- b.text | trans(b.translationParameters, translation_domain, locale) -}}{% else %}{{- b.text -}}{% endif %}</span>
+                    {% if b.url and not loop.last %}
+                </a>
+                {% elseif b.url %}
+                    <meta itemprop="item" content="{{ b.url }}" />
+                {% endif %}
+                <meta itemprop="position" content="{{ loop.index }}" />
 
-                    {% if separator is not null and not loop.last %}
-                        <span class='{{ separatorClass }}'>{{ separator }}</span>
-                    {% endif %}
-                </li>
-            {% endfor %}
-        </ol>
-    {% endapply %}
+                {% if separator is not null and not loop.last %}
+                    <span class='{{ separatorClass }}'>{{ separator }}</span>
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ol>
 {% endif %}
diff --git a/Test/BundleTest.php b/Test/BundleTest.php
@@ -31,8 +31,17 @@ public function testRendering()
         /** @var \WhiteOctober\BreadcrumbsBundle\Twig\Extension\BreadcrumbsExtension $breadcrumbsExtension */
         $breadcrumbsExtension = $container->get('white_october_breadcrumbs.twig');
 
-        self::assertSame(
-            '<ol id="wo-breadcrumbs" class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><span itemprop="name">foo</span><meta itemprop="position" content="1" /></li></ol>',
+        self::assertStringEqualsStringIgnoringLineEndings(
+<<<'EOD'
+    <ol id="wo-breadcrumbs" class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList">
+                    <li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
+                                    <span itemprop="name">foo</span>
+                                    <meta itemprop="position" content="1" />
+
+                            </li>
+            </ol>
+
+EOD,
             $breadcrumbsExtension->renderBreadcrumbs()
         );
     }
@@ -50,8 +59,17 @@ public function testRenderingTranslationWithParameters()
         /** @var \WhiteOctober\BreadcrumbsBundle\Twig\Extension\BreadcrumbsExtension $breadcrumbsExtension */
         $breadcrumbsExtension = $container->get('white_october_breadcrumbs.twig');
 
-        self::assertSame(
-            '<ol id="wo-breadcrumbs" class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><span itemprop="name">foo__{name:John}</span><meta itemprop="position" content="1" /></li></ol>',
+        self::assertStringEqualsStringIgnoringLineEndings(
+<<<'EOD'
+    <ol id="wo-breadcrumbs" class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList">
+                    <li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
+                                    <span itemprop="name">foo__{name:John}</span>
+                                    <meta itemprop="position" content="1" />
+
+                            </li>
+            </ol>
+
+EOD,
             $breadcrumbsExtension->renderBreadcrumbs([
                 'viewTemplate' => '@WhiteOctoberBreadcrumbs/microdata.html.twig'
             ])
@@ -72,8 +90,23 @@ public function testRenderingTranslationWithParametersAndTranslationDomain()
         /** @var \WhiteOctober\BreadcrumbsBundle\Twig\Extension\BreadcrumbsExtension $breadcrumbsExtension */
         $breadcrumbsExtension = $container->get('white_october_breadcrumbs.twig');
 
-        self::assertSame(
-            '<ol id="wo-breadcrumbs" class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList"><li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><span itemprop="name">foo__domain:admin</span><meta itemprop="position" content="1" /><span class=\'separator\'>/</span></li><li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><span itemprop="name">bar__{name:John}__domain:admin</span><meta itemprop="position" content="2" /></li></ol>',
+        self::assertStringEqualsStringIgnoringLineEndings(
+            <<<'EOD'
+    <ol id="wo-breadcrumbs" class="breadcrumb" itemscope itemtype="http://schema.org/BreadcrumbList">
+                    <li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
+                                    <span itemprop="name">foo__domain:admin</span>
+                                    <meta itemprop="position" content="1" />
+
+                                    <span class='separator'>/</span>
+                            </li>
+                    <li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">
+                                    <span itemprop="name">bar__{name:John}__domain:admin</span>
+                                    <meta itemprop="position" content="2" />
+
+                            </li>
+            </ol>
+
+EOD,
             $breadcrumbsExtension->renderBreadcrumbs([
                 'viewTemplate' => '@WhiteOctoberBreadcrumbs/microdata.html.twig',
                 'translation_domain' => 'admin',