Skip to content

Commit eeb4521

Browse files
committed
configure function of sfValidators should return void
1 parent 31deefc commit eeb4521

26 files changed

+27
-27
lines changed

lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class sfValidatorDoctrineChoice extends sfValidatorBase
3535
*
3636
* @see sfValidatorBase
3737
*/
38-
protected function configure($options = array(), $messages = array())
38+
protected function configure(array $options = [], array $messages = []): void
3939
{
4040
$this->addRequiredOption('model');
4141
$this->addOption('query', null);

lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function __construct($options = array(), $messages = array())
5252
*
5353
* @see sfValidatorBase
5454
*/
55-
protected function configure($options = array(), $messages = array())
55+
protected function configure(array $options = [], array $messages = []): void
5656
{
5757
$this->addRequiredOption('model');
5858
$this->addRequiredOption('column');

lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class sfValidatorI18nChoiceCountry extends sfValidatorChoice
3030
*
3131
* @see sfValidatorChoice
3232
*/
33-
protected function configure($options = array(), $messages = array())
33+
protected function configure(array $options = [], array $messages = []): void
3434
{
3535
parent::configure($options, $messages);
3636

lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class sfValidatorI18nChoiceLanguage extends sfValidatorChoice
3030
*
3131
* @see sfValidatorChoice
3232
*/
33-
protected function configure($options = array(), $messages = array())
33+
protected function configure(array $options = [], array $messages = []): void
3434
{
3535
parent::configure($options, $messages);
3636

lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class sfValidatorI18nChoiceTimezone extends sfValidatorChoice
2828
*
2929
* @see sfValidatorChoice
3030
*/
31-
protected function configure($options = array(), $messages = array())
31+
protected function configure(array $options = [], array $messages = []): void
3232
{
3333
parent::configure($options, $messages);
3434

lib/validator/sfValidatorAnd.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function __construct($validators = null, $options = array(), $messages =
6969
*
7070
* @see sfValidatorBase
7171
*/
72-
protected function configure($options = array(), $messages = array())
72+
protected function configure(array $options = [], array $messages = []): void
7373
{
7474
$this->addOption('halt_on_error', false);
7575

lib/validator/sfValidatorBase.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function __construct($options = array(), $messages = array())
9898
*
9999
* @see __construct()
100100
*/
101-
protected function configure($options = array(), $messages = array())
101+
protected function configure(array $options = [], array $messages = []): void
102102
{
103103
}
104104

lib/validator/sfValidatorBoolean.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class sfValidatorBoolean extends sfValidatorBase
3131
*
3232
* @see sfValidatorBase
3333
*/
34-
protected function configure($options = array(), $messages = array())
34+
protected function configure(array $options = [], array $messages = []): void
3535
{
3636
$this->addOption('true_values', array('true', 't', 'yes', 'y', 'on', '1'));
3737
$this->addOption('false_values', array('false', 'f', 'no', 'n', 'off', '0'));

lib/validator/sfValidatorCSRFToken.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class sfValidatorCSRFToken extends sfValidatorBase
2121
/**
2222
* @see sfValidatorBase
2323
*/
24-
protected function configure($options = array(), $messages = array())
24+
protected function configure(array $options = [], array $messages = []): void
2525
{
2626
$this->addRequiredOption('token');
2727

lib/validator/sfValidatorCallback.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class sfValidatorCallback extends sfValidatorBase
3131
*
3232
* @see sfValidatorBase
3333
*/
34-
protected function configure($options = array(), $messages = array())
34+
protected function configure(array $options = [], array $messages = []): void
3535
{
3636
$this->addRequiredOption('callback');
3737
$this->addOption('arguments', array());

lib/validator/sfValidatorChoice.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class sfValidatorChoice extends sfValidatorBase
3333
*
3434
* @see sfValidatorBase
3535
*/
36-
protected function configure($options = array(), $messages = array())
36+
protected function configure(array $options = [], array $messages = []): void
3737
{
3838
$this->addRequiredOption('choices');
3939
$this->addOption('multiple', false);

lib/validator/sfValidatorDate.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class sfValidatorDate extends sfValidatorBase
4545
*
4646
* @see sfValidatorBase
4747
*/
48-
protected function configure($options = array(), $messages = array())
48+
protected function configure(array $options = [], array $messages = []): void
4949
{
5050
$this->addMessage('bad_format', '"%value%" does not match the date format (%date_format%).');
5151
$this->addMessage('max', 'The date must be before %max%.');

lib/validator/sfValidatorDateRange.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class sfValidatorDateRange extends sfValidatorBase
3333
*
3434
* @see sfValidatorBase
3535
*/
36-
protected function configure($options = array(), $messages = array())
36+
protected function configure(array $options = [], array $messages = []): void
3737
{
3838
$this->setMessage('invalid', 'The begin date must be before the end date.');
3939

lib/validator/sfValidatorDateTime.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class sfValidatorDateTime extends sfValidatorDate
2121
/**
2222
* @see sfValidatorDate
2323
*/
24-
protected function configure($options = array(), $messages = array())
24+
protected function configure(array $options = [], array $messages = []): void
2525
{
2626
parent::configure($options, $messages);
2727

lib/validator/sfValidatorEqual.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class sfValidatorEqual extends sfValidatorBase
3636
*
3737
* @see sfValidatorBase
3838
*/
39-
protected function configure($options = array(), $messages = array())
39+
protected function configure(array $options = [], array $messages = []): void
4040
{
4141
$this->addRequiredOption('value');
4242
$this->addOption('strict', false);

lib/validator/sfValidatorFile.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class sfValidatorFile extends sfValidatorBase
5050
*
5151
* @see sfValidatorBase
5252
*/
53-
protected function configure($options = array(), $messages = array())
53+
protected function configure(array $options = [], array $messages = []): void
5454
{
5555
if (!ini_get('file_uploads'))
5656
{

lib/validator/sfValidatorInteger.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class sfValidatorInteger extends sfValidatorBase
3636
*
3737
* @see sfValidatorBase
3838
*/
39-
protected function configure($options = array(), $messages = array())
39+
protected function configure(array $options = [], array $messages = []): void
4040
{
4141
$this->addMessage('max', '"%value%" must be at most %max%.');
4242
$this->addMessage('min', '"%value%" must be at least %min%.');

lib/validator/sfValidatorIp.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class sfValidatorIp extends sfValidatorString
3737
const IP_V6_ONLY_PUBLIC = '6_public';
3838
const IP_ALL_ONLY_PUBLIC = 'all_public';
3939

40-
public function configure($options = array(), $messages = array())
40+
public function configure(array $options = [], array $messages = []): void
4141
{
4242
$this->addOption('version', self::IP_ALL);
4343

lib/validator/sfValidatorNumber.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class sfValidatorNumber extends sfValidatorBase
3636
*
3737
* @see sfValidatorBase
3838
*/
39-
protected function configure($options = array(), $messages = array())
39+
protected function configure(array $options = [], array $messages = []): void
4040
{
4141
$this->addMessage('max', '"%value%" must be at most %max%.');
4242
$this->addMessage('min', '"%value%" must be at least %min%.');

lib/validator/sfValidatorOr.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function __construct($validators = null, $options = array(), $messages =
6060
/**
6161
* @see sfValidatorBase
6262
*/
63-
protected function configure($options = array(), $messages = array())
63+
protected function configure(array $options = [], array $messages = []): void
6464
{
6565
$this->setMessage('invalid', null);
6666
}

lib/validator/sfValidatorRegex.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class sfValidatorRegex extends sfValidatorString
3131
*
3232
* @see sfValidatorString
3333
*/
34-
protected function configure($options = array(), $messages = array())
34+
protected function configure(array $options = [], array $messages = []): void
3535
{
3636
parent::configure($options, $messages);
3737

lib/validator/sfValidatorSchema.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function __construct($fields = null, $options = array(), $messages = arra
7373
*
7474
* @see sfValidatorBase
7575
*/
76-
protected function configure($options = array(), $messages = array())
76+
protected function configure(array $options = [], array $messages = []): void
7777
{
7878
$this->addOption('allow_extra_fields', false);
7979
$this->addOption('filter_extra_fields', true);

lib/validator/sfValidatorString.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class sfValidatorString extends sfValidatorBase
3636
*
3737
* @see sfValidatorBase
3838
*/
39-
protected function configure($options = array(), $messages = array())
39+
protected function configure(array $options = [], array $messages = []): void
4040
{
4141
$this->addMessage('max_length', '"%value%" is too long (%max_length% characters max).');
4242
$this->addMessage('min_length', '"%value%" is too short (%min_length% characters min).');

lib/validator/sfValidatorTime.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class sfValidatorTime extends sfValidatorBase
3737
*
3838
* @see sfValidatorBase
3939
*/
40-
protected function configure($options = array(), $messages = array())
40+
protected function configure(array $options = [], array $messages = []): void
4141
{
4242
$this->addMessage('bad_format', '"%value%" does not match the time format (%time_format%).');
4343

lib/validator/sfValidatorUrl.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class sfValidatorUrl extends sfValidatorRegex
4141
*
4242
* @see sfValidatorRegex
4343
*/
44-
protected function configure($options = array(), $messages = array())
44+
protected function configure(array $options = [], array $messages = []): void
4545
{
4646
parent::configure($options, $messages);
4747

test/unit/validator/sfValidatorBaseTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
class ValidatorIdentity extends sfValidatorBase
1616
{
17-
protected function configure($options = array(), $messages = array())
17+
protected function configure(array $options = [], array $messages = []): void
1818
{
1919
$this->addOption('foo', 'bar');
2020
$this->addMessage('foo', 'bar');
@@ -33,7 +33,7 @@ protected function doClean($value): mixed
3333

3434
class ValidatorIdentityWithRequired extends sfValidatorBase
3535
{
36-
protected function configure($options = array(), $messages = array())
36+
protected function configure(array $options = [], array $messages = []): void
3737
{
3838
$this->addRequiredOption('foo');
3939
}

0 commit comments

Comments
 (0)