diff --git a/composer.json b/composer.json
index 61e1f91327362278d3784c723903554664bec6e2..3932b080f712bd9aae325e6c3f78e83dbab2c3bd 100644
--- a/composer.json
+++ b/composer.json
@@ -148,12 +148,12 @@
"pear/http_request2": "~2.4",
"php-task-runner/composer": "dev-toolkit-runner",
"php-task-runner/sparql": "dev-toolkit-runner",
- "phpro/grumphp-shim": "^2.5",
+ "phpro/grumphp-shim": "^2.6",
"phpspec/prophecy-phpunit": "^2",
"phpstan/extension-installer": "^1.3",
"phpunit/phpunit": "^9.6",
"symfony/phpunit-bridge": "^6.3",
- "vincentlanglet/twig-cs-fixer": "^1.6",
+ "vincentlanglet/twig-cs-fixer": "^2.10",
"vlucas/phpdotenv": "~5",
"weitzman/drupal-test-traits": "2.x-dev",
"weitzman/logintrait": "^1.1"
diff --git a/composer.lock b/composer.lock
index 6ae87b143d6d6b9929b4877d23922e2f36b5ceeb..f92293ae5515bee7d2e604acbef7218c42c8d39a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "87af4cb25f14c333e48769a0dcb7c0e0",
+ "content-hash": "c94de0089efef95a82084a64e273abfc",
"packages": [
{
"name": "asm89/stack-cors",
@@ -10615,16 +10615,16 @@
},
{
"name": "openeuropa/oe_bootstrap_theme",
- "version": "1.10.0",
+ "version": "1.10.1",
"source": {
"type": "git",
"url": "https://github.com/openeuropa/oe_bootstrap_theme.git",
- "reference": "422dc9d41a87b4b81f631888485c6450aa62d65e"
+ "reference": "24d5d22715efaf0256ccdc53085a88df986b4b62"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/openeuropa/oe_bootstrap_theme/zipball/422dc9d41a87b4b81f631888485c6450aa62d65e",
- "reference": "422dc9d41a87b4b81f631888485c6450aa62d65e",
+ "url": "https://api.github.com/repos/openeuropa/oe_bootstrap_theme/zipball/24d5d22715efaf0256ccdc53085a88df986b4b62",
+ "reference": "24d5d22715efaf0256ccdc53085a88df986b4b62",
"shasum": ""
},
"require": {
@@ -10685,9 +10685,9 @@
"description": "OpenEuropa Bootstrap base theme.",
"support": {
"issues": "https://github.com/openeuropa/oe_bootstrap_theme/issues",
- "source": "https://github.com/openeuropa/oe_bootstrap_theme/tree/1.10.0"
+ "source": "https://github.com/openeuropa/oe_bootstrap_theme/tree/1.10.1"
},
- "time": "2024-05-03T11:15:51+00:00"
+ "time": "2024-06-27T13:58:28+00:00"
},
{
"name": "openeuropa/oe_dashboard_agent",
@@ -22646,16 +22646,16 @@
},
{
"name": "vincentlanglet/twig-cs-fixer",
- "version": "1.6.0",
+ "version": "2.10.1",
"source": {
"type": "git",
"url": "https://github.com/VincentLanglet/Twig-CS-Fixer.git",
- "reference": "e5be674a439e0dcfa2a4bd4ce83ee44e20867310"
+ "reference": "30fef7f8dc01bf1eaf948400a086ee2becae0f15"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/VincentLanglet/Twig-CS-Fixer/zipball/e5be674a439e0dcfa2a4bd4ce83ee44e20867310",
- "reference": "e5be674a439e0dcfa2a4bd4ce83ee44e20867310",
+ "url": "https://api.github.com/repos/VincentLanglet/Twig-CS-Fixer/zipball/30fef7f8dc01bf1eaf948400a086ee2becae0f15",
+ "reference": "30fef7f8dc01bf1eaf948400a086ee2becae0f15",
"shasum": ""
},
"require": {
@@ -22663,8 +22663,10 @@
"ext-ctype": "*",
"ext-json": "*",
"php": ">=8.0",
- "symfony/console": "^5.4.9 || ^6.0",
- "symfony/finder": "^5.4 || ^6.0",
+ "symfony/console": "^5.4.9 || ^6.0 || ^7.0",
+ "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
+ "symfony/finder": "^5.4 || ^6.0 || ^7.0",
+ "symfony/string": "^5.4 || ^6.0 || ^7.0",
"twig/twig": "^2.14.0 || ^3.0.5",
"webmozart/assert": "^1.10"
},
@@ -22683,10 +22685,9 @@
"phpunit/phpunit": "^9.5.26 || ^10.0.9",
"psalm/plugin-phpunit": "^0.18.4",
"psalm/plugin-symfony": "^5.0.0",
- "rector/rector": "^0.18.0",
- "symfony/filesystem": "^5.4 || ^6.0",
- "symfony/process": "^5.4 || ^6.0",
- "symfony/twig-bridge": "^5.4 || ^6.0",
+ "rector/rector": "^1.0.0",
+ "symfony/process": "^5.4 || ^6.0 || ^7.0",
+ "symfony/twig-bridge": "^5.4 || ^6.0 || ^7.0",
"symfony/ux-twig-component": "^2.2.0",
"twig/cache-extra": "^3.2",
"vimeo/psalm": "^5.2.0"
@@ -22713,7 +22714,7 @@
"homepage": "https://github.com/VincentLanglet/Twig-CS-Fixer",
"support": {
"issues": "https://github.com/VincentLanglet/Twig-CS-Fixer/issues",
- "source": "https://github.com/VincentLanglet/Twig-CS-Fixer/tree/1.6.0"
+ "source": "https://github.com/VincentLanglet/Twig-CS-Fixer/tree/2.10.1"
},
"funding": [
{
@@ -22721,7 +22722,7 @@
"type": "github"
}
],
- "time": "2023-10-25T18:51:07+00:00"
+ "time": "2024-05-28T14:51:00+00:00"
},
{
"name": "vlucas/phpdotenv",
diff --git a/grumphp.yml.dist b/grumphp.yml.dist
index 012e69460c0bb3b86f93d54260275f741cd593a9..536facb44a3e79b96de998c099d98a1a5f1221be 100644
--- a/grumphp.yml.dist
+++ b/grumphp.yml.dist
@@ -11,46 +11,49 @@ grumphp:
succeeded: ~
tasks:
- # Doc: https://github.com/phpro/grumphp/blob/master/doc/tasks/composer.md
+ # https://github.com/phpro/grumphp/blob/v2.x/doc/tasks/composer.md
composer: { }
- # Doc: https://github.com/phpro/grumphp/blob/master/doc/tasks/phpcs.md
+ # https://github.com/phpro/grumphp/blob/v2.x/doc/tasks/eslint.md
+ eslint:
+ bin: node_modules/.bin/eslint
+ config: .eslintrc.json
+ no_eslintrc: true
+
+ # https://github.com/phpro/grumphp/blob/v2.x/doc/tasks/phpcs.md
phpcs:
- standard: ['./phpcs.xml']
+ standard: [ './phpcs.xml' ]
triggered_by: '%grumphp.tasks.php_extensions%'
- # Doc: https://github.com/phpro/grumphp/blob/master/doc/tasks/phpmd.md
+ # https://github.com/phpro/grumphp/blob/v2.x/doc/tasks/phplint.md
+ phplint:
+ triggered_by: '%grumphp.tasks.php_extensions%'
+
+ # https://github.com/phpro/grumphp/blob/v2.x/doc/tasks/phpmd.md
phpmd:
- ruleset: ['./phpmd.xml']
+ ruleset: [ './phpmd.xml' ]
triggered_by: '%grumphp.tasks.php_extensions%'
metadata:
enabled: false
- # Doc: https://github.com/phpro/grumphp/blob/master/doc/tasks/phpstan.md
+ # https://github.com/phpro/grumphp/blob/v2.x/doc/tasks/phpstan.md
phpstan:
configuration: './phpstan.neon'
triggered_by: '%grumphp.tasks.php_extensions%'
- # Doc: https://github.com/phpro/grumphp/blob/master/doc/tasks/phplint.md
- phplint:
- triggered_by: '%grumphp.tasks.php_extensions%'
-
- # Doc: https://github.com/phpro/grumphp/blob/master/doc/tasks/yamllint.md
- yamllint: { }
-
- # Doc: https://github.com/phpro/grumphp/blob/master/doc/tasks/eslint.md
- eslint:
- bin: node_modules/.bin/eslint
- config: .eslintrc.json
- no_eslintrc: true
-
- # Doc: https://github.com/phpro/grumphp/blob/master/doc/tasks/stylelint.md
+ # https://github.com/phpro/grumphp/blob/v2.x/doc/tasks/stylelint.md
stylelint:
bin: node_modules/.bin/stylelint
config: .stylelintrc.json
+ # https://github.com/phpro/grumphp/blob/v2.x/doc/tasks/twigcsfixer.md
+ twigcsfixer: { }
+
+ # https://github.com/phpro/grumphp/blob/v2.x/doc/tasks/yamllint.md
+ yamllint: { }
+
testsuites:
# On git pre-push, often initiating a full scan, omit phpstan which is slow.
# See scripts/git/pre_push.
git_pre_push:
- tasks: [composer, phpcs, phplint, yamllint, eslint, stylelint]
+ tasks: [ composer, eslint, phpcs, phplint, phpmd, stylelint, twigcsfixer, yamllint ]
diff --git a/resources/runner/testing.yml b/resources/runner/testing.yml
index 572a59252ab14018f10a89a7462c490e55a5541b..504ac70edfa105316cd5b56a74c9f58a9ac41874 100644
--- a/resources/runner/testing.yml
+++ b/resources/runner/testing.yml
@@ -31,16 +31,6 @@ commands:
command: drush:module-install
arguments: ${testing.modules}
- # Lints Twig files using Twig Coding Standard Rules.
- testing:lint-twig:
- - task: exec
- command: ${joinup.dir}/vendor/bin/twig-cs-fixer lint
-
- # Fixes Twig files using Twig Coding Standard Rules.
- testing:fix-twig:
- - task: exec
- command: ${joinup.dir}/vendor/bin/twig-cs-fixer lint --fix
-
# Checks for any unused step definitions, see profile in behat.yml.dist.
testing:unused-behat:
- task: exec
diff --git a/resources/runner/toolkit.yml b/resources/runner/toolkit.yml
index 6bc46549fb362637a613430488517beda0cf6f49..d29554928f9247b97530f81cf0ae3a61becf8591 100644
--- a/resources/runner/toolkit.yml
+++ b/resources/runner/toolkit.yml
@@ -173,12 +173,14 @@ commands:
- { task: exec, command: "${runner.bin_dir}/grumphp run --tasks=yamllint" }
toolkit:lint-css:
- { task: exec, command: "${runner.bin_dir}/grumphp run --tasks=stylelint" }
+ toolkit:lint-twig:
+ - { task: exec, command: "${runner.bin_dir}/grumphp run --tasks=twigcsfixer" }
# Extra commands to run on Gitlab after qa-code-review.
toolkit:post-qa-code-review:
- task: run
command: toolkit:lint-css
- task: run
- command: testing:lint-twig
+ command: toolkit:lint-twig
- task: run
command: testing:unused-behat
diff --git a/scripts/git/pre_push b/scripts/git/pre_push
index 82852d83f68cc4525f132f5d1e40addfa4e1f14e..8b9cc3925f8b7e49728f730591a3725ffced68a9 100755
--- a/scripts/git/pre_push
+++ b/scripts/git/pre_push
@@ -38,10 +38,6 @@ if [[ "$FULL_CHECK" == "1" ]]; then
ddev exec ./vendor/bin/grumphp run --no-interaction --testsuite=git_pre_push
EXIT_CODE=$?
else
- # Add composer.json if lock is present.
- # @todo Remove once https://github.com/phpro/grumphp/pull/1142 gets in.
- [[ "${CHANGED_FILES[@]}" =~ "composer.lock" ]] && CHANGED_FILES+=("composer.json")
-
# Keep only existing files.
CHANGED_FILES=($(printf "%s\n" "${CHANGED_FILES[@]}" | xargs -I {} bash -c 'test -e "{}" && echo "{}"'))
diff --git a/web/modules/custom/github_feed/templates/github-feed-events.html.twig b/web/modules/custom/github_feed/templates/github-feed-events.html.twig
index 50f45060d5ca58eedd59a00090e76f144d47c621..c7c0973c517c484743f73c937324c0db14895bff 100644
--- a/web/modules/custom/github_feed/templates/github-feed-events.html.twig
+++ b/web/modules/custom/github_feed/templates/github-feed-events.html.twig
@@ -18,51 +18,51 @@
<div class="github-feed-activity-stream-item__body__content">
<div class="github-feed-activity-stream-item__body__content__event">
{% if item.type == 'IssueCommentEvent' %}
- {{ item.payload.action }} {{ "comment"|t }} {{ item.payload.issue.number }} {{ "on"|t }}
- <a href="{{ item.payload.issue.html_url }}">{{ item.payload.issue.title }}</a> {{ "by"|t }}
+ {{ item.payload.action }} {{ 'comment'|t }} {{ item.payload.issue.number }} {{ 'on'|t }}
+ <a href="{{ item.payload.issue.html_url }}">{{ item.payload.issue.title }}</a> {{ 'by'|t }}
<a href="{{ item.actor.url }}">{{ item.actor.login }}</a>.
{% elseif item.type == 'IssuesEvent' %}
- {{ item.payload.action }} {{ "issue"|t }} {{ "on"|t }}
- <a href="{{ item.payload.issue.html_url }}">{{ item.payload.issue.title }}</a> {{ "by"|t }}
+ {{ item.payload.action }} {{ 'issue'|t }} {{ 'on'|t }}
+ <a href="{{ item.payload.issue.html_url }}">{{ item.payload.issue.title }}</a> {{ 'by'|t }}
<a href="{{ item.actor.url }}">{{ item.actor.login }}</a>.
{% elseif item.type == 'PullRequestEvent' %}
- {{ item.payload.action }} {{ "pull request"|t }} {{ "on"|t }}
- <a href="{{ item.payload.pull_request.html_url }}">{{ item.payload.pull_request.title }}</a> {{ "by"|t }}
+ {{ item.payload.action }} {{ 'pull request'|t }} {{ 'on'|t }}
+ <a href="{{ item.payload.pull_request.html_url }}">{{ item.payload.pull_request.title }}</a> {{ 'by'|t }}
<a href="{{ item.actor.url }}">{{ item.actor.login }}</a>.
{% elseif item.type == 'PullRequestReviewEvent' %}
- {{ item.payload.action }} {{ "pull request review"|t }} {{ "on"|t }}
- <a href="{{ item.payload.pull_request.html_url }}">{{ item.payload.pull_request.title }}</a> {{ "by"|t }}
+ {{ item.payload.action }} {{ 'pull request review'|t }} {{ 'on'|t }}
+ <a href="{{ item.payload.pull_request.html_url }}">{{ item.payload.pull_request.title }}</a> {{ 'by'|t }}
<a href="{{ item.actor.url }}">{{ item.actor.login }}</a>.
{% elseif item.type == 'PushEvent' %}
- {{ item.payload.commits|length }} {{ "commits"|t }} {{ "on"|t }}
- <a href="{{ item.payload.commits.0.url }}">{{ item.payload.commits.0.sha|slice(0, 7) }}</a> {{ "by"|t }}
+ {{ item.payload.commits|length }} {{ 'commits'|t }} {{ 'on'|t }}
+ <a href="{{ item.payload.commits.0.url }}">{{ item.payload.commits.0.sha|slice(0, 7) }}</a> {{ 'by'|t }}
<a href="{{ item.actor.url }}">{{ item.actor.login }}</a>.
{% elseif item.type == 'WatchEvent' %}
- {{ "User"|t }} {{ item.actor.login }} {{ "starred the repository"|t }}.
+ {{ 'User'|t }} {{ item.actor.login }} {{ 'starred the repository'|t }}.
{% elseif item.type == 'ForkEvent' %}
- {{ "User"|t }} {{ item.actor.login }} {{ "forked the repository"|t }}.
+ {{ 'User'|t }} {{ item.actor.login }} {{ 'forked the repository'|t }}.
{% elseif item.type == 'CreateEvent' %}
{{ item.payload.ref_type }} created: {{ item.payload.ref }}
{% elseif item.type == 'DeleteEvent' %}
{{ item.payload.ref_type }} deleted: {{ item.payload.ref }}
{% elseif item.type == 'PullRequestReviewCommentEvent' %}
- {{ item.payload.action }} comment on pull request {{ "on"|t }}
- <a href="{{ item.payload.pull_request.html_url }}">{{ item.payload.pull_request.title }}</a> {{ "by"|t }}
+ {{ item.payload.action }} comment on pull request {{ 'on'|t }}
+ <a href="{{ item.payload.pull_request.html_url }}">{{ item.payload.pull_request.title }}</a> {{ 'by'|t }}
<a href="{{ item.actor.url }}">{{ item.actor.login }}</a>.
{% elseif item.type == 'CommitCommentEvent' %}
- {{ item.payload.action }} comment on commit {{ item.payload.comment.commit_id|slice(0, 7) }} {{ "by"|t }}
+ {{ item.payload.action }} comment on commit {{ item.payload.comment.commit_id|slice(0, 7) }} {{ 'by'|t }}
<a href="{{ item.actor.url }}">{{ item.actor.login }}</a>.
{% elseif item.type == 'ReleaseEvent' %}
- {{ item.payload.action }} release {{ item.payload.release.tag_name }} {{ "by"|t }}
+ {{ item.payload.action }} release {{ item.payload.release.tag_name }} {{ 'by'|t }}
<a href="{{ item.actor.url }}">{{ item.actor.login }}</a>.
{% elseif item.type == 'MemberEvent' %}
- {{ item.payload.action }} {{ "user"|t }} {{ item.payload.member.login }} {{ "was added to the repository"|t }}.
+ {{ item.payload.action }} {{ 'user'|t }} {{ item.payload.member.login }} {{ 'was added to the repository'|t }}.
{% elseif item.type == 'PublicEvent' %}
Repository made public.
{% elseif item.type == 'GollumEvent' %}
{{ item.payload.pages|length }} wiki page(s) {{ item.payload.pages.0.action }} on the repository.
{% else %}
- {{ "Unrecognized event type"|t }}
+ {{ 'Unrecognized event type'|t }}
{% endif %}
</div>
</div>
diff --git a/web/modules/custom/github_feed/templates/github-feed.html.twig b/web/modules/custom/github_feed/templates/github-feed.html.twig
index b762dfe8ede0288fc01103607104ce1bfd5200e2..b31c8acc0aeccb8a05b10527936a230bf66208f7 100644
--- a/web/modules/custom/github_feed/templates/github-feed.html.twig
+++ b/web/modules/custom/github_feed/templates/github-feed.html.twig
@@ -6,7 +6,7 @@
* - feed_type: The type of the feed.
#}
<div class="github-feed">
- <h3>{{ "Items of type"|t }} "{{ type_parsed }}" {{ "from"|t }} {{ url }}:</h3>
+ <h3>{{ 'Items of type'|t }} "{{ type_parsed }}" {{ 'from'|t }} {{ url }}:</h3>
{% for item in items %}
<div class="github-feed-item">
{{ item }}
diff --git a/web/modules/custom/joinup_event/templates/node--event--highlighted-event.html.twig b/web/modules/custom/joinup_event/templates/node--event--highlighted-event.html.twig
index 244f7de2ab8ba60c0e63025dfc3cdd38d00ae26d..a3d3a55027e689c1a7713d7c755d364358652eb1 100644
--- a/web/modules/custom/joinup_event/templates/node--event--highlighted-event.html.twig
+++ b/web/modules/custom/joinup_event/templates/node--event--highlighted-event.html.twig
@@ -79,7 +79,7 @@
'node--event--highlighted',
]
%}
-{{ link('More events'|t, 'base:events', {'class': ['more-link']}) }}
+{{ link('More events'|t, 'base:events', {class: ['more-link']}) }}
<article{{ attributes.addClass(classes) }}>
{% if header %}
<header>
diff --git a/web/modules/custom/joinup_licence/templates/parts/licence-filter-search-input.html.twig b/web/modules/custom/joinup_licence/templates/parts/licence-filter-search-input.html.twig
index 0fec17ddb0cf928a03f40f53a013e15ff20138b6..d0e987de3a25727c9ce1fcd38b82c7c8500934c6 100644
--- a/web/modules/custom/joinup_licence/templates/parts/licence-filter-search-input.html.twig
+++ b/web/modules/custom/joinup_licence/templates/parts/licence-filter-search-input.html.twig
@@ -5,14 +5,14 @@
*/
#}
<div class="licence-search">
- <div class="licence-search__label">{{ "Enter"|t }} <a href="https://spdx.org/ids" target="_blank">{{ "licence SPDX identifier"|t }}</a></div>
+ <div class="licence-search__label">{{ 'Enter'|t }} <a href="https://spdx.org/ids" target="_blank">{{ 'licence SPDX identifier'|t }}</a></div>
<div class="licence-search__input">
<div>
<div>
<input type="text" id="licence-search"/>
- <label for="licence-search">{{ "SPDX id"|t }}</label>
+ <label for="licence-search">{{ 'SPDX id'|t }}</label>
</div>
</div>
</div>
- <div class="licence-search__label">{{ "or select licence terms below"|t }}</div>
+ <div class="licence-search__label">{{ 'or select licence terms below'|t }}</div>
</div>
diff --git a/web/modules/custom/joinup_search/templates/facet-widget-links-inline.html.twig b/web/modules/custom/joinup_search/templates/facet-widget-links-inline.html.twig
index 3d1f30c06ef841c0385b5e7596c7df5faea7b52c..b45e5386e2fa6c8a1f8572f29d2e4b1fdcab5b66 100644
--- a/web/modules/custom/joinup_search/templates/facet-widget-links-inline.html.twig
+++ b/web/modules/custom/joinup_search/templates/facet-widget-links-inline.html.twig
@@ -11,7 +11,7 @@
{%- if items -%}
<ul class="filter__menu mdl-menu mdl-menu--bottom-left mdl-js-menu" for="{{ button_attributes.id }}">
{%- for item in items -%}
- {%- set item_attributes = create_attribute({'class': ['facet-item', 'mdl-menu__item']}) -%}
+ {%- set item_attributes = create_attribute({class: ['facet-item', 'mdl-menu__item']}) -%}
<li{{ item_attributes }}>{{ item }}</li>
{%- endfor -%}
</ul>
diff --git a/web/modules/custom/joinup_search/templates/joinup-search-global-search.html.twig b/web/modules/custom/joinup_search/templates/joinup-search-global-search.html.twig
index dcd82f15954783ebb01ebd2699156c547e4d60ea..a010e63cc555a2f575c81310eda11de4cb5afad5 100644
--- a/web/modules/custom/joinup_search/templates/joinup-search-global-search.html.twig
+++ b/web/modules/custom/joinup_search/templates/joinup-search-global-search.html.twig
@@ -12,7 +12,7 @@
<div class="search-bar">
<label for="search-bar__input">{{ 'Search'|trans }}</label>
- <form action="{{ path("view.search.page_1") }}">
+ <form action="{{ path('view.search.page_1') }}">
{% for id, filter in filters %}
<input type="hidden" class="search-bar__chip" name="f[]" value="{{ id }}" data-joinup-description="{{ filter }}">
{% endfor %}
diff --git a/web/themes/iop/templates/block/block--iop-three-dots-menu.html.twig b/web/themes/iop/templates/block/block--iop-three-dots-menu.html.twig
index 8d5567f64302162ba4824cc7e0ef5482890be83c..6ee26693169755b917b9fd97a0188ed6f6ed34bb 100644
--- a/web/themes/iop/templates/block/block--iop-three-dots-menu.html.twig
+++ b/web/themes/iop/templates/block/block--iop-three-dots-menu.html.twig
@@ -25,4 +25,4 @@
* @see template_preprocess_block()
*/
#}
-{% include '@ventuno/templates/block/block--ventuno-three-dots-menu.html.twig' %}
+{{ include('@ventuno/templates/block/block--ventuno-three-dots-menu.html.twig') }}
diff --git a/web/themes/iop/templates/content/node--carousel.html.twig b/web/themes/iop/templates/content/node--carousel.html.twig
index 6cc8946fa75da1203728707de249a643873a84fd..4018388861632a47bc016d23e2faf4449bf4138a 100644
--- a/web/themes/iop/templates/content/node--carousel.html.twig
+++ b/web/themes/iop/templates/content/node--carousel.html.twig
@@ -71,7 +71,7 @@
*/
#}
-{% include '@iop/carousel/carousel-item.html.twig' with {
+{{ include('@iop/carousel/carousel-item.html.twig', {
attributes,
url,
title_prefix,
@@ -81,4 +81,4 @@
title_attributes,
image,
icon: node.bundle is same as 'collection' ? 'folder2-open' : 'clipboard2-check',
-} only %}
+}, false) }}
diff --git a/web/themes/iop/templates/content/node--event--view-mode-tile.html.twig b/web/themes/iop/templates/content/node--event--view-mode-tile.html.twig
index be02c70e326acc4eebb7abb348a0d48283725a01..c31357c63830147fbbaa7a652850fc6cf327fad3 100644
--- a/web/themes/iop/templates/content/node--event--view-mode-tile.html.twig
+++ b/web/themes/iop/templates/content/node--event--view-mode-tile.html.twig
@@ -65,4 +65,4 @@
*
* @see template_preprocess_node()
#}
-{% extends "node--view-mode-tile.html.twig" %}
+{% extends 'node--view-mode-tile.html.twig' %}
diff --git a/web/themes/iop/templates/content/node--news--view-mode-tile.html.twig b/web/themes/iop/templates/content/node--news--view-mode-tile.html.twig
index be02c70e326acc4eebb7abb348a0d48283725a01..c31357c63830147fbbaa7a652850fc6cf327fad3 100644
--- a/web/themes/iop/templates/content/node--news--view-mode-tile.html.twig
+++ b/web/themes/iop/templates/content/node--news--view-mode-tile.html.twig
@@ -65,4 +65,4 @@
*
* @see template_preprocess_node()
#}
-{% extends "node--view-mode-tile.html.twig" %}
+{% extends 'node--view-mode-tile.html.twig' %}
diff --git a/web/themes/iop/templates/content/page-title--node--event.html.twig b/web/themes/iop/templates/content/page-title--node--event.html.twig
index 084794e2c6cf2cbbf8b72a6617d17531523e82d1..f68008dfa2cf9360a5b232554a3c5192330b1d86 100644
--- a/web/themes/iop/templates/content/page-title--node--event.html.twig
+++ b/web/themes/iop/templates/content/page-title--node--event.html.twig
@@ -12,4 +12,4 @@
* displayed after the main title tag that appears in the template.
*/
#}
-{% include '@iop/content/page-title--node--news.html.twig' %}
+{{ include('@iop/content/page-title--node--news.html.twig') }}
diff --git a/web/themes/iop/templates/content/page-title--node--news.html.twig b/web/themes/iop/templates/content/page-title--node--news.html.twig
index dc783d7173bc52a07c5de61dc44069decf3da6e4..af55b0e33e745a3eba9c32b5b5ee854976d073e1 100644
--- a/web/themes/iop/templates/content/page-title--node--news.html.twig
+++ b/web/themes/iop/templates/content/page-title--node--news.html.twig
@@ -15,7 +15,7 @@
{% extends '@iop/content/page-title.html.twig' %}
{% block url_more %}
{{ attach_library('iop/call-to-action') }}
- {% set url_more = url_more|merge({'#attributes': {'class': [
+ {% set url_more = url_more|merge({'#attributes': {class: [
'call-to-action',
'flex-shrink-0',
'h3',
diff --git a/web/themes/iop/templates/layout/page.html.twig b/web/themes/iop/templates/layout/page.html.twig
index eb1544257f730653cf68a8223fdd84775ae8bafd..64ce25c8e47e63053b1f8b08e6b1eefd453fef55 100644
--- a/web/themes/iop/templates/layout/page.html.twig
+++ b/web/themes/iop/templates/layout/page.html.twig
@@ -42,14 +42,14 @@
#}
{% set node_attributes = create_attribute() %}
<div{{ node_attributes.addClass(node_classes, 'layout-container') }}>
- {% include '@ventuno/parts/header.html.twig' with {
+ {{ include('@ventuno/parts/header.html.twig', {
user_name: user_name,
landing_page_links: landing_page_links,
profile_links: profile_links,
anonymous_links: anonymous_links,
hide_searchbar: hide_searchbar,
searchbar: page.search_bar,
- } %}
+ }) }}
{% if page.header %}
{{ page.header }}
{% endif %}
@@ -91,7 +91,7 @@
</div>
{% if page.footer %}
- {% include '@ventuno/parts/footer.html.twig' %}
+ {{ include('@ventuno/parts/footer.html.twig') }}
{% endif %}
</div>
diff --git a/web/themes/iop/templates/menu/menu--og--navigation.html.twig b/web/themes/iop/templates/menu/menu--og--navigation.html.twig
index 53760525e78d05d62fc169220e3adc5fcc0fdc5c..b6c1385ccff10d1f0b5ff6748d174a55b7671125 100644
--- a/web/themes/iop/templates/menu/menu--og--navigation.html.twig
+++ b/web/themes/iop/templates/menu/menu--og--navigation.html.twig
@@ -12,9 +12,9 @@
#}
{{ attach_library('ventuno/menu--og--navigation') }}
{{ pattern('navigation', {
- 'variant': 'pills',
- 'orientation': 'horizontal',
- 'items': items,
- 'attributes': create_attribute().addClass(['pt-2', 'pt-md-0'])
+ variant: 'pills',
+ orientation: 'horizontal',
+ items: items,
+ attributes: create_attribute().addClass(['pt-2', 'pt-md-0'])
})
}}
diff --git a/web/themes/iop/templates/navigation/navbar.html.twig b/web/themes/iop/templates/navigation/navbar.html.twig
index df6de76914eeb330c8f73d88970eb1243a741067..11baf012bedbe871d1aab1b0f848358667799114 100644
--- a/web/themes/iop/templates/navigation/navbar.html.twig
+++ b/web/themes/iop/templates/navigation/navbar.html.twig
@@ -1 +1 @@
-{% include '@ventuno/templates/navigation/navbar.html.twig' %}
+{{ include('@ventuno/templates/navigation/navbar.html.twig') }}
diff --git a/web/themes/iop/templates/navigation/pager.html.twig b/web/themes/iop/templates/navigation/pager.html.twig
index e9bbf222948938edb9b60b550891284e4a3184dc..39394afeca4155fed2bd3364d977142b22e1a545 100644
--- a/web/themes/iop/templates/navigation/pager.html.twig
+++ b/web/themes/iop/templates/navigation/pager.html.twig
@@ -15,9 +15,9 @@
{% set utility_classes = ['my-5'] %}
{% set _alignments = {
-'right': 'justify-content-end',
-'center': 'justify-content-center',
-'left': '',
+right: 'justify-content-end',
+center: 'justify-content-center',
+left: '',
} %}
{% set alignment = alignment ? _alignments[alignment] : _alignments['center'] %}
diff --git a/web/themes/iop/templates/rdf_entity/rdf-entity--carousel.html.twig b/web/themes/iop/templates/rdf_entity/rdf-entity--carousel.html.twig
index 27dc039ae4eee4064ae75151bb3a9afcad3b4269..583313c8ac3af6c5c75386d07a5f8476eb90a6c9 100644
--- a/web/themes/iop/templates/rdf_entity/rdf-entity--carousel.html.twig
+++ b/web/themes/iop/templates/rdf_entity/rdf-entity--carousel.html.twig
@@ -8,7 +8,7 @@
*/
#}
-{% include '@iop/carousel/carousel-item.html.twig' with {
+{{ include('@iop/carousel/carousel-item.html.twig', {
attributes,
url,
title_prefix,
@@ -17,4 +17,4 @@
title_attributes,
image,
icon: rdf_entity.bundle is same as 'collection' ? 'folder2-open' : 'clipboard2-check',
-} only %}
+}, false) }}
diff --git a/web/themes/ventuno/templates/block/block--facetsblock-searchpage.html.twig b/web/themes/ventuno/templates/block/block--facetsblock-searchpage.html.twig
index 6e633200f2fd05d583929a6ef39f00a2badeff96..ae0dfc682767d7a7c789b9c936fb76af226a1c9f 100644
--- a/web/themes/ventuno/templates/block/block--facetsblock-searchpage.html.twig
+++ b/web/themes/ventuno/templates/block/block--facetsblock-searchpage.html.twig
@@ -41,5 +41,5 @@
body: content,
with_body_scroll: false,
with_backdrop: true,
- attributes: create_attribute().addClass(["bcl-offcanvas", "pe-3", "h-100"]),
+ attributes: create_attribute().addClass(['bcl-offcanvas', 'pe-3', 'h-100']),
}) }}
diff --git a/web/themes/ventuno/templates/block/block--views-block--latest-news-block.html.twig b/web/themes/ventuno/templates/block/block--views-block--latest-news-block.html.twig
index 005aa738da0261767a27e5d703358cb9a3459717..c20205982486b2746cef05c13e1c7a299da7760a 100644
--- a/web/themes/ventuno/templates/block/block--views-block--latest-news-block.html.twig
+++ b/web/themes/ventuno/templates/block/block--views-block--latest-news-block.html.twig
@@ -38,7 +38,7 @@
<h2{{ title_attributes }}>{{ label }}</h2>
{% endif %}
{{ title_suffix }}
- {{ link('More news'|t, 'base:news', {'class': ['more-link']}) }}
+ {{ link('More news'|t, 'base:news', {class: ['more-link']}) }}
{% block content %}
{{ content }}
{% endblock %}
diff --git a/web/themes/ventuno/templates/content/node--event--highlighted-event.html.twig b/web/themes/ventuno/templates/content/node--event--highlighted-event.html.twig
index 8bc9b7191f1cc04e984f8ca48f1c6c800ea2b03f..492da33f4a85c681bb139ac720a034c00a3671dd 100644
--- a/web/themes/ventuno/templates/content/node--event--highlighted-event.html.twig
+++ b/web/themes/ventuno/templates/content/node--event--highlighted-event.html.twig
@@ -79,7 +79,7 @@
'node--event--highlighted',
]
%}
-{{ link('More events'|t, 'base:events', {'class': ['more-link']}) }}
+{{ link('More events'|t, 'base:events', {class: ['more-link']}) }}
<article{{ attributes.addClass(classes) }}>
{% if header %}
<header>
diff --git a/web/themes/ventuno/templates/content/node--licence--compatibility-check.html.twig b/web/themes/ventuno/templates/content/node--licence--compatibility-check.html.twig
index 604b19b757facb8d0044af5b583b4f1cbc14a3e8..6028bd824271d127ca85e14138ff5aae548f3c89 100644
--- a/web/themes/ventuno/templates/content/node--licence--compatibility-check.html.twig
+++ b/web/themes/ventuno/templates/content/node--licence--compatibility-check.html.twig
@@ -12,7 +12,7 @@
'border',
'rounded',
] %}
-{% set spdx_licence_id = content.spdx_licence_id|render|striptags|trim|replace({'_': '-'}) %}
+{% set spdx_licence_id = content.spdx_licence_id|render|striptags|trim|replace({_: '-'}) %}
<article{{ attributes.addClass(classes) }} data-joinup-spdx="{{ spdx_licence_id }}" data-joinup-licence-category="{{ content.legal_categories }}">
<div class="row">
<div class="col-12 col-sm-6 col-md-4">
diff --git a/web/themes/ventuno/templates/content/page-title--node--custom-page.html.twig b/web/themes/ventuno/templates/content/page-title--node--custom-page.html.twig
index a3a7f127389c6fdbbf3664e7d5a106a818722fb3..360e71fdeb466f370a0320d79ded0923d4e78afd 100644
--- a/web/themes/ventuno/templates/content/page-title--node--custom-page.html.twig
+++ b/web/themes/ventuno/templates/content/page-title--node--custom-page.html.twig
@@ -30,7 +30,7 @@
<div class="page-title__details mb-4">
{% if additional_content.is_archived %}
- {% include '@ventuno/parts/page-title-detail-archive.html.twig' %}
+ {{ include('@ventuno/parts/page-title-detail-archive.html.twig') }}
{% endif %}
</div>
</div>
diff --git a/web/themes/ventuno/templates/content/page-title--node--discussion.html.twig b/web/themes/ventuno/templates/content/page-title--node--discussion.html.twig
index f82218600e76d7badf69a3a7ce4614cbbdaa39a7..3aca8a7ddec10604436028ce72586ef11a3f8792 100644
--- a/web/themes/ventuno/templates/content/page-title--node--discussion.html.twig
+++ b/web/themes/ventuno/templates/content/page-title--node--discussion.html.twig
@@ -44,7 +44,7 @@
}) }}
</span>
{% if additional_content.is_archived %}
- {% include '@ventuno/parts/page-title-detail-archive.html.twig' %}
+ {{ include('@ventuno/parts/page-title-detail-archive.html.twig') }}
{% endif %}
</div>
</div>
diff --git a/web/themes/ventuno/templates/content/page-title--node--document.html.twig b/web/themes/ventuno/templates/content/page-title--node--document.html.twig
index 060415a789192e6d90ecc3825b59bf3a7f5dc128..f49c6466858934171a889b5aa90848f8447d1e16 100644
--- a/web/themes/ventuno/templates/content/page-title--node--document.html.twig
+++ b/web/themes/ventuno/templates/content/page-title--node--document.html.twig
@@ -47,7 +47,7 @@
}) }}
</span>
{% if additional_content.is_archived %}
- {% include '@ventuno/parts/page-title-detail-archive.html.twig' %}
+ {{ include('@ventuno/parts/page-title-detail-archive.html.twig') }}
{% endif %}
</div>
</div>
diff --git a/web/themes/ventuno/templates/content/page-title--node--event.html.twig b/web/themes/ventuno/templates/content/page-title--node--event.html.twig
index 8c8cea2cd4c71f02234fda6c14038cb4625174b5..c7253291626a5521f5198d445b48a9cd439778ff 100644
--- a/web/themes/ventuno/templates/content/page-title--node--event.html.twig
+++ b/web/themes/ventuno/templates/content/page-title--node--event.html.twig
@@ -44,7 +44,7 @@
}) }}
</span>
{% if additional_content.is_archived %}
- {% include '@ventuno/parts/page-title-detail-archive.html.twig' %}
+ {{ include('@ventuno/parts/page-title-detail-archive.html.twig') }}
{% endif %}
</div>
diff --git a/web/themes/ventuno/templates/content/page-title--node--news.html.twig b/web/themes/ventuno/templates/content/page-title--node--news.html.twig
index 936c20467208a807d79384741658902586f21ddd..5650f4e42465db62f0de83f6213132535c98dc3a 100644
--- a/web/themes/ventuno/templates/content/page-title--node--news.html.twig
+++ b/web/themes/ventuno/templates/content/page-title--node--news.html.twig
@@ -44,7 +44,7 @@
}) }}
</span>
{% if additional_content.is_archived %}
- {% include '@ventuno/parts/page-title-detail-archive.html.twig' %}
+ {{ include('@ventuno/parts/page-title-detail-archive.html.twig') }}
{% endif %}
</div>
</div>
diff --git a/web/themes/ventuno/templates/content/page-title--rdf-entity--asset-release.html.twig b/web/themes/ventuno/templates/content/page-title--rdf-entity--asset-release.html.twig
index 449eb1ac3e41149cbff4e7aaffa7602a1095600b..b258f63a42838fcc31762c8653534164f7b25cd7 100644
--- a/web/themes/ventuno/templates/content/page-title--rdf-entity--asset-release.html.twig
+++ b/web/themes/ventuno/templates/content/page-title--rdf-entity--asset-release.html.twig
@@ -34,6 +34,6 @@
{% endif %}
{% if additional_content.is_archived %}
- {% include '@ventuno/parts/page-title-detail-archive.html.twig' %}
+ {{ include('@ventuno/parts/page-title-detail-archive.html.twig') }}
{% endif %}
</div>
diff --git a/web/themes/ventuno/templates/content/page-title.html.twig b/web/themes/ventuno/templates/content/page-title.html.twig
index 085b26cc7cfcfa472c1b3fc3702d803a5e8b7374..ac27a9e7aa1dccf76dbc059534c7d0c61b952f7a 100644
--- a/web/themes/ventuno/templates/content/page-title.html.twig
+++ b/web/themes/ventuno/templates/content/page-title.html.twig
@@ -22,7 +22,7 @@
</h1>
{% if additional_content.is_archived %}
<div class="page-title__details mb-4">
- {% include '@ventuno/parts/page-title-detail-archive.html.twig' %}
+ {{ include('@ventuno/parts/page-title-detail-archive.html.twig') }}
</div>
{% endif %}
</div>
diff --git a/web/themes/ventuno/templates/facets/facets-item-list.html.twig b/web/themes/ventuno/templates/facets/facets-item-list.html.twig
index 520e32ea9328b1955469e12adbc862e2c91274f6..ef0f8ff67c83585b1120de2f79364471ab1bb4d7 100644
--- a/web/themes/ventuno/templates/facets/facets-item-list.html.twig
+++ b/web/themes/ventuno/templates/facets/facets-item-list.html.twig
@@ -59,7 +59,7 @@
{%- endif -%}
{%- endif %}
- {% if facet.widget.type == "dropdown" %}
+ {% if facet.widget.type == 'dropdown' %}
<label id="facet_{{ facet.id }}_label">{{ 'Facet'|t }} {{ facet.label }}</label>
{%- endif %}
</div>
diff --git a/web/themes/ventuno/templates/field/field--report-link.html.twig b/web/themes/ventuno/templates/field/field--report-link.html.twig
index 6300ea04afed64a6aec05235243e36e7444b5555..c9df016bbba3f3c3940ff6e2cfaebab6e011c05e 100644
--- a/web/themes/ventuno/templates/field/field--report-link.html.twig
+++ b/web/themes/ventuno/templates/field/field--report-link.html.twig
@@ -14,5 +14,5 @@
%}
{% for item in items %}
- <a{{ attributes.addClass(classes) }} href="{{ item.content["#url"] }}">{{ item.content["#title"] }}</a>
+ <a{{ attributes.addClass(classes) }} href="{{ item.content['#url'] }}">{{ item.content['#title'] }}</a>
{% endfor %}
diff --git a/web/themes/ventuno/templates/flag/flag-count-text--mini.html.twig b/web/themes/ventuno/templates/flag/flag-count-text--mini.html.twig
index cd5f418a88ed6b25cf9662ba0ce331f3e3920d46..d5ef304356bc934319471daca8264cdb1711aae6 100644
--- a/web/themes/ventuno/templates/flag/flag-count-text--mini.html.twig
+++ b/web/themes/ventuno/templates/flag/flag-count-text--mini.html.twig
@@ -25,7 +25,7 @@
<a{{ attributes.addClass(classes)
.setAttribute('data-dialog-type', 'modal')
.setAttribute('data-dialog-options', '{"width": "auto","height":"auto"}')
- .setAttribute('href', path('joinup_modal.anonymous', {'type': 'like'}, {'query': {'destination': path('<current>')}}))
+ .setAttribute('href', path('joinup_modal.anonymous', {type: 'like'}, {query: {destination: path('<current>')}}))
.setAttribute('title', 'Sign in or register to like this content'|t)
}}>
<svg class="bi icon--xs me-1">
diff --git a/web/themes/ventuno/templates/flag/flag-count-text.html.twig b/web/themes/ventuno/templates/flag/flag-count-text.html.twig
index 34fb62b52b0cfe59a7a969392a97495ce0e21584..72788a3e2db3682cfa53939230175450a3138a29 100644
--- a/web/themes/ventuno/templates/flag/flag-count-text.html.twig
+++ b/web/themes/ventuno/templates/flag/flag-count-text.html.twig
@@ -20,7 +20,7 @@
] %}
{% set attributes = create_attribute()
.addClass(classes)
- .setAttribute('href', path('joinup_modal.anonymous', {'type': 'like'}, {'query': {'destination': path('<current>')}}))
+ .setAttribute('href', path('joinup_modal.anonymous', {type: 'like'}, {query: {destination: path('<current>')}}))
.setAttribute('data-dialog-type', 'modal')
.setAttribute('data-dialog-options', '{"width":"auto","height":"auto"}')
%}
diff --git a/web/themes/ventuno/templates/form/views-exposed-form--og-members-overview.html.twig b/web/themes/ventuno/templates/form/views-exposed-form--og-members-overview.html.twig
index 20a70502f14763dc4b8e7e8f3fe1c21e337867cd..fa2ada3bed54c059babfd523f15717b4ffefa757 100644
--- a/web/themes/ventuno/templates/form/views-exposed-form--og-members-overview.html.twig
+++ b/web/themes/ventuno/templates/form/views-exposed-form--og-members-overview.html.twig
@@ -10,4 +10,4 @@
* @ingroup themeable
*/
#}
-{% extends "views-exposed-form--members-overview.html.twig" %}
+{% extends 'views-exposed-form--members-overview.html.twig' %}
diff --git a/web/themes/ventuno/templates/joinup_licence/licence-filter-search-input.html.twig b/web/themes/ventuno/templates/joinup_licence/licence-filter-search-input.html.twig
index 32104f039fb1aeebcb5a4bddcddbc61e0c4a3c4e..592c394f280bf14d047de079d97d04f17583846f 100644
--- a/web/themes/ventuno/templates/joinup_licence/licence-filter-search-input.html.twig
+++ b/web/themes/ventuno/templates/joinup_licence/licence-filter-search-input.html.twig
@@ -9,14 +9,14 @@
<div class="my-5">
<div class="d-flex flex-wrap align-items-baseline justify-content-between w-100">
<div>
- {{ "or enter licence SPDX ID:"|t }}
- <label for="licence-search" class="form-label visually-hidden">{{ "SPDX ID"|t }}</label>
- <input class="d-inline w-auto form-control licence-search__input" type="text" id="licence-search" placeholder="{{ "SPDX ID"|t }}" aria-describedby="helperText">
+ {{ 'or enter licence SPDX ID:'|t }}
+ <label for="licence-search" class="form-label visually-hidden">{{ 'SPDX ID'|t }}</label>
+ <input class="d-inline w-auto form-control licence-search__input" type="text" id="licence-search" placeholder="{{ 'SPDX ID'|t }}" aria-describedby="helperText">
</div>
<button id="licence-reset" class="licence-search__reset btn btn-outline-primary" type="reset" value="Reset">{{ 'Reset'|t }}</button>
</div>
<a href="https://spdx.org/ids" target="_blank" class="external d-flex align-items-center mt-4">
- <span id="helperText">{{ "Learn more about SPDX identifiers"|t }}</span>
+ <span id="helperText">{{ 'Learn more about SPDX identifiers'|t }}</span>
</a>
</div>
{% endapply %}
diff --git a/web/themes/ventuno/templates/joinup_material_design/joinup-tiles--collections.html.twig b/web/themes/ventuno/templates/joinup_material_design/joinup-tiles--collections.html.twig
index a06af307e3e6daa19a8518c2d900eb86db5a20f5..7f60dfe657bead773911b8a80f9c069ddf02f29c 100644
--- a/web/themes/ventuno/templates/joinup_material_design/joinup-tiles--collections.html.twig
+++ b/web/themes/ventuno/templates/joinup_material_design/joinup-tiles--collections.html.twig
@@ -17,7 +17,7 @@
* @ingroup themeable
*/
#}
-{% extends "joinup-tiles.html.twig" %}
+{% extends 'joinup-tiles.html.twig' %}
{% block create %}
<div class="col">
diff --git a/web/themes/ventuno/templates/joinup_modal/joinup-modal-anonymous.html.twig b/web/themes/ventuno/templates/joinup_modal/joinup-modal-anonymous.html.twig
index 4e602d8682c68ff2590b973a750fc4defe91d677..795b46ebec1515ec6c8d89aedb5bb2a6cdcedddb 100644
--- a/web/themes/ventuno/templates/joinup_modal/joinup-modal-anonymous.html.twig
+++ b/web/themes/ventuno/templates/joinup_modal/joinup-modal-anonymous.html.twig
@@ -23,7 +23,7 @@
<h2 class="h1 mb-5">{{ title }}</h2>
<p class="mb-4">{{ description }}</p>
<p class="text-black-50 mb-2">{{ 'Already have an account?'|t }}</p>
- {{ link(login.text, login.url, {'class': ['btn', 'btn-brand', 'mb-4']}) }}
+ {{ link(login.text, login.url, {class: ['btn', 'btn-brand', 'mb-4']}) }}
<p class="text-black-50 mb-2">{{ 'New member?'|t }}</p>
- {{ link(register.text, register.url, {'class': ['btn', 'btn-secondary']}) }}
+ {{ link(register.text, register.url, {class: ['btn', 'btn-secondary']}) }}
</div>
diff --git a/web/themes/ventuno/templates/layout/html.html.twig b/web/themes/ventuno/templates/layout/html.html.twig
index 52a05de502330ce8866e60b5a03a0b299d7aa76d..44daa2dc861c5076a6c3a94159d1149c8c72f8b4 100644
--- a/web/themes/ventuno/templates/layout/html.html.twig
+++ b/web/themes/ventuno/templates/layout/html.html.twig
@@ -38,7 +38,7 @@
<css-placeholder token="{{ placeholder_token }}">
<js-placeholder token="{{ placeholder_token }}">
{# Include responsive favicons #}
- {% include '@ventuno/parts/favicon.html.twig' %}
+ {{ include('@ventuno/parts/favicon.html.twig') }}
</head>
<body{{ attributes.addClass(body_classes) }}>
{#
diff --git a/web/themes/ventuno/templates/layout/page--home.html.twig b/web/themes/ventuno/templates/layout/page--home.html.twig
index dc66c3c3111b9a5a60afd0c484530dd77ada6ed5..99f182dd0c42b4213fb8eda6d0254f6b166398a3 100644
--- a/web/themes/ventuno/templates/layout/page--home.html.twig
+++ b/web/themes/ventuno/templates/layout/page--home.html.twig
@@ -60,7 +60,7 @@
{{ attach_library('ventuno/homepage') }}
<div class="layout-container">
- {% include '@ventuno/parts/header.html.twig' with {
+ {{ include('@ventuno/parts/header.html.twig', {
user_name: user_name,
landing_page_links: landing_page_links,
profile_links: profile_links,
@@ -68,7 +68,7 @@
hide_searchbar: hide_searchbar,
searchbar: page.search_bar,
bookmark_link: bookmark_link,
- } %}
+ }) }}
{% if page.header %}
{{ page.header }}
{% endif %}
@@ -115,7 +115,7 @@
</main>
{% if page.footer %}
- {% include '@ventuno/parts/footer.html.twig' %}
+ {{ include('@ventuno/parts/footer.html.twig') }}
{% endif %}
</div>{# /.layout-container #}
diff --git a/web/themes/ventuno/templates/layout/page--search.html.twig b/web/themes/ventuno/templates/layout/page--search.html.twig
index 49b2b362b9661a3b388e1816eed1becd81fe6684..d7c23108ba07914a15f7bbaa4cb749838320709b 100644
--- a/web/themes/ventuno/templates/layout/page--search.html.twig
+++ b/web/themes/ventuno/templates/layout/page--search.html.twig
@@ -60,7 +60,7 @@
{{ attach_library('ventuno/searchpage') }}
<div class="layout-container">
- {% include '@ventuno/parts/header.html.twig' with {
+ {{ include('@ventuno/parts/header.html.twig', {
user_name: user_name,
landing_page_links: landing_page_links,
profile_links: profile_links,
@@ -68,7 +68,7 @@
hide_searchbar: hide_searchbar,
searchbar: page.search_bar,
bookmark_link: bookmark_link,
- } %}
+ }) }}
{% if page.header %}
{{ page.header }}
{% endif %}
@@ -103,7 +103,7 @@
</main>
{% if page.footer %}
- {% include '@ventuno/parts/footer.html.twig' %}
+ {{ include('@ventuno/parts/footer.html.twig') }}
{% endif %}
</div>{# /.layout-container #}
diff --git a/web/themes/ventuno/templates/layout/page.html.twig b/web/themes/ventuno/templates/layout/page.html.twig
index 7abcbd46ed6c0246556bab6117271b9e62430de3..6235b897021ec5e676e3251757f61055fe7b57be 100644
--- a/web/themes/ventuno/templates/layout/page.html.twig
+++ b/web/themes/ventuno/templates/layout/page.html.twig
@@ -41,7 +41,7 @@
*/
#}
<div{{ attributes.addClass('layout-container') }}>
- {% include '@ventuno/parts/header.html.twig' with {
+ {{ include('@ventuno/parts/header.html.twig', {
user_name: user_name,
landing_page_links: landing_page_links,
profile_links: profile_links,
@@ -49,7 +49,7 @@
hide_searchbar: hide_searchbar,
searchbar: page.search_bar,
bookmark_link: bookmark_link,
- } %}
+ }) }}
{% block page_header %}
{% if page.header %}
@@ -99,7 +99,7 @@
</div>
{% if page.footer %}
- {% include '@ventuno/parts/footer.html.twig' %}
+ {{ include('@ventuno/parts/footer.html.twig') }}
{% endif %}
</div>
diff --git a/web/themes/ventuno/templates/menu/menu--og--navigation.html.twig b/web/themes/ventuno/templates/menu/menu--og--navigation.html.twig
index fc6e99c6f6c2aaa2659ba0781e93b9e9591bd2e2..0fad5ac719a9ca9c9a15acc8ab5fef280d18df29 100644
--- a/web/themes/ventuno/templates/menu/menu--og--navigation.html.twig
+++ b/web/themes/ventuno/templates/menu/menu--og--navigation.html.twig
@@ -28,8 +28,8 @@
<div class="container">
<nav>
{{ pattern('navigation', {
- 'variant': 'default',
- 'items': items,
+ variant: 'default',
+ items: items,
}) }}
</nav>
</div>
diff --git a/web/themes/ventuno/templates/menu/menu-local-tasks--horizontal-tabs.html.twig b/web/themes/ventuno/templates/menu/menu-local-tasks--horizontal-tabs.html.twig
index 29593e05e909d89e54b47922420d3725be5a27cf..9e022aeecd660647c202b464f6edd350deda2186 100644
--- a/web/themes/ventuno/templates/menu/menu-local-tasks--horizontal-tabs.html.twig
+++ b/web/themes/ventuno/templates/menu/menu-local-tasks--horizontal-tabs.html.twig
@@ -18,15 +18,15 @@
{% if primary %}
<h2 class="visually-hidden">{{ 'Primary tabs'|t }}</h2>
{{ pattern('navigation', {
- 'variant': 'tabs',
- 'items': primary,
+ variant: 'tabs',
+ items: primary,
}) }}
{% endif %}
{% if secondary %}
<h2 class="visually-hidden">{{ 'Secondary tabs'|t }}</h2>
{{ pattern('navigation', {
- 'variant': 'tabs',
- 'items': secondary,
+ variant: 'tabs',
+ items: secondary,
}) }}
{% endif %}
diff --git a/web/themes/ventuno/templates/menu/menu-local-tasks--three-dots-menu.html.twig b/web/themes/ventuno/templates/menu/menu-local-tasks--three-dots-menu.html.twig
index 6afd2169f0cc39b4c854b9c6781cde6d04043420..8eeaaea341738d87ff4a0a0238a31b3e64cbdc36 100644
--- a/web/themes/ventuno/templates/menu/menu-local-tasks--three-dots-menu.html.twig
+++ b/web/themes/ventuno/templates/menu/menu-local-tasks--three-dots-menu.html.twig
@@ -25,9 +25,9 @@
<nav class="nav nav-pills flex-column" aria-labelledby="local-tasks-primary" class="dropdown-menu">
<h2 class="visually-hidden">{{ 'Primary tabs'|t }}</h2>
{{ pattern('navigation', {
- 'variant': 'pills',
- 'orientation': 'vertical',
- 'items': primary,
+ variant: 'pills',
+ orientation: 'vertical',
+ items: primary,
}) }}
</nav>
</div>
@@ -42,9 +42,9 @@
<nav class="nav nav-pills flex-column" aria-labelledby="local-tasks-secondary" class="dropdown-menu">
<h2 class="visually-hidden">{{ 'Secondary tabs'|t }}</h2>
{{ pattern('navigation', {
- 'variant': 'pills',
- 'orientation': 'vertical',
- 'items': secondary,
+ variant: 'pills',
+ orientation: 'vertical',
+ items: secondary,
}) }}
</nav>
</div>
diff --git a/web/themes/ventuno/templates/message-digest/message-digest.html.twig b/web/themes/ventuno/templates/message-digest/message-digest.html.twig
index 71ccf7ddcde4abd387473d9be0bc395730499e84..bc5f3540b611cb6188b48d34db9d047629d9fe88 100644
--- a/web/themes/ventuno/templates/message-digest/message-digest.html.twig
+++ b/web/themes/ventuno/templates/message-digest/message-digest.html.twig
@@ -2,7 +2,7 @@
{% set subscription_url = site_url ~ path('joinup_subscription.my_subscriptions') %}
-{% set unsubscription_url = site_url ~ path('joinup_subscription.unsubscribe_all', {'user': receiver_id}) %}
+{% set unsubscription_url = site_url ~ path('joinup_subscription.unsubscribe_all', {user: receiver_id}) %}
{% set contact_url = site_url ~ path('contact_form.contact_page') %}
diff --git a/web/themes/ventuno/templates/meta-entity/meta-entity--topic--teaser.html.twig b/web/themes/ventuno/templates/meta-entity/meta-entity--topic--teaser.html.twig
index addf686f8c55fa7e10df12fd46e75eecc1556b48..35a965026d74813859f6275f48b1cbee3e61f7bd 100644
--- a/web/themes/ventuno/templates/meta-entity/meta-entity--topic--teaser.html.twig
+++ b/web/themes/ventuno/templates/meta-entity/meta-entity--topic--teaser.html.twig
@@ -5,9 +5,9 @@
*/
#}
-{% include '@ventuno/parts/tile-item.html.twig' with {
- 'title': content.label,
- 'image': content.image,
- 'url': url,
- 'description': content.description
-} %}
+{{ include('@ventuno/parts/tile-item.html.twig', {
+ title: content.label,
+ image: content.image,
+ url: url,
+ description: content.description
+}) }}
diff --git a/web/themes/ventuno/templates/navigation/navbar.html.twig b/web/themes/ventuno/templates/navigation/navbar.html.twig
index 34bbe7593404c6223de15e5616db614cd094c3ec..adcb6d781ea56f3bd8df0db67368837ffada8fc9 100644
--- a/web/themes/ventuno/templates/navigation/navbar.html.twig
+++ b/web/themes/ventuno/templates/navigation/navbar.html.twig
@@ -105,10 +105,10 @@
{% if not link.hide_on_desktop %}
{% set desktop_li_attributes = create_attribute() %}
{% set desktop_li_classes = [
- "nav-item",
- item.breakpoint != 'all' ? "d-none",
- item.breakpoint != 'all' ? "d-" ~ item.breakpoint ~ "-inline-block" : "d-inline-block",
- link.order ? "order-" ~ link.order,
+ 'nav-item',
+ item.breakpoint != 'all' ? 'd-none',
+ item.breakpoint != 'all' ? 'd-' ~ item.breakpoint ~ '-inline-block' : 'd-inline-block',
+ link.order ? 'order-' ~ link.order,
link.children ? 'dropdown',
link.in_active_trail ? 'is-active',
] %}
@@ -117,8 +117,8 @@
{% if link.link %}
{% set attributes = create_attribute(link.attributes|default([])) %}
{% set desktop_a_classes = [
- "nav-link",
- "nav-link--underline",
+ 'nav-link',
+ 'nav-link--underline',
link.children ? 'dropdown-toggle',
link.in_active_trail ? 'is-active',
] %}
@@ -135,7 +135,7 @@
{% for child in link.children %}
{% set attributes = create_attribute(link.attributes|default([])) %}
{% set classes = [
- "dropdown-item",
+ 'dropdown-item',
child.in_active_trail ? 'is-active',
] %}
<li>
@@ -199,7 +199,7 @@
<ul>
{% for link_key, link in item.links %}
{% if link.link %}
- <li {{ create_attribute({'class': link.in_active_trail ? 'Selected'}) }}>
+ <li {{ create_attribute({class: link.in_active_trail ? 'Selected'}) }}>
{% set attributes = create_attribute(link.attributes|default([])) %}
<a href="{{ link.link }}" {{ attributes.addClass(link.in_active_trail ? 'is-active') }}>
{{ link.label }}
@@ -207,7 +207,7 @@
{% if link.children %}
<ul>
{% for child in link.children %}
- <li {{ create_attribute({'class': child.in_active_trail ? 'Selected'}) }}>
+ <li {{ create_attribute({class: child.in_active_trail ? 'Selected'}) }}>
{% set attributes = create_attribute(child.attributes|default([])) %}
<a href="{{ child.link }}" {{ attributes.addClass(child.in_active_trail ? 'is-active') }}>
{{ child.label }}
diff --git a/web/themes/ventuno/templates/navigation/pager.html.twig b/web/themes/ventuno/templates/navigation/pager.html.twig
index 88ce32db6ae530da1af088923099dd97034fb099..1c89d9491a1414d8f36eb2a5fe8b258591530b07 100644
--- a/web/themes/ventuno/templates/navigation/pager.html.twig
+++ b/web/themes/ventuno/templates/navigation/pager.html.twig
@@ -15,9 +15,9 @@
{% set utility_classes = ['mt-5', 'mt-lg-4'] %}
{% set _alignments = {
-'right': 'justify-content-end',
-'center': 'justify-content-center',
-'left': '',
+right: 'justify-content-end',
+center: 'justify-content-center',
+left: '',
} %}
{% set alignment = alignment ? _alignments[alignment] : _alignments['center'] %}
diff --git a/web/themes/ventuno/templates/paragraph/paragraph--carousel.html.twig b/web/themes/ventuno/templates/paragraph/paragraph--carousel.html.twig
index a4e4aff754c054cc245b79b4455670c5a9cb9d3e..54fa1be9c950a731b21e78740fcec4f0668b2b81 100644
--- a/web/themes/ventuno/templates/paragraph/paragraph--carousel.html.twig
+++ b/web/themes/ventuno/templates/paragraph/paragraph--carousel.html.twig
@@ -56,7 +56,7 @@
{% if content.paragraph_carousel_action|render|striptags|trim is not empty %}
{% set link = content.paragraph_carousel_action[0] %}
- {% set link = link|merge({'#options': {'attributes': {'class': ['btn', 'btn-secondary', 'mb-3', 'ms-3']}}}) %}
+ {% set link = link|merge({'#options': {attributes: {class: ['btn', 'btn-secondary', 'mb-3', 'ms-3']}}}) %}
{{ link }}
{% endif %}
<div class="glide__arrows mb-3 ms-3" data-glide-el="controls">
diff --git a/web/themes/ventuno/templates/paragraph/paragraph--tile--default.html.twig b/web/themes/ventuno/templates/paragraph/paragraph--tile--default.html.twig
index fc4424dfdfdbb1140df73ff4141520db2a1a5824..da24a84b7062ea1e1ae91f9958afacf658f8c0f6 100644
--- a/web/themes/ventuno/templates/paragraph/paragraph--tile--default.html.twig
+++ b/web/themes/ventuno/templates/paragraph/paragraph--tile--default.html.twig
@@ -39,9 +39,9 @@
*/
#}
-{% include '@ventuno/parts/tile-item.html.twig' with {
- 'title': content.paragraph_tile_title,
- 'image': content.paragraph_tile_image,
- 'url': content.paragraph_tile_link[0]["#url"],
- 'description': content.paragraph_tile_description
-} %}
+{{ include('@ventuno/parts/tile-item.html.twig', {
+ title: content.paragraph_tile_title,
+ image: content.paragraph_tile_image,
+ url: content.paragraph_tile_link[0]['#url'],
+ description: content.paragraph_tile_description
+}) }}
diff --git a/web/themes/ventuno/templates/parts/header.html.twig b/web/themes/ventuno/templates/parts/header.html.twig
index ebc2acd9ea416d9f7d80aebde0a542e886394351..87c7fcceea55edf2c9731550d516daf4b8771f6c 100644
--- a/web/themes/ventuno/templates/parts/header.html.twig
+++ b/web/themes/ventuno/templates/parts/header.html.twig
@@ -8,52 +8,52 @@
</nav>
</div>
{% set items = logged_in ? [{
- type: "mmenu",
- breakpoint: "xl",
- classes: ["order-1"],
- id: "landing-pages",
- icon: {name: "justify"},
- label: "Toggle menu"|t,
+ type: 'mmenu',
+ breakpoint: 'xl',
+ classes: ['order-1'],
+ id: 'landing-pages',
+ icon: {name: 'justify'},
+ label: 'Toggle menu'|t,
links: landing_page_links,
}] : [] %}
{% set items = items|merge([{
- type: logged_in ? "dropdown" : "mmenu",
- breakpoint: logged_in ? "" : "xl",
- id: logged_in ? "account" : "navbar-toggler",
+ type: logged_in ? 'dropdown' : 'mmenu',
+ breakpoint: logged_in ? '' : 'xl',
+ id: logged_in ? 'account' : 'navbar-toggler',
icon: {
- name: logged_in ? "person-circle" : "justify",
+ name: logged_in ? 'person-circle' : 'justify',
},
- label: logged_in ? user_name : "Toggle menu"|t,
+ label: logged_in ? user_name : 'Toggle menu'|t,
links: logged_in ? profile_links : anonymous_links,
}]) %}
{% if bookmark_link %}
{% set items = items|merge([{
- breakpoint: "all",
- label: "Bookmark"|t,
+ breakpoint: 'all',
+ label: 'Bookmark'|t,
links: [bookmark_link|merge({order: 1})],
}]) %}
{% endif %}
{% if not hide_searchbar %}
{% set items = items|merge([{
- type: "search",
- breakpoint: "",
- classes: ["order-1 dropdown-search"],
- id: "search-box-dropdown",
+ type: 'search',
+ breakpoint: '',
+ classes: ['order-1 dropdown-search'],
+ id: 'search-box-dropdown',
icon: {
- name: "search",
+ name: 'search',
},
- label: "Toggle search box"|t,
+ label: 'Toggle search box'|t,
links: search,
}]) %}
{% endif %}
-{% include directory ~ '/templates/navigation/navbar.html.twig' with {
+{{ include(directory ~ '/templates/navigation/navbar.html.twig', {
brand: {
- src: path('<front>') ~ "themes/ventuno/assets/images/logo-interoperable-europe.svg",
- alt: "Interoperable Europe logo"|t,
+ src: path('<front>') ~ 'themes/ventuno/assets/images/logo-interoperable-europe.svg',
+ alt: 'Interoperable Europe logo'|t,
link: path('<front>'),
},
- collapse_id: "main-navbar",
- list_id: "main-navbar-list",
+ collapse_id: 'main-navbar',
+ list_id: 'main-navbar-list',
items: items,
search: hide_searchbar ? '' : searchbar,
-} %}
+}) }}
diff --git a/web/themes/ventuno/templates/patterns/tile/pattern-tile.html.twig b/web/themes/ventuno/templates/patterns/tile/pattern-tile.html.twig
index 31095c9bb8dff51404541ba41f999ed9566f0644..d3bec6b0e079732734a1d6a2b4e75b9b6f21b77a 100644
--- a/web/themes/ventuno/templates/patterns/tile/pattern-tile.html.twig
+++ b/web/themes/ventuno/templates/patterns/tile/pattern-tile.html.twig
@@ -105,12 +105,12 @@
<div class="my-2">
{{ attach_library('ventuno/badge') }}
{% for _badge in _badges %}
- {% include '@oe-bcl/badge' with {
+ {{ include('@oe-bcl/badge', {
label: _badge.label,
background: 'light',
rounded_pill: true,
attributes: create_attribute().addClass(['fs-sm', 'me-1', 'mb-1']),
- } only %}
+ }, false) }}
{% endfor %}
</div>
{%- endif -%}
diff --git a/web/themes/ventuno/templates/poll/poll-meter--anonymous.html.twig b/web/themes/ventuno/templates/poll/poll-meter--anonymous.html.twig
index 1bdc903f05bdc96139b4da8dab471f691778fd19..21dc75dd4d01d5d51d89177f1e2971040b1139e1 100644
--- a/web/themes/ventuno/templates/poll/poll-meter--anonymous.html.twig
+++ b/web/themes/ventuno/templates/poll/poll-meter--anonymous.html.twig
@@ -25,11 +25,11 @@
#}
{% set attributes = create_attribute(
{
- 'class': 'use-ajax',
+ class: 'use-ajax',
'data-dialog-type': 'modal',
- 'data-dialog-options': {'width': 400}|json_encode,
- 'href': path('joinup_modal.anonymous', {'type': 'vote'}, {'query': {'destination': path('<current>')}}),
- 'title': 'Login or register to proceed voting'|t,
+ 'data-dialog-options': {width: 400}|json_encode,
+ href: path('joinup_modal.anonymous', {type: 'vote'}, {query: {destination: path('<current>')}}),
+ title: 'Login or register to proceed voting'|t,
}
) %}
diff --git a/web/themes/ventuno/templates/rdf-entity/rdf-entity--collection--group-header.html.twig b/web/themes/ventuno/templates/rdf-entity/rdf-entity--collection--group-header.html.twig
index d56738adb7e8d552b30db6af55e65ea3f855a59c..78fba6c286344f8434c5115bd89b778f9d110730 100644
--- a/web/themes/ventuno/templates/rdf-entity/rdf-entity--collection--group-header.html.twig
+++ b/web/themes/ventuno/templates/rdf-entity/rdf-entity--collection--group-header.html.twig
@@ -17,7 +17,7 @@
{% if is_canonical %}
<h1>
{% endif %}
- <a class="h1 fw-bold mb-0" href="{{ path('entity.rdf_entity.canonical', {'rdf_entity': rdf_entity.id()}) }}">
+ <a class="h1 fw-bold mb-0" href="{{ path('entity.rdf_entity.canonical', {rdf_entity: rdf_entity.id()}) }}">
{{ label }}
</a>
{% if is_canonical %}
@@ -39,7 +39,7 @@
{{ content.solutions }}
</li>
<li class="group-banner__li text-muted">
- <a href="{{ path('entity.rdf_entity.member_overview', {'rdf_entity': rdf_entity.id()}) }}">
+ <a href="{{ path('entity.rdf_entity.member_overview', {rdf_entity: rdf_entity.id()}) }}">
<svg class="bi icon--xs me-1">
<use xlink:href="{{ bcl_icon_path }}#people"></use>
</svg>
diff --git a/web/themes/ventuno/templates/rdf-entity/rdf-entity--solution--eif-perspective.html.twig b/web/themes/ventuno/templates/rdf-entity/rdf-entity--solution--eif-perspective.html.twig
index adf6da872a2aeb4460a3e8a74cffb2f569497810..779c38c75ef4de939e9f06d7fa8c2fd3a49886c4 100644
--- a/web/themes/ventuno/templates/rdf-entity/rdf-entity--solution--eif-perspective.html.twig
+++ b/web/themes/ventuno/templates/rdf-entity/rdf-entity--solution--eif-perspective.html.twig
@@ -27,7 +27,7 @@
</div>
{{ title_prefix }}
- <h2 class="my-3 fs-4">{{ "General information"|t }}</h2>
+ <h2 class="my-3 fs-4">{{ 'General information'|t }}</h2>
{{ title_suffix }}
<div class="row">
<div class="col-12 col-sm-4 col-md-3 col-lg-2">
diff --git a/web/themes/ventuno/templates/rdf-entity/rdf-entity--solution--group-header.html.twig b/web/themes/ventuno/templates/rdf-entity/rdf-entity--solution--group-header.html.twig
index 860b91ca0b910c2a509f0891af0add5cb4956577..ca7ebc12fe1a0d14e26b01f191679a3ee17d80b1 100644
--- a/web/themes/ventuno/templates/rdf-entity/rdf-entity--solution--group-header.html.twig
+++ b/web/themes/ventuno/templates/rdf-entity/rdf-entity--solution--group-header.html.twig
@@ -17,7 +17,7 @@
{% if is_canonical %}
<h1>
{% endif %}
- <a class="h1 fw-bold mb-0" href="{{ path('entity.rdf_entity.canonical', {'rdf_entity': rdf_entity.id()}) }}">
+ <a class="h1 fw-bold mb-0" href="{{ path('entity.rdf_entity.canonical', {rdf_entity: rdf_entity.id()}) }}">
{{ label }}
</a>
{% if is_canonical %}
@@ -39,7 +39,7 @@
<ul class="group-banner__meta mw-100 align-self-end list-unstyled d-flex flex-column flex-lg-row flex-wrap mt-2 mb-0 group-stats fs-6">
<li class="group-banner__li group-banner__li--collection text-muted">{{ content.collections }}</li>
<li class="group-banner__li text-muted">
- <a href="{{ path('entity.rdf_entity.member_overview', {'rdf_entity': rdf_entity.id()}) }}">
+ <a href="{{ path('entity.rdf_entity.member_overview', {rdf_entity: rdf_entity.id()}) }}">
<svg class="bi icon--xs me-1">
<use xlink:href="{{ bcl_icon_path }}#people"></use>
</svg>
diff --git a/web/themes/ventuno/templates/search_api/facets-result-item--summary.html.twig b/web/themes/ventuno/templates/search_api/facets-result-item--summary.html.twig
index cf15889f273ec77d0263922d0417d0707b853cba..f89e625491065373e09d6f399c0f692a13be169f 100644
--- a/web/themes/ventuno/templates/search_api/facets-result-item--summary.html.twig
+++ b/web/themes/ventuno/templates/search_api/facets-result-item--summary.html.twig
@@ -19,9 +19,9 @@
{{ pattern('badge', {
label: value,
- background: "primary",
+ background: 'primary',
rounded_pill: true,
dismissible: true,
- attributes: create_attribute().addClass(["me-2 mb-2 fs-6 js-facet-deactivate"]),
+ attributes: create_attribute().addClass(['me-2 mb-2 fs-6 js-facet-deactivate']),
icons_path: bcl_icon_path,
}) }}
diff --git a/web/themes/ventuno/templates/social-media-links/social-media-links-platforms--field-paragraphs-social-media.html.twig b/web/themes/ventuno/templates/social-media-links/social-media-links-platforms--field-paragraphs-social-media.html.twig
index 253d0851f30a6347bd9fac810c192f7fa25ead46..12f50df5cdb0e0862c8b6398aa7d598be92f6080 100644
--- a/web/themes/ventuno/templates/social-media-links/social-media-links-platforms--field-paragraphs-social-media.html.twig
+++ b/web/themes/ventuno/templates/social-media-links/social-media-links-platforms--field-paragraphs-social-media.html.twig
@@ -16,11 +16,11 @@
<li class="mx-2">
<a href="{{ platform.url }}" target="_blank" rel="noopener" title="{{ platform.name }}">
{% if platform.id == 'twitter' %}
- {% include '@ventuno/assets/icons/twitter-x.svg' %}
+ {{ include('@ventuno/assets/icons/twitter-x.svg') }}
{% elseif platform.id == 'whatsapp' %}
- {% include '@ventuno/assets/icons/whatsapp.svg' %}
+ {{ include('@ventuno/assets/icons/whatsapp.svg') }}
{% elseif platform.id == 'instagram' %}
- {% include '@ventuno/assets/icons/instagram.svg' %}
+ {{ include('@ventuno/assets/icons/instagram.svg') }}
{% else %}
{{ pattern('icon', {
name: platform.id,
diff --git a/web/themes/ventuno/templates/swiftmailer/symfony-mailer-lite-email--message-digest.html.twig b/web/themes/ventuno/templates/swiftmailer/symfony-mailer-lite-email--message-digest.html.twig
index 5acaeddcccfa7da7469979d8f440607c5a848934..0ad79be26a8ad72eb98b60561f95d69e30758708 100644
--- a/web/themes/ventuno/templates/swiftmailer/symfony-mailer-lite-email--message-digest.html.twig
+++ b/web/themes/ventuno/templates/swiftmailer/symfony-mailer-lite-email--message-digest.html.twig
@@ -32,7 +32,7 @@
#}
<html>
<head>
- {% include '@ventuno/parts/mail-head.html.twig' %}
+ {{ include('@ventuno/parts/mail-head.html.twig') }}
</head>
<body>
<table>
diff --git a/web/themes/ventuno/templates/swiftmailer/symfony-mailer-lite-email--message-notify--announcement.html.twig b/web/themes/ventuno/templates/swiftmailer/symfony-mailer-lite-email--message-notify--announcement.html.twig
index 1e3c4fd0f124d61a16920db6ff2cb00e8220d39d..e0671be4d2b44e579e2d2c77a3378180c7b07da1 100644
--- a/web/themes/ventuno/templates/swiftmailer/symfony-mailer-lite-email--message-notify--announcement.html.twig
+++ b/web/themes/ventuno/templates/swiftmailer/symfony-mailer-lite-email--message-notify--announcement.html.twig
@@ -44,7 +44,7 @@
{% if is_html %}
<html>
<head>
- {% include '@ventuno/parts/mail-head.html.twig' %}
+ {{ include('@ventuno/parts/mail-head.html.twig') }}
</head>
<body>
<table role="presentation">
@@ -64,7 +64,7 @@
<tbody>
<tr>
<td class="p-3 text-right">
- <span class="d-inline-block p-3 bg-primary text-white text-bold">{{ message.delivery_time|date("j F Y") }}</span>
+ <span class="d-inline-block p-3 bg-primary text-white text-bold">{{ message.delivery_time|date('j F Y') }}</span>
</td>
</tr>
<tr>
diff --git a/web/themes/ventuno/templates/system/links--comment.html.twig b/web/themes/ventuno/templates/system/links--comment.html.twig
index 8acc7ab160dbe5ed8fb1bae0806892f005819c08..829d09237d328cb3613637c9c20532ebe1226fa0 100644
--- a/web/themes/ventuno/templates/system/links--comment.html.twig
+++ b/web/themes/ventuno/templates/system/links--comment.html.twig
@@ -58,12 +58,12 @@
{% elseif item.link|render|striptags|trim is same as 'Reply' %}
{% set icon = 'reply' %}
{% endif %}
- <a href="{{ item.link["#url"] }}">
+ <a href="{{ item.link['#url'] }}">
{{ pattern('icon', {
name: icon,
size: 'xs'
}) }}
- {{ item.link["#title"] }}
+ {{ item.link['#title'] }}
</a>
{%- elseif item.text_attributes -%}
<span{{ item.text_attributes }}>{{ item.text }}</span>
diff --git a/web/themes/ventuno/templates/system/maintenance-page.html.twig b/web/themes/ventuno/templates/system/maintenance-page.html.twig
index 9633fb71eb194a65bd121020c0fcbb7fce16d6c0..6773c0bff457f2a2ff7d488b1b58b13e2983429e 100644
--- a/web/themes/ventuno/templates/system/maintenance-page.html.twig
+++ b/web/themes/ventuno/templates/system/maintenance-page.html.twig
@@ -12,10 +12,10 @@
*/
#}
<div class="layout-container">
- {% include '@ventuno/parts/header.html.twig' with {
+ {{ include('@ventuno/parts/header.html.twig', {
hide_searchbar: 1,
hide_toggle: 1,
- } %}
+ }) }}
{% if page.header %}
{{ page.header }}
{% endif %}
diff --git a/web/themes/ventuno/templates/user/user--search-result-featured.html.twig b/web/themes/ventuno/templates/user/user--search-result-featured.html.twig
index 8ea075f0406f551d1b1a2785ef02f7b2475d7bb2..537802862fc499835346cd31d061340868bcb497 100644
--- a/web/themes/ventuno/templates/user/user--search-result-featured.html.twig
+++ b/web/themes/ventuno/templates/user/user--search-result-featured.html.twig
@@ -6,7 +6,7 @@
#}
{% if content %}
{% set title %}
- <a class="fs-5 fw-normal text-underline-hover mb-3" href="{{ path('entity.user.canonical', {'user': user.id}) }}">{{ full_name }}</a>
+ <a class="fs-5 fw-normal text-underline-hover mb-3" href="{{ path('entity.user.canonical', {user: user.id}) }}">{{ full_name }}</a>
{% endset %}
{{ pattern('search_item', {
image: content.field_user_photo,
diff --git a/web/themes/ventuno/templates/user/user--search-result.html.twig b/web/themes/ventuno/templates/user/user--search-result.html.twig
index e4203dd849d0ad710d299ff92c0a0cf921a1899d..1eef18753b23e29170026df1718511a3aa6e69f7 100644
--- a/web/themes/ventuno/templates/user/user--search-result.html.twig
+++ b/web/themes/ventuno/templates/user/user--search-result.html.twig
@@ -6,7 +6,7 @@
#}
{% if content %}
{% set title %}
- <a class="fs-5 fw-normal text-underline-hover mb-3" href="{{ path('entity.user.canonical', {'user': user.id}) }}">{{ full_name }}</a>
+ <a class="fs-5 fw-normal text-underline-hover mb-3" href="{{ path('entity.user.canonical', {user: user.id}) }}">{{ full_name }}</a>
{% endset %}
{{ pattern('search_item', {
badges: [],
diff --git a/web/themes/ventuno/templates/user/user--view-mode-tile-horizontal.html.twig b/web/themes/ventuno/templates/user/user--view-mode-tile-horizontal.html.twig
index 9c79c447163730f5cb0d4d719bc77546c262145d..ce6a9b50cc8484aaf147ab9515e35ca0b8cfe041 100644
--- a/web/themes/ventuno/templates/user/user--view-mode-tile-horizontal.html.twig
+++ b/web/themes/ventuno/templates/user/user--view-mode-tile-horizontal.html.twig
@@ -21,7 +21,7 @@
attributes,
horizontal: true,
image: content.field_user_photo,
- url: path('entity.user.canonical', {'user': user.id}),
+ url: path('entity.user.canonical', {user: user.id}),
info: {
icon: 'calendar-event',
label: content.member_for|render|striptags,
diff --git a/web/themes/ventuno/templates/user/user--view-mode-tile.html.twig b/web/themes/ventuno/templates/user/user--view-mode-tile.html.twig
index 25debd0c8be39f1ead62462c3640888f8b8df5ef..4ec0897f2071763f7e82cb0041ead0994d50d14b 100644
--- a/web/themes/ventuno/templates/user/user--view-mode-tile.html.twig
+++ b/web/themes/ventuno/templates/user/user--view-mode-tile.html.twig
@@ -19,7 +19,7 @@
{{ pattern('tile', {
attributes,
image: content.field_user_photo,
- url: path('entity.user.canonical', {'user': user.id}),
+ url: path('entity.user.canonical', {user: user.id}),
info: {
icon: 'calendar-event',
label: content.member_for|render|striptags,
diff --git a/web/themes/ventuno/templates/views/views-view--search--page.html.twig b/web/themes/ventuno/templates/views/views-view--search--page.html.twig
index 4da5585d3709e06fd8e5bcd3e20bd3749c3eabdc..f23d2d3608a3ab1578f005e222c5d634e7662c41 100644
--- a/web/themes/ventuno/templates/views/views-view--search--page.html.twig
+++ b/web/themes/ventuno/templates/views/views-view--search--page.html.twig
@@ -54,12 +54,12 @@
disabled: false,
icon: 'filter',
icon_position: 'after',
- attributes: create_attribute().addClass(["d-lg-none", "mt-2", "mb-4", "rounded-0", "w-100"]).setAttribute("data-bs-toggle", "offcanvas").setAttribute("data-bs-target", "#bcl-offcanvas").setAttribute("aria-controls", "bcl-offcanvas"),
+ attributes: create_attribute().addClass(['d-lg-none', 'mt-2', 'mb-4', 'rounded-0', 'w-100']).setAttribute('data-bs-toggle', 'offcanvas').setAttribute('data-bs-target', '#bcl-offcanvas').setAttribute('aria-controls', 'bcl-offcanvas'),
}) }}
{% if header %}
<div class="view-header">
- {% set results_count = header.views_block_area_1.content.results_count|merge({'value': header.result}) %}
- {% set search_exposed = header.views_block_area_1.content|merge({'results_count': results_count}) %}
+ {% set results_count = header.views_block_area_1.content.results_count|merge({value: header.result}) %}
+ {% set search_exposed = header.views_block_area_1.content|merge({results_count: results_count}) %}
{{ search_exposed }}
{{ header.views_block_area }}
{{ header.search_api_spellcheck_did_you_mean }}