From c90418f27174632cc0ff8c3f06945460fdf20114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Maci=C4=85g?= Date: Mon, 13 Apr 2026 20:37:12 +0200 Subject: [PATCH 1/3] Fix Symfony 8 deprecations --- src/Column/Type/MoneyColumnType.php | 35 ++++++++++++++++++---------- src/Column/Type/NumberColumnType.php | 35 ++++++++++++++++++---------- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/src/Column/Type/MoneyColumnType.php b/src/Column/Type/MoneyColumnType.php index df32551c..c53a1787 100755 --- a/src/Column/Type/MoneyColumnType.php +++ b/src/Column/Type/MoneyColumnType.php @@ -53,17 +53,28 @@ public function configureOptions(OptionsResolver $resolver): void ->allowedTypes('bool') ; - $resolver->define('intl_formatter_options') - ->default(function (OptionsResolver $resolver) { - $resolver - ->setDefaults([ - 'attrs' => [], - 'style' => 'decimal', - ]) - ->setAllowedTypes('attrs', 'array') - ->setAllowedTypes('style', 'string') - ; - }) - ; + if (method_exists($resolver, 'setOptions')) { + $resolver->setOptions('intl_formatter_options', function (OptionsResolver $resolver): void { + $resolver->setDefaults([ + 'attrs' => [], + 'style' => 'decimal', + ]); + $resolver->setAllowedTypes('attrs', 'array'); + $resolver->setAllowedTypes('style', 'string'); + }); + } else { + $resolver->define('intl_formatter_options') + ->default(function (OptionsResolver $resolver) { + $resolver + ->setDefaults([ + 'attrs' => [], + 'style' => 'decimal', + ]) + ->setAllowedTypes('attrs', 'array') + ->setAllowedTypes('style', 'string') + ; + }) + ; + } } } diff --git a/src/Column/Type/NumberColumnType.php b/src/Column/Type/NumberColumnType.php index 55fbcea6..5af5faf2 100755 --- a/src/Column/Type/NumberColumnType.php +++ b/src/Column/Type/NumberColumnType.php @@ -31,17 +31,28 @@ public function configureOptions(OptionsResolver $resolver): void ->allowedTypes('bool') ; - $resolver->define('intl_formatter_options') - ->default(function (OptionsResolver $resolver) { - $resolver - ->setDefaults([ - 'attrs' => [], - 'style' => 'decimal', - ]) - ->setAllowedTypes('attrs', 'array') - ->setAllowedTypes('style', 'string') - ; - }) - ; + if (method_exists($resolver, 'setOptions')) { + $resolver->setOptions('intl_formatter_options', function (OptionsResolver $resolver): void { + $resolver->setDefaults([ + 'attrs' => [], + 'style' => 'decimal', + ]); + $resolver->setAllowedTypes('attrs', 'array'); + $resolver->setAllowedTypes('style', 'string'); + }); + } else { + $resolver->define('intl_formatter_options') + ->default(function (OptionsResolver $resolver) { + $resolver + ->setDefaults([ + 'attrs' => [], + 'style' => 'decimal', + ]) + ->setAllowedTypes('attrs', 'array') + ->setAllowedTypes('style', 'string') + ; + }) + ; + } } } From a576334060a87b8d75d42644312af7c9932b677a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Maci=C4=85g?= Date: Mon, 13 Apr 2026 20:37:31 +0200 Subject: [PATCH 2/3] Fix Twig 4 deprecations --- src/Resources/views/themes/bootstrap_5.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Resources/views/themes/bootstrap_5.html.twig b/src/Resources/views/themes/bootstrap_5.html.twig index 4734bf7b..0edded17 100755 --- a/src/Resources/views/themes/bootstrap_5.html.twig +++ b/src/Resources/views/themes/bootstrap_5.html.twig @@ -887,7 +887,7 @@ 'outline-dark': 'btn-outline-dark', }|merge(variants ?? {})|filter(e => e is not same as false) -%} - {% set base_classes = base_classes ?? 'btn d-inline-flex align-items-center gap-2' ~ (with_caret ? ' dropdown-toggle') %} + {% set base_classes = (base_classes ?? 'btn d-inline-flex align-items-center gap-2') ~ (with_caret ? ' dropdown-toggle') %} {% set variant_classes = variant_classes ?? variants[variant ?? default_variant ?? 'primary'] %} {% set attr = { From a8f4b6c41dc25112d544464ace088132fb4fd491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Maci=C4=85g?= Date: Mon, 13 Apr 2026 20:56:13 +0200 Subject: [PATCH 3/3] Add comments --- src/Column/Type/MoneyColumnType.php | 2 +- src/Column/Type/NumberColumnType.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Column/Type/MoneyColumnType.php b/src/Column/Type/MoneyColumnType.php index c53a1787..26f3d6a1 100755 --- a/src/Column/Type/MoneyColumnType.php +++ b/src/Column/Type/MoneyColumnType.php @@ -62,7 +62,7 @@ public function configureOptions(OptionsResolver $resolver): void $resolver->setAllowedTypes('attrs', 'array'); $resolver->setAllowedTypes('style', 'string'); }); - } else { + } else { // BC layer for Symfony <7.3 $resolver->define('intl_formatter_options') ->default(function (OptionsResolver $resolver) { $resolver diff --git a/src/Column/Type/NumberColumnType.php b/src/Column/Type/NumberColumnType.php index 5af5faf2..a602451c 100755 --- a/src/Column/Type/NumberColumnType.php +++ b/src/Column/Type/NumberColumnType.php @@ -40,7 +40,7 @@ public function configureOptions(OptionsResolver $resolver): void $resolver->setAllowedTypes('attrs', 'array'); $resolver->setAllowedTypes('style', 'string'); }); - } else { + } else { // BC layer for Symfony <7.3 $resolver->define('intl_formatter_options') ->default(function (OptionsResolver $resolver) { $resolver