Merge branch '6' into 7.0

silverstripe · Feb 23, 2025 · 77061c6 · 77061c6
2 parents 1edc4db + 4e28aa2
commit 77061c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/code/Model/EditableFormField/EditableTextField.php b/code/Model/EditableFormField/EditableTextField.php
@@ -2,6 +2,7 @@
 
 namespace SilverStripe\UserForms\Model\EditableFormField;
 
+use SilverStripe\Core\ClassInfo;
 use SilverStripe\Forms\DropdownField;
 use SilverStripe\Forms\FieldGroup;
 use SilverStripe\Forms\FieldList;
@@ -182,7 +183,7 @@ protected function updateFormField($field)
         }
 
         if (is_numeric($this->MaxLength) && $this->MaxLength > 0) {
-            if ($field instanceof TextField) {
+            if (ClassInfo::hasMethod($field, 'setMaxLength')) {
                 $field->setMaxLength((int) $this->MaxLength);
             }
             $field->setAttribute('data-rule-maxlength', (int) $this->MaxLength);

diff --git a/tests/php/Model/EditableFormFieldTest.php b/tests/php/Model/EditableFormFieldTest.php
@@ -233,7 +233,7 @@ public function testLengthRange()
         // textarea
         $textField->Rows = 3;
         $attributes = $textField->getFormField()->getAttributes();
-        $this->assertFalse(isset($attributes['maxLength']));
+        $this->assertEquals(20, $attributes['maxlength']);
         $this->assertEquals(10, $attributes['data-rule-minlength']);
         $this->assertEquals(20, $attributes['data-rule-maxlength']);
     }