Skip to content

Commit 308e261

Browse files
hostepglo63652
authored andcommitted
Fixes xsd schema to work with libxml 2.12 and higher.
1 parent 995a05c commit 308e261

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

app/code/Magento/Elasticsearch/etc/esconfig.xsd

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,21 @@
1111
<xs:element name="config" type="configType" />
1212
<xs:complexType name="configType" mixed="true">
1313
<xs:choice maxOccurs="unbounded" minOccurs="1">
14-
<xs:element name="stemmer" type="mixedDataType" />
15-
<xs:element name="stopwords_file" type="mixedDataType" />
14+
<xs:element name="stemmer" type="stemmerDataType" />
15+
<xs:element name="stopwords_file" type="stopwordsDataType" />
1616
</xs:choice>
1717
</xs:complexType>
18-
<xs:complexType name="mixedDataType">
19-
<xs:choice maxOccurs="unbounded" minOccurs="1">
20-
<xs:element type="xs:string" name="default" minOccurs="1" maxOccurs="1" />
21-
<xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" />
22-
</xs:choice>
18+
<xs:complexType name="stemmerDataType">
19+
<xs:sequence>
20+
<xs:element type="xs:string" name="type" minOccurs="1" maxOccurs="1"/>
21+
<xs:element type="xs:string" name="default" minOccurs="1" maxOccurs="1"/>
22+
<xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
23+
</xs:sequence>
24+
</xs:complexType>
25+
<xs:complexType name="stopwordsDataType">
26+
<xs:sequence>
27+
<xs:element type="xs:string" name="default" minOccurs="1" maxOccurs="1"/>
28+
<xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
29+
</xs:sequence>
2330
</xs:complexType>
2431
</xs:schema>

0 commit comments

Comments
 (0)