Merge branch 'master' of github.com:sumocoders/FrameworkCoreBundle

Author: Sander De la Marche

composer.json

@@ -23,23 +23,23 @@
   "require": {
     "php": "^8.0",
     "gedmo/doctrine-extensions": "^3",
-    "friendsofsymfony/jsrouting-bundle": "^2",
+    "friendsofsymfony/jsrouting-bundle": "^3",
     "knplabs/knp-menu-bundle": "^3.0",
     "sensio/framework-extra-bundle": "^6.1",
-    "symfony/form": "^5.3 || 6.0",
-    "symfony/asset": "^5.3 || 6.0",
-    "symfony/console": "^5.3 || 6.0",
-    "symfony/security-bundle": "^5.3 || 6.0",
-    "symfony/translation": "^5.3 || 6.0",
-    "symfony/twig-bundle": "^5.3 || 6.0",
+    "symfony/form": "^6.0",
+    "symfony/asset": "^6.0",
+    "symfony/console": "^6.0",
+    "symfony/security-bundle": "^6.0",
+    "symfony/translation": "^6.0",
+    "symfony/twig-bundle": "^6.0",
     "twig/inky-extra": "^3.3",
     "twig/cssinliner-extra": "^3.3",
     "twig/extra-bundle": "^3.3"
   },
   "require-dev": {
     "roave/security-advisories": "dev-master",
     "symfony/phpunit-bridge": "^6.0",
-    "friendsoftwig/twigcs": "^5.0",
+    "friendsoftwig/twigcs": "^6.0",
     "symfony/maker-bundle": "^1.0"
   },
   "autoload": {

templates/Form/fields.html.twig

@@ -5,8 +5,6 @@
     {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
     {% if label is empty %}
       {% set label = name|humanize|trans({}, translation_domain)|ucfirst  %}
-    {% else %}
-      {% set label = label|trans({}, translation_domain)|ucfirst %}
     {% endif %}
     {%- if compound is defined and compound -%}
       {%- set element = 'legend' -%}