Verified Commit c4a2659d authored by Théodore Biadala's avatar Théodore Biadala
Browse files

Issue #3486170 by godotislate, bbrala, finnsky, longwave: Remove use of... 

Issue #3486170 by godotislate, bbrala, finnsky, longwave: Remove use of deprecated "spaceless" filter in core templates

(cherry picked from commit 69dc12e1)
parent c3881aff

core/.deprecation-ignore.txt

+0 −3
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ 
# PHPUnit 10.

%The "PHPUnit\\Framework\\TestCase::__construct\(\)" method is considered internal.*You should not extend it from "Drupal\\[^"]+"%



# Twig 3.

%Since twig/twig 3.12: Twig Filter "spaceless" is deprecated%



# Symfony 7.2

%Since symfony/http-foundation 7.2: NativeSessionStorage's "sid_length" option is deprecated and will be ignored in Symfony 8.0.%

%Since symfony/http-foundation 7.2: NativeSessionStorage's "sid_bits_per_character" option is deprecated and will be ignored in Symfony 8.0.%

core/modules/block_content/templates/block-content-add-list.html.twig

+6 −8
Original line number Diff line number Diff line
@@ -14,11 +14,9 @@ 
 * @ingroup themeable

 */

#}

{% apply spaceless %}

<dl>

  {% for type in types %}

    <dt>{{ type.link }}</dt>

    <dd>{{ type.description }}</dd>

  {% endfor %}

</dl>
 
{% endapply %}

core/modules/ckeditor5/templates/ckeditor5-settings-toolbar.html.twig

+11 −13
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
 *   supported because the UI can change at any point.

 */

#}

{% apply spaceless %}

<fieldset aria-labelledby="ckeditor5-toolbar-configuration" aria-describedby="ckeditor5-toolbar-description">

  <legend id="ckeditor5-toolbar-configuration">{{ 'Toolbar configuration'|t }}</legend>

  <div class="fieldset-wrapper">
@@ -23,4 +22,3 @@ 
    {{ form }}

  </div>

</fieldset>
 
{% endapply %}

core/modules/link/templates/link-formatter-link-separate.html.twig

+2 −4
Original line number Diff line number Diff line
@@ -14,7 +14,5 @@ 
 * @ingroup themeable

 */

#}

{% apply spaceless %}

  {{ title }}

  {{ link }}

{% endapply %}
 
{{~ title ~}}

{{~ link ~}}

core/modules/link/tests/src/Functional/LinkFieldTest.php

+3 −3
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ protected function doTestLinkSeparateFormatter(): void { 
            $url_title = isset($new_value) ? Unicode::truncate($url, $new_value, FALSE, TRUE) : $url;

            $expected = '<div class="link-item">';

            $expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';

            $expected .= '</div>';

            $expected .= PHP_EOL . '</div>';

            $this->assertStringContainsString($expected, $output);



            $url = $url2;
@@ -822,7 +822,7 @@ protected function doTestLinkSeparateFormatter(): void { 
            $expected = '<div class="link-item">';

            $expected .= '<div class="link-title">' . Html::escape($title) . '</div>';

            $expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';

            $expected .= '</div>';

            $expected .= PHP_EOL . '</div>';

            $this->assertStringContainsString($expected, $output);



            $url = $url3;
@@ -831,7 +831,7 @@ protected function doTestLinkSeparateFormatter(): void { 
            $expected = '<div class="link-item">';

            $expected .= '<div class="link-title">' . Html::escape($title) . '</div>';

            $expected .= '<div class="link-url"><a href="' . Html::escape($url) . '">' . Html::escape($url_title) . '</a></div>';

            $expected .= '</div>';

            $expected .= PHP_EOL . '</div>';

            $this->assertStringContainsString($expected, $output);

            break;