Skip to content

Commit 4f1eb9c

Browse files
vidarlvidarl
committed
Merge branch '2.3' of github.com:ezsystems/ezplatform-richtext into 4.6
2 parents 560eecf + acb0fa0 commit 4f1eb9c

File tree

4 files changed

+8
-105
lines changed

4 files changed

+8
-105
lines changed

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -455,36 +455,6 @@ parameters:
455455
count: 1
456456
path: src/lib/FieldType/RichText/RichTextStorage.php
457457

458-
-
459-
message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|'ezremote\\://', 2\\?\\: string, 3\\?\\: string\\}\\.$#"
460-
count: 1
461-
path: src/lib/FieldType/RichText/RichTextStorage.php
462-
463-
-
464-
message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string\\}\\.$#"
465-
count: 1
466-
path: src/lib/FieldType/RichText/RichTextStorage.php
467-
468-
-
469-
message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\: 'ezremote\\://', 2\\?\\: string, 3\\?\\: string\\}\\.$#"
470-
count: 1
471-
path: src/lib/FieldType/RichText/RichTextStorage.php
472-
473-
-
474-
message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|'ezremote\\://', 2\\?\\: string, 3\\?\\: string\\}\\.$#"
475-
count: 2
476-
path: src/lib/FieldType/RichText/RichTextStorage.php
477-
478-
-
479-
message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string\\}\\.$#"
480-
count: 1
481-
path: src/lib/FieldType/RichText/RichTextStorage.php
482-
483-
-
484-
message: "#^Offset 3 does not exist on array\\{0\\?\\: string, 1\\?\\: ''\\|'ezremote\\://', 2\\?\\: string, 3\\?\\: string\\}\\.$#"
485-
count: 1
486-
path: src/lib/FieldType/RichText/RichTextStorage.php
487-
488458
-
489459
message: "#^Parameter \\#1 \\$source of method DOMDocument\\:\\:loadXML\\(\\) expects string, array\\|bool\\|float\\|int\\|string\\|null given\\.$#"
490460
count: 2
@@ -655,21 +625,6 @@ parameters:
655625
count: 4
656626
path: src/lib/RichText/Converter/Link.php
657627

658-
-
659-
message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string, 3\\?\\: string\\}\\.$#"
660-
count: 1
661-
path: src/lib/RichText/Converter/Link.php
662-
663-
-
664-
message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string, 3\\?\\: string\\}\\.$#"
665-
count: 1
666-
path: src/lib/RichText/Converter/Link.php
667-
668-
-
669-
message: "#^Offset 3 does not exist on array\\{0\\?\\: string, 1\\?\\: string, 2\\?\\: string, 3\\?\\: string\\}\\.$#"
670-
count: 1
671-
path: src/lib/RichText/Converter/Link.php
672-
673628
-
674629
message: "#^Parameter \\#1 \\$locationId of method Ibexa\\\\Contracts\\\\Core\\\\Repository\\\\LocationService\\:\\:loadLocation\\(\\) expects int, int\\|null given\\.$#"
675630
count: 1
@@ -815,21 +770,6 @@ parameters:
815770
count: 1
816771
path: src/lib/RichText/Converter/Render/Embed.php
817772

818-
-
819-
message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: 'ezcontent'\\|'ezlocation', 2\\?\\: numeric\\-string\\}\\.$#"
820-
count: 1
821-
path: src/lib/RichText/Converter/Render/Embed.php
822-
823-
-
824-
message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\: 'ezcontent', 2\\?\\: numeric\\-string\\}\\.$#"
825-
count: 1
826-
path: src/lib/RichText/Converter/Render/Embed.php
827-
828-
-
829-
message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\: 'ezlocation', 2\\?\\: numeric\\-string\\}\\.$#"
830-
count: 1
831-
path: src/lib/RichText/Converter/Render/Embed.php
832-
833773
-
834774
message: "#^PHPDoc tag @var has invalid value \\(\\$embed \\\\DOMElement\\)\\: Unexpected token \"\\$embed\", expected type at offset 9$#"
835775
count: 1
@@ -1010,16 +950,6 @@ parameters:
1010950
count: 1
1011951
path: src/lib/RichText/RelationProcessor.php
1012952

