File size: 2,446 Bytes
5fcd275 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | diff --git a/composer.json b/composer.json
index a59f61f3d..438e6f48b 100644
--- a/composer.json
+++ b/composer.json
@@ -54,7 +54,11 @@
"laminas/laminas-view": "^2.14, required for using the laminas-form view helpers"
},
"config": {
- "sort-packages": true
+ "sort-packages": true,
+ "allow-plugins": {
+ "composer/package-versions-deprecated": true,
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
},
"extra": {
"laminas": {
diff --git a/src/View/Helper/FormElementErrors.php b/src/View/Helper/FormElementErrors.php
index 6dc63bd24..add4dd9ba 100644
--- a/src/View/Helper/FormElementErrors.php
+++ b/src/View/Helper/FormElementErrors.php
@@ -9,6 +9,7 @@
use function array_merge;
use function array_walk_recursive;
+use function count;
use function implode;
use function sprintf;
@@ -77,6 +78,12 @@ public function render(ElementInterface $element, array $attributes = []): strin
$attributes = ' ' . $attributes;
}
+ $count = count($messages);
+ $escaper = $this->getEscapeHtmlHelper();
+ for ($i = 0; $i < $count; $i += 1) {
+ $messages[$i] = $escaper($messages[$i]);
+ }
+
// Generate markup
$markup = sprintf($this->getMessageOpenFormat(), $attributes);
$markup .= implode($this->getMessageSeparatorString(), $messages);
diff --git a/test/View/Helper/FormElementErrorsTest.php b/test/View/Helper/FormElementErrorsTest.php
index 8f939deee..cbed22097 100644
--- a/test/View/Helper/FormElementErrorsTest.php
+++ b/test/View/Helper/FormElementErrorsTest.php
@@ -222,4 +222,22 @@ public function testCallingTheHelperToRenderInvokeCanReturnObject(): void
$helper = $this->helper;
$this->assertEquals($helper(), $helper);
}
+
+ public function testHtmlEscapingOfMessages(): void
+ {
+ $messages = [
+ [
+ '<span>First validator message</span>',
+ '<span>Second validator first message</span>',
+ '<span>Second validator second message</span>',
+ ],
+ ];
+ $element = new Element('foo');
+ $element->setMessages($messages);
+
+ $markup = $this->helper->render($element);
+
+ $this->assertStringNotContainsString('<span>', $markup);
+ $this->assertStringNotContainsString('</span>', $markup);
+ }
}
|