Support Symfony 7 (#1284)

op-euga · web-flow · commit af62c634ef42 · 2024-06-04T20:13:26.000+02:00
diff --git a/Command/BaseBootstrapSymlinkCommand.php b/Command/BaseBootstrapSymlinkCommand.php
@@ -136,7 +136,7 @@ public static function createMirror($symlinkTarget, $symlinkName)
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDescription('Check and if possible install symlink to '.static::$targetSuffix)
diff --git a/Command/BootstrapSymlinkLessCommand.php b/Command/BootstrapSymlinkLessCommand.php
@@ -29,7 +29,7 @@ protected function getTwitterBootstrapName()
         return self::$twitterBootstrapName;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
diff --git a/Command/BootstrapSymlinkSassCommand.php b/Command/BootstrapSymlinkSassCommand.php
@@ -30,7 +30,7 @@ protected function getTwitterBootstrapName()
         return static::$twitterBootstrapName;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         parent::configure();
 
diff --git a/Command/InstallFontCommand.php b/Command/InstallFontCommand.php
@@ -57,7 +57,7 @@ public function __construct(KernelInterface $kernel, $iconSet)
     /**
      * {@inheritdoc}
      */
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDescription('Install font to web/fonts')
diff --git a/DependencyInjection/Compiler/FormPass.php b/DependencyInjection/Compiler/FormPass.php
@@ -24,7 +24,7 @@ class FormPass implements CompilerPassInterface
     /**
      * {@inheritdoc}
      */
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if ($container->hasParameter('mopa_bootstrap.form.templating') && false !== ($template = $container->getParameter('mopa_bootstrap.form.templating'))) {
             $resources = $container->getParameter('twig.form.resources');
diff --git a/DependencyInjection/MopaBootstrapExtension.php b/DependencyInjection/MopaBootstrapExtension.php
@@ -21,7 +21,7 @@ class MopaBootstrapExtension extends Extension
     /**
      * {@inheritdoc}
      */
-    public function load(array $configs, ContainerBuilder $container)
+    public function load(array $configs, ContainerBuilder $container): void
     {
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
@@ -105,7 +105,7 @@ public function load(array $configs, ContainerBuilder $container)
      *
      * @param string $prefix
      */
-    private function remapParameters(ContainerBuilder $container, $prefix, array $config)
+    private function remapParameters(ContainerBuilder $container, $prefix, array $config): void
     {
         foreach ($config as $key => $value) {
             $container->setParameter(\sprintf('%s.%s', $prefix, $key), $value);
diff --git a/Form/Extension/DateTypeExtension.php b/Form/Extension/DateTypeExtension.php
@@ -40,7 +40,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function finishView(FormView $view, FormInterface $form, array $options)
+    public function finishView(FormView $view, FormInterface $form, array $options): void
     {
         if ('single_text' === $options['widget']) {
             if (isset($options['datepicker'])) {
@@ -57,7 +57,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefined([
             'datepicker',
diff --git a/Form/Extension/DatetimeTypeExtension.php b/Form/Extension/DatetimeTypeExtension.php
@@ -27,7 +27,7 @@ class DatetimeTypeExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function finishView(FormView $view, FormInterface $form, array $options)
+    public function finishView(FormView $view, FormInterface $form, array $options): void
     {
         if ('single_text' === $options['widget']) {
             if (isset($options['datetimepicker'])) {
@@ -42,7 +42,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefined([
             'datetimepicker',
diff --git a/Form/Extension/EmbedFormExtension.php b/Form/Extension/EmbedFormExtension.php
@@ -27,7 +27,7 @@ class EmbedFormExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'embed_form' => null,
@@ -37,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['embed_form'] = $options['embed_form'];
     }
diff --git a/Form/Extension/ErrorTypeFormTypeExtension.php b/Form/Extension/ErrorTypeFormTypeExtension.php
@@ -40,7 +40,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['error_type'] = $options['error_type'];
         $view->vars['error_delay'] = $options['error_delay'];
@@ -49,7 +49,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'error_type' => $this->errorType,
diff --git a/Form/Extension/HelpFormTypeExtension.php b/Form/Extension/HelpFormTypeExtension.php
@@ -41,7 +41,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['help_block'] = $options['help_block'];
         $view->vars['help_label'] = $options['help_label'];
@@ -163,7 +163,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'help_block' => null,
diff --git a/Form/Extension/IconButtonExtension.php b/Form/Extension/IconButtonExtension.php
@@ -27,7 +27,7 @@ class IconButtonExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'icon' => null,
@@ -38,7 +38,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['icon'] = $options['icon'];
         $view->vars['icon_inverted'] = $options['icon_inverted'];
diff --git a/Form/Extension/LayoutFormTypeExtension.php b/Form/Extension/LayoutFormTypeExtension.php
@@ -41,7 +41,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $layout = $options['layout'];
 
@@ -63,7 +63,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         ]);
     }
 
-    public function finishView(FormView $view, FormInterface $form, array $options)
+    public function finishView(FormView $view, FormInterface $form, array $options): void
     {
         if (!$view->parent && $options['compound'] && $view->vars['layout']) {
             $class = isset($view->vars['attr']['class']) ? $view->vars['attr']['class'].' ' : '';
@@ -74,7 +74,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'layout' => function (Options $options) {
diff --git a/Form/Extension/LegendFormTypeExtension.php b/Form/Extension/LegendFormTypeExtension.php
@@ -47,7 +47,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['render_fieldset'] = $options['render_fieldset'];
         $view->vars['show_legend'] = $options['show_legend'];
@@ -61,7 +61,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'render_fieldset' => $this->renderFieldset,
diff --git a/Form/Extension/OffsetButtonExtension.php b/Form/Extension/OffsetButtonExtension.php
@@ -27,7 +27,7 @@ class OffsetButtonExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'button_offset' => null,
@@ -37,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['button_offset'] = $options['button_offset'];
     }
diff --git a/Form/Extension/StaticTextExtension.php b/Form/Extension/StaticTextExtension.php
@@ -27,7 +27,7 @@ class StaticTextExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'static_text' => null,
@@ -37,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['static_text'] = $options['static_text'];
         if ($options['static_text'] === true) {
diff --git a/Form/Extension/TabbedFormTypeExtension.php b/Form/Extension/TabbedFormTypeExtension.php
@@ -46,7 +46,7 @@ public function __construct(FormFactoryInterface $formFactory, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'tabs_class' => $this->options['class'],
@@ -56,15 +56,15 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['tabbed'] = false;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function finishView(FormView $view, FormInterface $form, array $options)
+    public function finishView(FormView $view, FormInterface $form, array $options): void
     {
         if (!$view->vars['tabbed']) {
             return;
diff --git a/Form/Extension/TimeTypeExtension.php b/Form/Extension/TimeTypeExtension.php
@@ -27,7 +27,7 @@ class TimeTypeExtension extends AbstractTypeExtension
     /**
      * {@inheritdoc}
      */
-    public function finishView(FormView $view, FormInterface $form, array $options)
+    public function finishView(FormView $view, FormInterface $form, array $options): void
     {
         if ('single_text' === $options['widget']) {
             if (isset($options['timepicker'])) {
@@ -42,7 +42,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefined([
             'timepicker',
diff --git a/Form/Extension/WidgetCollectionFormTypeExtension.php b/Form/Extension/WidgetCollectionFormTypeExtension.php
@@ -41,7 +41,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         if (\in_array('collection', $view->vars['block_prefixes'], true)) {
             if ($options['widget_add_btn'] !== null && !\is_array($options['widget_add_btn'])) {
@@ -78,7 +78,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'omit_collection_item' => true === $this->options['render_collection_item'] ? false : true,
diff --git a/Form/Extension/WidgetFormTypeExtension.php b/Form/Extension/WidgetFormTypeExtension.php
@@ -40,7 +40,7 @@ public function __construct(array $options)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         if (\in_array('percent', $view->vars['block_prefixes'], true) && null === $options['widget_addon_append']) {
             $options['widget_addon_append'] = [];
@@ -67,7 +67,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'widget_form_control_class' => 'form-control',
diff --git a/Form/Type/FormActionsType.php b/Form/Type/FormActionsType.php
@@ -28,7 +28,7 @@ class FormActionsType extends AbstractType
     /**
      * {@inheritdoc}
      */
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         foreach ($options['buttons'] as $name => $config) {
             $this->createButton($builder, $name, $config);
@@ -46,7 +46,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      *
      * @throws \InvalidArgumentException
      */
-    protected function createButton($builder, $name, $config)
+    protected function createButton($builder, $name, $config): ButtonBuilder|FormBuilderInterface
     {
         $options = (isset($config['options'])) ? $config['options'] : [];
 
@@ -58,7 +58,7 @@ protected function createButton($builder, $name, $config)
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'buttons' => [],
@@ -71,15 +71,15 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['button_offset'] = $options['button_offset'];
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'form_actions';
     }
diff --git a/Form/Type/TabType.php b/Form/Type/TabType.php
@@ -26,7 +26,7 @@ class TabType extends AbstractType
     /**
      * {@inheritdoc}
      */
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'icon' => null,
@@ -38,7 +38,7 @@ public function configureOptions(OptionsResolver $resolver)
     /**
      * {@inheritdoc}
      */
-    public function buildView(FormView $view, FormInterface $form, array $options)
+    public function buildView(FormView $view, FormInterface $form, array $options): void
     {
         $view->vars['valid'] = $valid = !$form->isSubmitted() || $form->isValid();
         $view->vars['icon'] = $valid ? $options['icon'] : $options['error_icon'];
diff --git a/Form/Type/TabsType.php b/Form/Type/TabsType.php
diff --git a/MopaBootstrapBundle.php b/MopaBootstrapBundle.php
diff --git a/composer.json b/composer.json

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public static function createMirror($symlinkTarget, $symlinkName)`
`136`	`136`	`/**`
`137`	`137`	`* {@inheritdoc}`
`138`	`138`	`*/`
`139`		`- protected function configure()`
	`139`	`+ protected function configure(): void`
`140`	`140`	`{`
`141`	`141`	`$this`
`142`	`142`	`->setDescription('Check and if possible install symlink to '.static::$targetSuffix)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected function getTwitterBootstrapName()`
`29`	`29`	`return self::$twitterBootstrapName;`
`30`	`30`	`}`
`31`	`31`
`32`		`- protected function configure()`
	`32`	`+ protected function configure(): void`
`33`	`33`	`{`
`34`	`34`	`parent::configure();`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ protected function getTwitterBootstrapName()`
`30`	`30`	`return static::$twitterBootstrapName;`
`31`	`31`	`}`
`32`	`32`
`33`		`- protected function configure()`
	`33`	`+ protected function configure(): void`
`34`	`34`	`{`
`35`	`35`	`parent::configure();`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function __construct(KernelInterface $kernel, $iconSet)`
`57`	`57`	`/**`
`58`	`58`	`* {@inheritdoc}`
`59`	`59`	`*/`
`60`		`- protected function configure()`
	`60`	`+ protected function configure(): void`
`61`	`61`	`{`
`62`	`62`	`$this`
`63`	`63`	`->setDescription('Install font to web/fonts')`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class FormPass implements CompilerPassInterface`
`24`	`24`	`/**`
`25`	`25`	`* {@inheritdoc}`
`26`	`26`	`*/`
`27`		`- public function process(ContainerBuilder $container)`
	`27`	`+ public function process(ContainerBuilder $container): void`
`28`	`28`	`{`
`29`	`29`	`if ($container->hasParameter('mopa_bootstrap.form.templating') && false !== ($template = $container->getParameter('mopa_bootstrap.form.templating'))) {`
`30`	`30`	`$resources = $container->getParameter('twig.form.resources');`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class MopaBootstrapExtension extends Extension`
`21`	`21`	`/**`
`22`	`22`	`* {@inheritdoc}`
`23`	`23`	`*/`
`24`		`- public function load(array $configs, ContainerBuilder $container)`
	`24`	`+ public function load(array $configs, ContainerBuilder $container): void`
`25`	`25`	`{`
`26`	`26`	`$configuration = new Configuration();`
`27`	`27`	`$config = $this->processConfiguration($configuration, $configs);`
`@@ -105,7 +105,7 @@ public function load(array $configs, ContainerBuilder $container)`
`105`	`105`	`*`
`106`	`106`	`* @param string $prefix`
`107`	`107`	`*/`
`108`		`- private function remapParameters(ContainerBuilder $container, $prefix, array $config)`
	`108`	`+ private function remapParameters(ContainerBuilder $container, $prefix, array $config): void`
`109`	`109`	`{`
`110`	`110`	`foreach ($config as $key => $value) {`
`111`	`111`	`$container->setParameter(\sprintf('%s.%s', $prefix, $key), $value);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ class EmbedFormExtension extends AbstractTypeExtension`
`27`	`27`	`/**`
`28`	`28`	`* {@inheritdoc}`
`29`	`29`	`*/`
`30`		`- public function configureOptions(OptionsResolver $resolver)`
	`30`	`+ public function configureOptions(OptionsResolver $resolver): void`
`31`	`31`	`{`
`32`	`32`	`$resolver->setDefaults([`
`33`	`33`	`'embed_form' => null,`
`@@ -37,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver)`
`37`	`37`	`/**`
`38`	`38`	`* {@inheritdoc}`
`39`	`39`	`*/`
`40`		`- public function buildView(FormView $view, FormInterface $form, array $options)`
	`40`	`+ public function buildView(FormView $view, FormInterface $form, array $options): void`
`41`	`41`	`{`
`42`	`42`	`$view->vars['embed_form'] = $options['embed_form'];`
`43`	`43`	`}`