Merge branch '4.2' into 4

This commit is contained in:
github-actions 2024-06-17 10:53:53 +00:00
commit d6fea6cdc4
2 changed files with 3 additions and 3 deletions

View File

@ -86,7 +86,7 @@ class EditableSpamProtectionField extends EditableFormField
/**
* @param FormField $field
* @return self
* @return EditableSpamProtectionField
*/
public function setFormField(FormField $field)
{

View File

@ -71,7 +71,7 @@ class FormSpamProtectionExtension extends Extension
if (isset($options['protector'])) {
$protector = $options['protector'];
} else {
$protector = self::config()->get('default_spam_protector');
$protector = static::config()->get('default_spam_protector');
}
if ($protector && class_exists($protector ?? '')) {
@ -106,7 +106,7 @@ class FormSpamProtectionExtension extends Extension
}
// set custom mapping on this form
$protector = self::get_protector($options);
$protector = FormSpamProtectionExtension::get_protector($options);
if ($protector === null) {
throw new LogicException('No spam protector has been set. Null is not valid value.');