diff --git a/composer.json b/composer.json
index bcb58517ed..91eebadb0c 100644
--- a/composer.json
+++ b/composer.json
@@ -37,6 +37,8 @@
"symfony/uid": "^5.4|^6.0|^7.0",
"symfony/ux-twig-component": "^2.21",
"symfony/validator": "^5.4|^6.0|^7.0",
+ "twig/extra-bundle": "^3.17",
+ "twig/html-extra": "^3.17",
"twig/twig": "^3.15"
},
"require-dev": {
diff --git a/templates/components/ActionMenu/ActionList/Item.html.twig b/templates/components/ActionMenu/ActionList/Item.html.twig
index 9980e753b9..8b7372e3a9 100644
--- a/templates/components/ActionMenu/ActionList/Item.html.twig
+++ b/templates/components/ActionMenu/ActionList/Item.html.twig
@@ -3,21 +3,12 @@
renderLabelRaw = false,
icon = null,
url = null,
+ htmlAttributes = {},
%}
-
+
{%- if icon %} {% endif -%}
{%- if label is not empty -%}{{ renderLabelRaw ? label|raw : label }}{%- endif -%}
-{#
-
-
- {%- if action.icon %} {% endif -%}
- {%- if action.label is not empty -%}{{ action.label|trans|raw }}{%- endif -%}
-
-
-#}
diff --git a/templates/crud/index.html.twig b/templates/crud/index.html.twig
index f347b82ce2..bc122c24cb 100644
--- a/templates/crud/index.html.twig
+++ b/templates/crud/index.html.twig
@@ -171,6 +171,7 @@
{% endfor %}
diff --git a/templates/layout.html.twig b/templates/layout.html.twig
index bacc3d50bf..68d9d9f075 100644
--- a/templates/layout.html.twig
+++ b/templates/layout.html.twig
@@ -91,10 +91,10 @@
{% else %}
/>
{% endif %}
{% endfor %}
diff --git a/tests/PrettyUrlsTestApplication/src/Kernel.php b/tests/PrettyUrlsTestApplication/src/Kernel.php
index bf6b7cd588..5c3ac7df1d 100644
--- a/tests/PrettyUrlsTestApplication/src/Kernel.php
+++ b/tests/PrettyUrlsTestApplication/src/Kernel.php
@@ -15,6 +15,7 @@
use Symfony\Component\HttpKernel\Kernel as SymfonyKernel;
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
use Symfony\UX\TwigComponent\TwigComponentBundle;
+use Twig\Extra\TwigExtraBundle\TwigExtraBundle;
final class Kernel extends SymfonyKernel
{
@@ -28,14 +29,15 @@ public function __construct()
public function registerBundles(): iterable
{
return [
- new FrameworkBundle(),
- new TwigBundle(),
+ new DebugBundle(),
new DoctrineBundle(),
new DoctrineFixturesBundle(),
- new SecurityBundle(),
- new DebugBundle(),
new EasyAdminBundle(),
+ new FrameworkBundle(),
+ new SecurityBundle(),
+ new TwigBundle(),
new TwigComponentBundle(),
+ new TwigExtraBundle(),
];
}
diff --git a/tests/TestApplication/src/Kernel.php b/tests/TestApplication/src/Kernel.php
index d8f4debb7a..bb163e8995 100644
--- a/tests/TestApplication/src/Kernel.php
+++ b/tests/TestApplication/src/Kernel.php
@@ -15,6 +15,7 @@
use Symfony\Component\HttpKernel\Kernel as SymfonyKernel;
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
use Symfony\UX\TwigComponent\TwigComponentBundle;
+use Twig\Extra\TwigExtraBundle\TwigExtraBundle;
final class Kernel extends SymfonyKernel
{
@@ -28,14 +29,15 @@ public function __construct()
public function registerBundles(): iterable
{
return [
- new FrameworkBundle(),
- new TwigBundle(),
+ new DebugBundle(),
new DoctrineBundle(),
new DoctrineFixturesBundle(),
- new SecurityBundle(),
- new DebugBundle(),
new EasyAdminBundle(),
+ new FrameworkBundle(),
+ new SecurityBundle(),
+ new TwigBundle(),
new TwigComponentBundle(),
+ new TwigExtraBundle(),
];
}