Fix deprecation

JanMikes · JanMikes · commit c5426df811f4 · 2026-01-03T13:10:08.000+01:00
diff --git a/config/reference.php b/config/reference.php
@@ -1877,8 +1877,8 @@
  * }
  * @psalm-type MercureConfig = array{
  *     hubs?: array<string, array{ // Default: []
- *         url?: scalar|null, // URL of the hub's publish endpoint
- *         public_url?: scalar|null, // URL of the hub's public endpoint // Default: null
+ *         url?: scalar|null, // URL of the hub's publish endpoint // Default: null
+ *         public_url?: scalar|null, // URL of the hub's public endpoint
  *         jwt?: string|array{ // JSON Web Token configuration.
  *             value?: scalar|null, // JSON Web Token to use to publish to this hub.
  *             provider?: scalar|null, // The ID of a service to call to provide the JSON Web Token.
diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -2,12 +2,12 @@
 <html lang="{{ app.request.locale }}" data-turbo="false">
     <head>
         <meta charset="UTF-8">
-        <title>{% apply spaceless %}{% block title %}{% endblock %}{% endapply %}{% if app.request.pathInfo != path('homepage') %} | MySpeedPuzzling{% endif %}</title>
+        <title>{%- block title -%}{%- endblock -%}{% if app.request.pathInfo != path('homepage') %} | MySpeedPuzzling{% endif %}</title>
 
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
 
-        <meta name="description" content="{% apply spaceless %}{% block meta_description %}{% endblock %}{% endapply %}{% if block('meta_description') is empty %}{{ 'homepage.meta.description'|trans }}{% endif %}">
-        <meta name="keywords" content="{% apply spaceless %}{% block meta_keywords %}{% endblock %}{% endapply %}{% if block('meta_keywords') is empty %}{% set currentPageKey = app.request.attributes.get('_route') %}{% if currentPageKey == 'homepage' %}{{ 'homepage.meta.keywords'|trans }}{% elseif currentPageKey == 'hub' %}{{ 'hub.meta.keywords'|trans }}{% elseif currentPageKey == 'puzzles' %}{{ 'puzzle_overview.meta.keywords'|trans }}{% elseif currentPageKey == 'ladder' %}{{ 'ladder.meta.keywords'|trans }}{% elseif currentPageKey == 'players' %}{{ 'puzzlers.meta.keywords'|trans }}{% elseif currentPageKey == 'events' %}{{ 'events.meta.keywords'|trans }}{% elseif currentPageKey == 'faq' %}{{ 'faq.meta.keywords'|trans }}{% else %}speed puzzling, puzzle times, jigsaw puzzles, speedpuzzling{% endif %}{% endif %}">
+        <meta name="description" content="{%- block meta_description -%}{%- endblock -%}{% if block('meta_description') is empty %}{{ 'homepage.meta.description'|trans }}{% endif %}">
+        <meta name="keywords" content="{%- block meta_keywords -%}{%- endblock -%}{% if block('meta_keywords') is empty %}{% set currentPageKey = app.request.attributes.get('_route') %}{% if currentPageKey == 'homepage' %}{{ 'homepage.meta.keywords'|trans }}{% elseif currentPageKey == 'hub' %}{{ 'hub.meta.keywords'|trans }}{% elseif currentPageKey == 'puzzles' %}{{ 'puzzle_overview.meta.keywords'|trans }}{% elseif currentPageKey == 'ladder' %}{{ 'ladder.meta.keywords'|trans }}{% elseif currentPageKey == 'players' %}{{ 'puzzlers.meta.keywords'|trans }}{% elseif currentPageKey == 'events' %}{{ 'events.meta.keywords'|trans }}{% elseif currentPageKey == 'faq' %}{{ 'faq.meta.keywords'|trans }}{% else %}speed puzzling, puzzle times, jigsaw puzzles, speedpuzzling{% endif %}{% endif %}">
         <meta name="format-detection" content="telephone=no">
         <meta name="turbo-prefetch" content="false">
         <meta name="turbo-refresh-method" content="morph">
