Skip to content

Commit fe935a6

Browse files
committed
Resolve queue_consumer.xml doesn't allow numbers in handler class issue25731
1 parent 57a2aad commit fe935a6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

lib/internal/Magento/Framework/MessageQueue/Test/Unit/Consumer/Config/XsdTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,17 +84,17 @@ public function exemplarXmlDataProvider()
8484
],
8585
'invalid handler format' => [
8686
'<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework-message-queue:etc/consumer.xsd">
87-
<consumer name="consumer1" queue="queue1" handler="handlerClass1::handlerMethodOne" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
88-
<consumer name="consumer2" queue="queue2" handler="handlerClassTwo::handlerMethod2" consumerInstance="consumerClass2" connection="db"/>
87+
<consumer name="consumer1" queue="queue1" handler="handlerClass_One1::handlerMethod1" consumerInstance="consumerClass1" connection="amqp" maxMessages="100"/>
88+
<consumer name="consumer2" queue="queue2" handler="handlerClassOne2::handler_Method2" consumerInstance="consumerClass2" connection="db"/>
8989
<consumer name="consumer3" queue="queue3" handler="handlerClassThree::handlerMethodThree" consumerInstance="consumerClass3"/>
9090
<consumer name="consumer4" queue="queue4" handler="handlerClassFour::handlerMethodFour"/>
9191
<consumer name="consumer5" queue="queue4"/>
9292
</config>',
9393
[
94-
"Element 'consumer', attribute 'handler': [facet 'pattern'] The value 'handlerClass1::handlerMethodOne' is not accepted by the pattern '[a-zA-Z\\\\]+::[a-zA-Z]+'.",
95-
"Element 'consumer', attribute 'handler': 'handlerClass1::handlerMethodOne' is not a valid value of the atomic type 'handlerType'.",
96-
"Element 'consumer', attribute 'handler': [facet 'pattern'] The value 'handlerClassTwo::handlerMethod2' is not accepted by the pattern '[a-zA-Z\\\\]+::[a-zA-Z]+'.",
97-
"Element 'consumer', attribute 'handler': 'handlerClassTwo::handlerMethod2' is not a valid value of the atomic type 'handlerType'.",
94+
"Element 'consumer', attribute 'handler': [facet 'pattern'] The value 'handlerClass_One1::handlerMethod1' is not accepted by the pattern '[a-zA-Z0-9\\\\]+::[a-zA-Z0-9]+'.",
95+
"Element 'consumer', attribute 'handler': 'handlerClass_One1::handlerMethod1' is not a valid value of the atomic type 'handlerType'.",
96+
"Element 'consumer', attribute 'handler': [facet 'pattern'] The value 'handlerClassOne2::handler_Method2' is not accepted by the pattern '[a-zA-Z0-9\\\\]+::[a-zA-Z0-9]+'.",
97+
"Element 'consumer', attribute 'handler': 'handlerClassOne2::handler_Method2' is not a valid value of the atomic type 'handlerType'.",
9898
],
9999
],
100100
'invalid maxMessages format' => [

lib/internal/Magento/Framework/MessageQueue/etc/consumer.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</xs:documentation>
3333
</xs:annotation>
3434
<xs:restriction base="xs:string">
35-
<xs:pattern value="[a-zA-Z\\]+::[a-zA-Z]+" />
35+
<xs:pattern value="[a-zA-Z0-9\\]+::[a-zA-Z0-9]+" />
3636
<xs:minLength value="5" />
3737
</xs:restriction>
3838
</xs:simpleType>

0 commit comments

Comments
 (0)