1013-
-
1014-
message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: non\\-empty\\-string, 2\\?\\: string, 3\\?\\: string\\}\\.$#"
1015-
count: 1
1016-
path: src/lib/RichText/RelationProcessor.php
1017-
1018-
-
1019-
message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: non\\-empty\\-string, 2\\?\\: string, 3\\?\\: string\\}\\.$#"
1020-
count: 1
1021-
path: src/lib/RichText/RelationProcessor.php
1022-
1023953
-
1024954
message: "#^Cannot call method error\\(\\) on Psr\\\\Log\\\\LoggerInterface\\|null\\.$#"
1025955
count: 13
@@ -1150,16 +1080,6 @@ parameters:
11501080
count: 1
11511081
path: src/lib/RichText/Validator/InternalLinkValidator.php
11521082

1153-
-
1154-
message: "#^Offset 1 does not exist on array\\{0\\?\\: string, 1\\?\\: non\\-empty\\-string, 2\\?\\: string, 3\\?\\: string\\}\\.$#"
1155-
count: 1
1156-
path: src/lib/RichText/Validator/InternalLinkValidator.php
1157-
1158-
-
1159-
message: "#^Offset 2 does not exist on array\\{0\\?\\: string, 1\\?\\: non\\-empty\\-string, 2\\?\\: string, 3\\?\\: string\\}\\.$#"
1160-
count: 1
1161-
path: src/lib/RichText/Validator/InternalLinkValidator.php
1162-
11631083
-
11641084
message: "#^Parameter \\#1 \\$locationId of method Ibexa\\\\Contracts\\\\Core\\\\Persistence\\\\Content\\\\Location\\\\Handler\\:\\:load\\(\\) expects int, string given\\.$#"
11651085
count: 1

‎src/bundle/Resources/richtext/schemas/docbook/docbook.iso.sch‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -253,20 +253,13 @@
253253
<s:let name="lowerCase" value="'abcdefghijklmnopqrstuvwxyz'"/>
254254
<s:rule context="db:link">
255255
<!-- Using translate() because we don't have XPath 2, so we can't use lower-case(). -->
256-
<s:assert test="starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'http://') or
257-
starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'https://') or
256+
<s:assert test="starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'http') or
258257
starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'mailto:') or
259-
starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezcontent://') or
260-
starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezlocation://') or
261-
starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezremote://') or
262-
starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezurl://') or
258+
starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'tel:') or
259+
starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ez') or
263260
starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), '/') or
264261
starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), '#')"
265-
mode="schematron-get-full-path-2">links must start with one of: http://, https://, mailto:, ezcontent://, ezlocation://, ezremote://, ezurl://, /, #</s:assert>
266-
<s:assert test="not(contains(@*[name()='xlink:href'], '&lt;') or
267-
contains(@*[name()='xlink:href'], '&gt;') or
268-
contains(@*[name()='xlink:href'], '&quot;'))"
269-
mode="schematron-get-full-path-2">using characters [&lt; &gt; &quot;] in links is not allowed</s:assert>
262+
mode="schematron-get-full-path-2">links must start with one of: http://, https://, mailto:, tel:, ezcontent://, ezlocation://, ezremote://, ezurl://, /, #</s:assert>
270263
</s:rule>
271264
</s:pattern>
272265
</s:schema>

‎src/bundle/Resources/richtext/schemas/docbook/docbook.iso.sch.xsl‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,4 @@
7979
<axsl:template match="db:link" priority="1000" mode="M3"><svrl:fired-rule xmlns:svrl="http://purl.oclc.org/dsdl/svrl" context="db:link"/>
8080

