[jrauh01]

LabelDecorator and FieldsetDecorator previously wrapped every label in Text, which HTML-escapes its content on render. Passing a ValidHtml label therefore caused its markup to be double-escaped, and passing any ValidHtml that does not implement __toString() caused a fatal error during the string coercion in Text::setContent().

Both decorators now detect ValidHtml labels and use them directly, wrapping only plain strings in Text. FieldsetDecorator requires its own fix because fieldset elements bypass LabelDecorator entirely and render the legend themselves.

The $label property, setLabel(), and getLabel() type annotations are updated to reflect that labels may be either a plain string or a ValidHtml object.

Tests cover string escaping, HtmlString pass-through, and a render-only ValidHtml implementation (no __toString()) for both decorators.

[lippserd]

Please address the following before merging.

Please update the public label contract to include ValidHtml. LabelDecorator and the new test accept it, but FormElement::getLabel() and BaseFormElement::$label/setLabel() still advertise strings, so PHPStan considers the new branch impossible and statically checked callers cannot use the feature. Document that strings are escaped while ValidHtml is trusted markup.

Please apply the same ValidHtml pass-through to fieldset legends. Fieldsets bypass LabelDecorator, and FieldsetDecorator still wraps every label with Text::create(); browser verification showed HtmlString markup being escaped, while a render-only ValidHtml implementation fails during string conversion. Add coverage for string, HtmlString, and render-only ValidHtml labels.

Please update the PR description to match the final design. It still promises the removed escaped option and accessors, while the current diff uses automatic ValidHtml detection.

[jrauh01]

I extended FieldsetDecorator with the same ValidHtml pass-through that LabelDecorator already had, updated the public label contract to include ValidHtml, and added tests for string escaping, HtmlString pass-through, and a render-only ValidHtml implementation in FieldsetDecoratorTest.

[lippserd]

In addition to the requested changes:

SubmitElement::setLabel() with no @param annotation inherits the widened ValidHtml contract but its pipeline is string-only. A caller who passes a ValidHtml object based on the advertised interface will silently break form submission detection: hasBeenPressed() compares the stored object against a string with ===, which is always false for objects. Add a narrowing @param string $label annotation to SubmitElement::setLabel(). A brief docblock sentence explaining that the label populates a value attribute and must therefore be a plain string is sufficient.

I am not fully aware of the deprecated DivDecorator usage but its fieldset path throws TypeError for non-Stringable ValidHtml. I would apply the same guard used in FieldsetDecorator: replace Text::create($label) with $label instanceof ValidHtml ? $label : new Text($label).

[jrauh01]

Narrowed the type via @param annotation for SubmitElement::setLabel() and added the conditional logic to render ValidHtml for fieldset legends via DivDecorator.

[lippserd]

Please clean up the commit history.

[jrauh01]

Commit history is clean now.