Skip to content

Commit af62c63

Browse files
authored
Support Symfony 7 (#1284)
1 parent 1b92029 commit af62c63

25 files changed

+53
-53
lines changed

Command/BaseBootstrapSymlinkCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public static function createMirror($symlinkTarget, $symlinkName)
136136
/**
137137
* {@inheritdoc}
138138
*/
139-
protected function configure()
139+
protected function configure(): void
140140
{
141141
$this
142142
->setDescription('Check and if possible install symlink to '.static::$targetSuffix)

Command/BootstrapSymlinkLessCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ protected function getTwitterBootstrapName()
2929
return self::$twitterBootstrapName;
3030
}
3131

32-
protected function configure()
32+
protected function configure(): void
3333
{
3434
parent::configure();
3535

Command/BootstrapSymlinkSassCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function getTwitterBootstrapName()
3030
return static::$twitterBootstrapName;
3131
}
3232

33-
protected function configure()
33+
protected function configure(): void
3434
{
3535
parent::configure();
3636

Command/InstallFontCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function __construct(KernelInterface $kernel, $iconSet)
5757
/**
5858
* {@inheritdoc}
5959
*/
60-
protected function configure()
60+
protected function configure(): void
6161
{
6262
$this
6363
->setDescription('Install font to web/fonts')

DependencyInjection/Compiler/FormPass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class FormPass implements CompilerPassInterface
2424
/**
2525
* {@inheritdoc}
2626
*/
27-
public function process(ContainerBuilder $container)
27+
public function process(ContainerBuilder $container): void
2828
{
2929
if ($container->hasParameter('mopa_bootstrap.form.templating') && false !== ($template = $container->getParameter('mopa_bootstrap.form.templating'))) {
3030
$resources = $container->getParameter('twig.form.resources');

DependencyInjection/MopaBootstrapExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class MopaBootstrapExtension extends Extension
2121
/**
2222
* {@inheritdoc}
2323
*/
24-
public function load(array $configs, ContainerBuilder $container)
24+
public function load(array $configs, ContainerBuilder $container): void
2525
{
2626
$configuration = new Configuration();
2727
$config = $this->processConfiguration($configuration, $configs);
@@ -105,7 +105,7 @@ public function load(array $configs, ContainerBuilder $container)
105105
*
106106
* @param string $prefix
107107
*/
108-
private function remapParameters(ContainerBuilder $container, $prefix, array $config)
108+
private function remapParameters(ContainerBuilder $container, $prefix, array $config): void
109109
{
110110
foreach ($config as $key => $value) {
111111
$container->setParameter(\sprintf('%s.%s', $prefix, $key), $value);

Form/Extension/DateTypeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __construct(array $options)
4040
/**
4141
* {@inheritdoc}
4242
*/
43-
public function finishView(FormView $view, FormInterface $form, array $options)
43+
public function finishView(FormView $view, FormInterface $form, array $options): void
4444
{
4545
if ('single_text' === $options['widget']) {
4646
if (isset($options['datepicker'])) {
@@ -57,7 +57,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
5757
/**
5858
* {@inheritdoc}
5959
*/
60-
public function configureOptions(OptionsResolver $resolver)
60+
public function configureOptions(OptionsResolver $resolver): void
6161
{
6262
$resolver->setDefined([
6363
'datepicker',

Form/Extension/DatetimeTypeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class DatetimeTypeExtension extends AbstractTypeExtension
2727
/**
2828
* {@inheritdoc}
2929
*/
30-
public function finishView(FormView $view, FormInterface $form, array $options)
30+
public function finishView(FormView $view, FormInterface $form, array $options): void
3131
{
3232
if ('single_text' === $options['widget']) {
3333
if (isset($options['datetimepicker'])) {
@@ -42,7 +42,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
4242
/**
4343
* {@inheritdoc}
4444
*/
45-
public function configureOptions(OptionsResolver $resolver)
45+
public function configureOptions(OptionsResolver $resolver): void
4646
{
4747
$resolver->setDefined([
4848
'datetimepicker',

Form/Extension/EmbedFormExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class EmbedFormExtension extends AbstractTypeExtension
2727
/**
2828
* {@inheritdoc}
2929
*/
30-
public function configureOptions(OptionsResolver $resolver)
30+
public function configureOptions(OptionsResolver $resolver): void
3131
{
3232
$resolver->setDefaults([
3333
'embed_form' => null,
@@ -37,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver)
3737
/**
3838
* {@inheritdoc}
3939
*/
40-
public function buildView(FormView $view, FormInterface $form, array $options)
40+
public function buildView(FormView $view, FormInterface $form, array $options): void
4141
{
4242
$view->vars['embed_form'] = $options['embed_form'];
4343
}

Form/Extension/ErrorTypeFormTypeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __construct(array $options)
4040
/**
4141
* {@inheritdoc}
4242
*/
43-
public function buildView(FormView $view, FormInterface $form, array $options)
43+
public function buildView(FormView $view, FormInterface $form, array $options): void
4444
{
4545
$view->vars['error_type'] = $options['error_type'];
4646
$view->vars['error_delay'] = $options['error_delay'];
@@ -49,7 +49,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
4949
/**
5050
* {@inheritdoc}
5151
*/
52-
public function configureOptions(OptionsResolver $resolver)
52+
public function configureOptions(OptionsResolver $resolver): void
5353
{
5454
$resolver->setDefaults([
5555
'error_type' => $this->errorType,

Form/Extension/HelpFormTypeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct(array $options)
4141
/**
4242
* {@inheritdoc}
4343
*/
44-
public function buildView(FormView $view, FormInterface $form, array $options)
44+
public function buildView(FormView $view, FormInterface $form, array $options): void
4545
{
4646
$view->vars['help_block'] = $options['help_block'];
4747
$view->vars['help_label'] = $options['help_label'];
@@ -163,7 +163,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
163163
/**
164164
* {@inheritdoc}
165165
*/
166-
public function configureOptions(OptionsResolver $resolver)
166+
public function configureOptions(OptionsResolver $resolver): void
167167
{
168168
$resolver->setDefaults([
169169
'help_block' => null,

Form/Extension/IconButtonExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class IconButtonExtension extends AbstractTypeExtension
2727
/**
2828
* {@inheritdoc}
2929
*/
30-
public function configureOptions(OptionsResolver $resolver)
30+
public function configureOptions(OptionsResolver $resolver): void
3131
{
3232
$resolver->setDefaults([
3333
'icon' => null,
@@ -38,7 +38,7 @@ public function configureOptions(OptionsResolver $resolver)
3838
/**
3939
* {@inheritdoc}
4040
*/
41-
public function buildView(FormView $view, FormInterface $form, array $options)
41+
public function buildView(FormView $view, FormInterface $form, array $options): void
4242
{
4343
$view->vars['icon'] = $options['icon'];
4444
$view->vars['icon_inverted'] = $options['icon_inverted'];

Form/Extension/LayoutFormTypeExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct(array $options)
4141
/**
4242
* {@inheritdoc}
4343
*/
44-
public function buildView(FormView $view, FormInterface $form, array $options)
44+
public function buildView(FormView $view, FormInterface $form, array $options): void
4545
{
4646
$layout = $options['layout'];
4747

@@ -63,7 +63,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
6363
]);
6464
}
6565

66-
public function finishView(FormView $view, FormInterface $form, array $options)
66+
public function finishView(FormView $view, FormInterface $form, array $options): void
6767
{
6868
if (!$view->parent && $options['compound'] && $view->vars['layout']) {
6969
$class = isset($view->vars['attr']['class']) ? $view->vars['attr']['class'].' ' : '';
@@ -74,7 +74,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
7474
/**
7575
* {@inheritdoc}
7676
*/
77-
public function configureOptions(OptionsResolver $resolver)
77+
public function configureOptions(OptionsResolver $resolver): void
7878
{
7979
$resolver->setDefaults([
8080
'layout' => function (Options $options) {

Form/Extension/LegendFormTypeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function __construct(array $options)
4747
/**
4848
* {@inheritdoc}
4949
*/
50-
public function buildView(FormView $view, FormInterface $form, array $options)
50+
public function buildView(FormView $view, FormInterface $form, array $options): void
5151
{
5252
$view->vars['render_fieldset'] = $options['render_fieldset'];
5353
$view->vars['show_legend'] = $options['show_legend'];
@@ -61,7 +61,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
6161
/**
6262
* {@inheritdoc}
6363
*/
64-
public function configureOptions(OptionsResolver $resolver)
64+
public function configureOptions(OptionsResolver $resolver): void
6565
{
6666
$resolver->setDefaults([
6767
'render_fieldset' => $this->renderFieldset,

Form/Extension/OffsetButtonExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class OffsetButtonExtension extends AbstractTypeExtension
2727
/**
2828
* {@inheritdoc}
2929
*/
30-
public function configureOptions(OptionsResolver $resolver)
30+
public function configureOptions(OptionsResolver $resolver): void
3131
{
3232
$resolver->setDefaults([
3333
'button_offset' => null,
@@ -37,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver)
3737
/**
3838
* {@inheritdoc}
3939
*/
40-
public function buildView(FormView $view, FormInterface $form, array $options)
40+
public function buildView(FormView $view, FormInterface $form, array $options): void
4141
{
4242
$view->vars['button_offset'] = $options['button_offset'];
4343
}

Form/Extension/StaticTextExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class StaticTextExtension extends AbstractTypeExtension
2727
/**
2828
* {@inheritdoc}
2929
*/
30-
public function configureOptions(OptionsResolver $resolver)
30+
public function configureOptions(OptionsResolver $resolver): void
3131
{
3232
$resolver->setDefaults([
3333
'static_text' => null,
@@ -37,7 +37,7 @@ public function configureOptions(OptionsResolver $resolver)
3737
/**
3838
* {@inheritdoc}
3939
*/
40-
public function buildView(FormView $view, FormInterface $form, array $options)
40+
public function buildView(FormView $view, FormInterface $form, array $options): void
4141
{
4242
$view->vars['static_text'] = $options['static_text'];
4343
if ($options['static_text'] === true) {

Form/Extension/TabbedFormTypeExtension.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function __construct(FormFactoryInterface $formFactory, array $options)
4646
/**
4747
* {@inheritdoc}
4848
*/
49-
public function configureOptions(OptionsResolver $resolver)
49+
public function configureOptions(OptionsResolver $resolver): void
5050
{
5151
$resolver->setDefaults([
5252
'tabs_class' => $this->options['class'],
@@ -56,15 +56,15 @@ public function configureOptions(OptionsResolver $resolver)
5656
/**
5757
* {@inheritdoc}
5858
*/
59-
public function buildView(FormView $view, FormInterface $form, array $options)
59+
public function buildView(FormView $view, FormInterface $form, array $options): void
6060
{
6161
$view->vars['tabbed'] = false;
6262
}
6363

6464
/**
6565
* {@inheritdoc}
6666
*/
67-
public function finishView(FormView $view, FormInterface $form, array $options)
67+
public function finishView(FormView $view, FormInterface $form, array $options): void
6868
{
6969
if (!$view->vars['tabbed']) {
7070
return;

Form/Extension/TimeTypeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class TimeTypeExtension extends AbstractTypeExtension
2727
/**
2828
* {@inheritdoc}
2929
*/
30-
public function finishView(FormView $view, FormInterface $form, array $options)
30+
public function finishView(FormView $view, FormInterface $form, array $options): void
3131
{
3232
if ('single_text' === $options['widget']) {
3333
if (isset($options['timepicker'])) {
@@ -42,7 +42,7 @@ public function finishView(FormView $view, FormInterface $form, array $options)
4242
/**
4343
* {@inheritdoc}
4444
*/
45-
public function configureOptions(OptionsResolver $resolver)
45+
public function configureOptions(OptionsResolver $resolver): void
4646
{
4747
$resolver->setDefined([
4848
'timepicker',

Form/Extension/WidgetCollectionFormTypeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function __construct(array $options)
4141
/**
4242
* {@inheritdoc}
4343
*/
44-
public function buildView(FormView $view, FormInterface $form, array $options)
44+
public function buildView(FormView $view, FormInterface $form, array $options): void
4545
{
4646
if (\in_array('collection', $view->vars['block_prefixes'], true)) {
4747
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)
7878
/**
7979
* {@inheritdoc}
8080
*/
81-
public function configureOptions(OptionsResolver $resolver)
81+
public function configureOptions(OptionsResolver $resolver): void
8282
{
8383
$resolver->setDefaults([
8484
'omit_collection_item' => true === $this->options['render_collection_item'] ? false : true,

Form/Extension/WidgetFormTypeExtension.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function __construct(array $options)
4040
/**
4141
* {@inheritdoc}
4242
*/
43-
public function buildView(FormView $view, FormInterface $form, array $options)
43+
public function buildView(FormView $view, FormInterface $form, array $options): void
4444
{
4545
if (\in_array('percent', $view->vars['block_prefixes'], true) && null === $options['widget_addon_append']) {
4646
$options['widget_addon_append'] = [];
@@ -67,7 +67,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
6767
/**
6868
* {@inheritdoc}
6969
*/
70-
public function configureOptions(OptionsResolver $resolver)
70+
public function configureOptions(OptionsResolver $resolver): void
7171
{
7272
$resolver->setDefaults([
7373
'widget_form_control_class' => 'form-control',

Form/Type/FormActionsType.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class FormActionsType extends AbstractType
2828
/**
2929
* {@inheritdoc}
3030
*/
31-
public function buildForm(FormBuilderInterface $builder, array $options)
31+
public function buildForm(FormBuilderInterface $builder, array $options): void
3232
{
3333
foreach ($options['buttons'] as $name => $config) {
3434
$this->createButton($builder, $name, $config);
@@ -46,7 +46,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
4646
*
4747
* @throws \InvalidArgumentException
4848
*/
49-
protected function createButton($builder, $name, $config)
49+
protected function createButton($builder, $name, $config): ButtonBuilder|FormBuilderInterface
5050
{
5151
$options = (isset($config['options'])) ? $config['options'] : [];
5252

@@ -58,7 +58,7 @@ protected function createButton($builder, $name, $config)
5858
/**
5959
* {@inheritdoc}
6060
*/
61-
public function configureOptions(OptionsResolver $resolver)
61+
public function configureOptions(OptionsResolver $resolver): void
6262
{
6363
$resolver->setDefaults([
6464
'buttons' => [],
@@ -71,15 +71,15 @@ public function configureOptions(OptionsResolver $resolver)
7171
/**
7272
* {@inheritdoc}
7373
*/
74-
public function buildView(FormView $view, FormInterface $form, array $options)
74+
public function buildView(FormView $view, FormInterface $form, array $options): void
7575
{
7676
$view->vars['button_offset'] = $options['button_offset'];
7777
}
7878

7979
/**
8080
* {@inheritdoc}
8181
*/
82-
public function getBlockPrefix()
82+
public function getBlockPrefix(): string
8383
{
8484
return 'form_actions';
8585
}

Form/Type/TabType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class TabType extends AbstractType
2626
/**
2727
* {@inheritdoc}
2828
*/
29-
public function configureOptions(OptionsResolver $resolver)
29+
public function configureOptions(OptionsResolver $resolver): void
3030
{
3131
$resolver->setDefaults([
3232
'icon' => null,
@@ -38,7 +38,7 @@ public function configureOptions(OptionsResolver $resolver)
3838
/**
3939
* {@inheritdoc}
4040
*/
41-
public function buildView(FormView $view, FormInterface $form, array $options)
41+
public function buildView(FormView $view, FormInterface $form, array $options): void
4242
{
4343
$view->vars['valid'] = $valid = !$form->isSubmitted() || $form->isValid();
4444
$view->vars['icon'] = $valid ? $options['icon'] : $options['error_icon'];

0 commit comments

Comments
 (0)