8181
<!--ASSERT -->
82-
<axsl:choose><axsl:when test="starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'http://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'https://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'mailto:') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezcontent://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezlocation://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezremote://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezurl://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), '/') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), '#')"/><axsl:otherwise><svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:schold="http://www.ascc.net/xml/schematron" test="starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'http://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'https://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'mailto:') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezcontent://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezlocation://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezremote://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ezurl://') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), '/') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), '#')"><axsl:attribute name="location"><axsl:apply-templates select="." mode="schematron-get-full-path-2"/></axsl:attribute><svrl:text>links must start with one of: http://, https://, mailto:, ezcontent://, ezlocation://, ezremote://, ezurl://, /, #</svrl:text></svrl:failed-assert></axsl:otherwise></axsl:choose>
83-
84-
<!--ASSERT -->
85-
<axsl:choose><axsl:when test="not(contains(@*[name()='xlink:href'], '&lt;') or contains(@*[name()='xlink:href'], '&gt;') or contains(@*[name()='xlink:href'], '&quot;'))"/><axsl:otherwise><svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:schold="http://www.ascc.net/xml/schematron" test="not(contains(@*[name()='xlink:href'], '&lt;') or contains(@*[name()='xlink:href'], '&gt;') or contains(@*[name()='xlink:href'], '&quot;'))"><axsl:attribute name="location"><axsl:apply-templates select="." mode="schematron-get-full-path-2"/></axsl:attribute><svrl:text>using characters [&lt; &gt; "] in links is not allowed</svrl:text></svrl:failed-assert></axsl:otherwise></axsl:choose><axsl:apply-templates select="*|comment()|processing-instruction()" mode="M3"/></axsl:template><axsl:template match="text()" priority="-1" mode="M3"/><axsl:template match="@*|node()" priority="-2" mode="M3"><axsl:apply-templates select="*|comment()|processing-instruction()" mode="M3"/></axsl:template></axsl:stylesheet>
82+
<axsl:choose><axsl:when test="starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'http') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'mailto:') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'tel:') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ez') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), '/') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), '#')"/><axsl:otherwise><svrl:failed-assert xmlns:svrl="http://purl.oclc.org/dsdl/svrl" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:schold="http://www.ascc.net/xml/schematron" test="starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'http') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'mailto:') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'tel:') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), 'ez') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), '/') or starts-with(translate(@*[name()='xlink:href'], $upperCase, $lowerCase), '#')"><axsl:attribute name="location"><axsl:apply-templates select="." mode="schematron-get-full-path-2"/></axsl:attribute><svrl:text>links must start with one of: http://, https://, mailto:, tel:, ezcontent://, ezlocation://, ezremote://, ezurl://, /, #</svrl:text></svrl:failed-assert></axsl:otherwise></axsl:choose><axsl:apply-templates select="*|comment()|processing-instruction()" mode="M3"/></axsl:template><axsl:template match="text()" priority="-1" mode="M3"/><axsl:template match="@*|node()" priority="-2" mode="M3"><axsl:apply-templates select="*|comment()|processing-instruction()" mode="M3"/></axsl:template></axsl:stylesheet>

‎tests/lib/FieldType/RichTextTest.php‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public function providerForTestValidate()
229229
[
230230
new ValidationError(
231231
"Validation of XML content failed:\n" .
232-
'/section/para/link: links must start with one of: http://, https://, mailto:, ezcontent://, ezlocation://, ezremote://, ezurl://, /, #',
232+
'/section/para/link: links must start with one of: http://, https://, mailto:, tel:, ezcontent://, ezlocation://, ezremote://, ezurl://, /, #',
233233
null,
234234
[],
235235
'xml'
@@ -244,7 +244,7 @@ public function providerForTestValidate()
244244
[
245245
new ValidationError(
246246
"Validation of XML content failed:\n" .
247-
'/section/para/link: links must start with one of: http://, https://, mailto:, ezcontent://, ezlocation://, ezremote://, ezurl://, /, #',
247+
'/section/para/link: links must start with one of: http://, https://, mailto:, tel:, ezcontent://, ezlocation://, ezremote://, ezurl://, /, #',
248248
null,
249249
[],
250250
'xml'
@@ -257,13 +257,6 @@ public function providerForTestValidate()
257257
<para><link xlink:href="https://example.com/foo&lt;bar">link</link></para>
258258
</section>',
259259
[
260-
new ValidationError(
261-
"Validation of XML content failed:\n" .
262-
'/section/para/link: using characters [< > "] in links is not allowed',
263-
null,
264-
[],
265-
'xml'
266-
),
267260
],
268261
],
269262
[
@@ -274,7 +267,7 @@ public function providerForTestValidate()
274267
[
275268
new ValidationError(
276269
"Validation of XML content failed:\n" .
277-
'/section/para/link: links must start with one of: http://, https://, mailto:, ezcontent://, ezlocation://, ezremote://, ezurl://, /, #',
270+
'/section/para/link: links must start with one of: http://, https://, mailto:, tel:, ezcontent://, ezlocation://, ezremote://, ezurl://, /, #',
278271
null,
279272
[],
280273
'xml'

0 commit comments

Comments
 (0)