Skip to content

Commit 976fa0f

Browse files
ENGCOM-8038: resolved consistency error for merged indexer xml files #27212
2 parents 1c6a627 + f243874 commit 976fa0f

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

lib/internal/Magento/Framework/Indexer/Test/Unit/_files/invalidIndexerXmlArray.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@
2121
'<title>Test</title><description>Test</description></indexer></config>',
2222
["Element 'indexer': The attribute 'view_id' is required but missing.\nLine: 1\n"],
2323
],
24+
'indexer_with_wrong_class_name' => [
25+
'<?xml version="1.0"?><config><indexer id="somename" view_id="view_01" class="Class+\Name">' .
26+
'<title>Test</title><description>Test</description></indexer></config>',
27+
[
28+
"Element 'indexer', attribute 'class': [facet 'pattern'] The value 'Class+\Name' "
29+
. "is not accepted by the pattern '[a-zA-Z|\\\\]+[a-zA-Z0-9\\\\]+'.\nLine: 1\n",
30+
"Element 'indexer', attribute 'class': 'Class+\Name' is not a valid value of the atomic type 'classType'."
31+
. "\nLine: 1\n"
32+
],
33+
],
2434
'indexer_duplicate_view_attribute' => [
2535
'<?xml version="1.0"?><config><indexer id="somename" view_id="view_01" class="Class\Name">' .
2636
'<title>Test</title><description>Test</description></indexer>' .

lib/internal/Magento/Framework/Indexer/Test/Unit/_files/valid_indexer.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@
1010
<title translate="true">Indexer public name</title>
1111
<description translate="true">Indexer public description</description>
1212
</indexer>
13-
<indexer id="new_indexer_internal_name" view_id="view02" class="Some\Class\Name">
13+
<indexer id="second_indexer_internal_name" view_id="view02" class="Some\Class\Name">
14+
<title translate="true">Indexer public name</title>
15+
<description translate="true">Indexer public description</description>
16+
</indexer>
17+
<indexer id="third_indexer_internal_name" view_id="view03" class="Some1\Class\Name">
1418
<title translate="true">Indexer public name</title>
1519
<description translate="true">Indexer public description</description>
1620
</indexer>

lib/internal/Magento/Framework/Indexer/etc/indexer_merged.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@
5757
<xs:simpleType name="classType">
5858
<xs:annotation>
5959
<xs:documentation>
60-
Class name can contain only [a-zA-Z\].
60+
Class name can contain only [a-zA-Z|\\]+[a-zA-Z0-9\\]+.
6161
</xs:documentation>
6262
</xs:annotation>
6363
<xs:restriction base="xs:string">
64-
<xs:pattern value="[a-zA-Z\\]+" />
64+
<xs:pattern value="[a-zA-Z|\\]+[a-zA-Z0-9\\]+"/>
6565
</xs:restriction>
6666
</xs:simpleType>
6767

0 commit comments

Comments
 (0)