8000 Fix CS · symfony/symfony@5f2be64 · GitHub
[go: up one dir, main page]

Skip to content

Commit 5f2be64

Browse files
committed
Fix CS
1 parent a5b28c5 commit 5f2be64

39 files changed

+99
-144
lines changed

src/Symfony/Component/Console/Helper/TableCellStyle.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ public function __construct(array $options = [])
5353
$thi F438 s->options = array_merge($this->options, $options);
5454
}
5555

56-
/**
57-
* @return array
58-
*/
5956
public function getOptions(): array
6057
{
6158
return $this->options;

src/Symfony/Component/Console/Tests/SignalRegistry/SignalRegistryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
*/
2020
class SignalRegistryTest extends TestCase
2121
{
22-
public function tearDown(): void
22+
protected function tearDown(): void
2323
{
2424
pcntl_async_signals(false);
2525
pcntl_signal(SIGUSR1, SIG_DFL);

src/Symfony/Component/Form/Extension/Core/Type/EmailType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ class EmailType extends AbstractType
2222
*/
2323
public function configureOptions(OptionsResolver $resolver)
2424
{
25-
$resolver->setDefaults(array(
25+
$resolver->setDefaults([
2626
'invalid_message' => function (Options $options, $previousValue) {
2727
return ($options['legacy_error_messages'] ?? true)
2828
? $previousValue
2929
: 'Please enter a valid email address.';
3030
},
31-
));
31+
]);
3232
}
3333

3434
/**

src/Symfony/Component/Form/Extension/Core/Type/RadioType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ class RadioType extends AbstractType
2222
*/
2323
public function configureOptions(OptionsResolver $resolver)
2424
{
25-
$resolver->setDefaults(array(
25+
$resolver->setDefaults([
2626
'invalid_message' => function (Options $options, $previousValue) {
2727
return ($options['legacy_error_messages'] ?? true)
2828
? $previousValue
2929
: 'Please select a valid option.';
3030
},
31-
));
31+
]);
3232
}
3333

3434
/**

src/Symfony/Component/Form/Extension/Core/Type/RangeType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ class RangeType extends AbstractType
2222
*/
2323
public function configureOptions(OptionsResolver $resolver)
2424
{
25-
$resolver->setDefaults(array(
25+
$resolver->setDefaults([
2626
'invalid_message' => function (Options $options, $previousValue) {
2727
return ($options['legacy_error_messages'] ?? true)
2828
? $previousValue
2929
: 'Please choose a valid range.';
3030
},
31-
));
31+
]);
3232
}
3333

3434
/**

src/Symfony/Component/Form/Extension/Core/Type/SearchType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ class SearchType extends AbstractType
2222
*/
2323
public function configureOptions(OptionsResolver $resolver)
2424
{
25-
$resolver->setDefaults(array(
25+
$resolver->setDefaults([
2626
'invalid_message' => function (Options $options, $previousValue) {
2727
return ($options['legacy_error_messages'] ?? true)
2828
? $previousValue
2929
: 'Please enter a valid search term.';
3030
},
31-
));
31+
]);
3232
}
3333

3434
/**

src/Symfony/Component/Form/Extension/Core/Type/TelType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ class TelType extends AbstractType
2222
*/
2323
public function configureOptions(OptionsResolver $resolver)
2424
{
25-
$resolver->setDefaults(array(
25+
$resolver->setDefaults([
2626
'invalid_message' => function (Options $options, $previousValue) {
2727
return ($options['legacy_error_messages'] ?? true)
2828
? $previousValue
2929
: 'Please provide a valid phone number.';
3030
},
31-
));
31+
]);
3232
}
3333

3434
/**

src/Symfony/Component/Form/Extension/Validator/Type/FormTypeValidatorExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function configureOptions(OptionsResolver $resolver)
6666
]);
6767
$resolver->setAllowedTypes('legacy_error_messages', 'bool');
6868
$resolver->setDeprecated('legacy_error_messages', 'symfony/form', '5.2', function (Options $options, $value) {
69-
if ($value === true) {
69+
if (true === $value) {
7070
return 'Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.';
7171
}
7272

src/Symfony/Component/Form/Tests/Extension/Validator/Type/BirthdayTypeValidatorExtensionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class BirthdayTypeValidatorExtensionTest extends BaseValidatorExtensionTest
2020
use ExpectDeprecationTrait;
2121
use ValidatorExtensionTrait;
2222

23-
protected function createForm(array $options = array())
23+
protected function createForm(array $options = [])
2424
{
2525
return $this->factory->create(BirthdayType::class, null, $options);
2626
}
@@ -39,9 +39,9 @@ public function testLegacyInvalidMessage()
3939
{
4040
$this->expectDeprecation('Since symfony/form 5.2: Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.');
4141

42-
$form = $this->createForm(array(
42+
$form = $this->createForm([
4343
'legacy_error_messages' => true,
44-
));
44+
]);
4545

4646
$this->assertSame('This value is not valid.', $form->getConfig()->getOption('invalid_message'));
4747
}

src/Symfony/Component/Form/Tests/Extension/Validator/Type/CheckboxTypeValidatorExtensionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class CheckboxTypeValidatorExtensionTest extends BaseValidatorExtensionTest
2020
use ExpectDeprecationTrait;
2121
use ValidatorExtensionTrait;
2222

23-
protected function createForm(array $options = array())
23+
protected function createForm(array $options = [])
2424
{
2525
return $this->factory->create(CheckboxType::class, null, $options);
2626
}
@@ -39,9 +39,9 @@ public function testLegacyInvalidMessage()
3939
{
4040
$this->expectDeprecation('Since symfony/form 5.2: Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.');
4141

42-
$form = $this->createForm(array(
42+
$form = $this->createForm([
4343
'legacy_error_messages' => true,
44-
));
44+
]);
4545

4646
$this->assertSame('This value is not valid.', $form->getConfig()->getOption('invalid_message'));
4747
}

src/Symfony/Component/Form/Tests/Extension/Validator/Type/ChoiceTypeValidatorExtensionTest.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
1313

1414
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
15-
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
1615
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
1716
use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
1817

@@ -21,7 +20,7 @@ class ChoiceTypeValidatorExtensionTest extends BaseValidatorExtensionTest
2120
use ExpectDeprecationTrait;
2221
use ValidatorExtensionTrait;
2322

24-
protected function createForm(array $options = array())
23+
protected function createForm(array $options = [])
2524
{
2625
return $this->factory->create(ChoiceType::class, null, $options);
2726
}
@@ -40,9 +39,9 @@ public function testLegacyInvalidMessage()
4039
{
4140
$this->expectDeprecation('Since symfony/form 5.2: Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.');
4241

43-
$form = $this->createForm(array(
42+
$form = $this->createForm([
4443
'legacy_error_messages' => true,
45-
));
44+
]);
4645

4746
$this->assertSame('This value is not valid.', $form->getConfig()->getOption('invalid_message'));
4847
}

src/Symfony/Component/Form/Tests/Extension/Validator/Type/CollectionTypeValidatorExtensionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class CollectionTypeValidatorExtensionTest extends BaseValidatorExtensionTest
2020
use ExpectDeprecationTrait;
2121
use ValidatorExtensionTrait;
2222

23-
protected function createForm(array $options = array())
23+
protected function createForm(array $options = [])
2424
{
2525
return $this->factory->create(CollectionType::class, null, $options);
2626
}
@@ -39,9 +39,9 @@ public function testLegacyInvalidMessage()
3939
{
4040
$this->expectDeprecation('Since symfony/form 5.2: Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.');
4141

42-
$form = $this->createForm(array(
42+
$form = $this->createForm([
4343
'legacy_error_messages' => true,
44-
));
44+
]);
4545

4646
$this->assertSame('This value is not valid.', $form->getConfig()->getOption('invalid_message'));
4747
}

src/Symfony/Component/Form/Tests/Extension/Validator/Type/ColorTypeValidatorExtensionTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
1313

1414
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
15-
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
16-
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
1715
use Symfony\Component\Form\Extension\Core\Type\ColorType;
1816
use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
1917

@@ -22,7 +20,7 @@ class ColorTypeValidatorExtensionTest extends BaseValidatorExtensionTest
2220
use ExpectDeprecationTrait;
2321
use ValidatorExtensionTrait;
2422

25-
protected function createForm(array $options = array())
23+
protected function createForm(array $options = [])
2624
{
2725
return $this->factory->create(ColorType::class, null, $options);
2826
}
@@ -41,9 +39,9 @@ public function testLegacyInvalidMessage()
4139
{
4240
$this->expectDeprecation('Since symfony/form 5.2: Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.');
4341

44-
$form = $this->createForm(array(
42+
$form = $this->createForm([
4543
'legacy_error_messages' => true,
46-
));
44+
]);
4745

4846
$this->assertSame('This value is not valid.', $form->getConfig()->getOption('invalid_message'));
4947
}

src/Symfony/Component/Form/Tests/Extension/Validator/Type/CountryTypeValidatorExtensionTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class CountryTypeValidatorExtensionTest extends BaseValidatorExtensionTest
2020
use ExpectDeprecationTrait;
2121
use ValidatorExtensionTrait;
2222

23-
protected function createForm(array $options = array())
23+
protected function createForm(array $options = [])
2424
{
2525
return $this->factory->create(CountryType::class, null, $options);
2626
}
@@ -39,9 +39,9 @@ public function testLegacyInvalidMessage()
3939
{
4040
$this->expectDeprecation('Since symfony/form 5.2: Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.');
4141

42-
$form = $this->createForm(array(
42+
$form = $this->createForm([
4343
'legacy_error_messages' => true,
44-
));
44+
]);
4545

4646
$this->assertSame('This value is not valid.', $form->getConfig()->getOption('invalid_message'));
4747
}

src/Symfony/Component/Form/Tests/Extension/Validator/Type/CurrencyTypeValidatorExtensionTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
1313

1414
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
15-
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
16-
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
1715
use Symfony\Component\Form\Extension\Core\Type\CurrencyType;
1816
use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
1917

@@ -22,7 +20,7 @@ class CurrencyTypeValidatorExtensionTest extends BaseValidatorExtensionTest
2220
use ExpectDeprecationTrait;
2321
use ValidatorExtensionTrait;
2422

25-
protected function createForm(array $options = array())
23+
protected function createForm(array $options = [])
2624
{
2725
return $this->factory->create(CurrencyType::class, null, $options);
2826
}
@@ -41,9 +39,9 @@ public function testLegacyInvalidMessage()
4139
{
4240
$this->expectDeprecation('Since symfony/form 5.2: Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.');
4341

44-
$form = $this->createForm(array(
42+
$form = $this->createForm([
4543
'legacy_error_messages' => true,
46-
));
44+
]);
4745

4846
$this->assertSame('This value is not valid.', $form->getConfig()->getOption('invalid_message'));
4947
}

src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateIntervalTypeValidatorExtensionTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
1313

1414
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
15-
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
16-
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
1715
use Symfony\Component\Form\Extension\Core\Type\DateIntervalType;
1816
use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
1917

@@ -22,7 +20,7 @@ class DateIntervalTypeValidatorExtensionTest extends BaseValidatorExtensionTest
2220
use ExpectDeprecationTrait;
2321
use ValidatorExtensionTrait;
2422

25-
protected function createForm(array $options = array())
23+
protected function createForm(array $options = [])
2624
{
2725
return $this->factory->create(DateIntervalType::class, null, $options);
2826
}
@@ -41,9 +39,9 @@ public function testLegacyInvalidMessage()
4139
{
4240
$this->expectDeprecation('Since symfony/form 5.2: Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.');
4341

44-
$form = $this->createForm(array(
42+
$form = $this->createForm([
4543
'legacy_error_messages' => true,
46-
));
44+
]);
4745

4846
$this->assertSame('This value is not valid.', $form->getConfig()->getOption('invalid_message'));
4947
}

src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTimeTypeValidatorExtensionTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
1313

1414
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
15-
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
16-
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
1715
use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
1816
use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
1917

@@ -22,7 +20,7 @@ class DateTimeTypeValidatorExtensionTest extends BaseValidatorExtensionTest
2220
use ExpectDeprecationTrait;
2321
use ValidatorExtensionTrait;
2422

25-
protected function createForm(array $options = array())
23+
protected function createForm(array $options = [])
2624
{
2725
return $this->factory->create(DateTimeType::class, null, $options);
2826
}
@@ -41,9 +39,9 @@ public function testLegacyInvalidMessage()
4139
{
4240
$this->expectDeprecation('Since symfony/form 5.2: Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.');
4341

44-
$form = $this->createForm(array(
42+
$form = $this->createForm([
4543
'legacy_error_messages' => true,
46-
));
44+
]);
4745

4846
$this->assertSame('This value is not valid.', $form->getConfig()->getOption('invalid_message'));
4947
}

src/Symfony/Component/Form/Tests/Extension/Validator/Type/DateTypeValidatorExtensionTest.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
namespace Symfony\Component\Form\Tests\Extension\Validator\Type;
1313

1414
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
15-
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
16-
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
1715
use Symfony\Component\Form\Extension\Core\Type\DateType;
1816
use Symfony\Component\Form\Test\Traits\ValidatorExtensionTrait;
1917

@@ -22,7 +20,7 @@ class DateTypeValidatorExtensionTest extends BaseValidatorExtensionTest
2220
use ExpectDeprecationTrait;
2321
use ValidatorExtensionTrait;
2422

25-
protected function createForm(array $options = array())
23+
protected function createForm(array $options = [])
2624
{
2725
return $this->factory->create(DateType::class, null, $options);
2826
}
@@ -41,9 +39,9 @@ public function testLegacyInvalidMessage()
4139
{
4240
$this->expectDeprecation('Since symfony/form 5.2: Setting the "legacy_error_messages" option to "true" is deprecated. It will be disabled in Symfony 6.0.');
4341

44-
$form = $this->createForm(array(
42+
$form = $this->createForm([
4543
'legacy_error_messages' => true,
46-
));
44+
]);
4745

4846
$this->assertSame('This value is not valid.', $form->getConfig()->getOption('invalid_message'));
4947
}

0 commit comments

Comments
 (0)
0