Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow camelcase in vendorname for menus #985

Merged
merged 2 commits into from
Feb 13, 2015
Merged

Allow camelcase in vendorname for menus #985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b06f148
Allow camelcase in vendorname
Jan 21, 2015
498f6ca
Allow camelcase in vendorname
Jan 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/code/Magento/Backend/etc/menu.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:string">
<xs:pattern value="[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}" />
<xs:pattern value="[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}" />
</xs:restriction>
</xs:simpleType>

Expand Down
28 changes: 14 additions & 14 deletions dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/invalidMenuXmlArray.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
'resource="test_Value::value"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'test_Value::value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'test_Value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -220,7 +220,7 @@
'resource="Test_value::value"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'Test_value::value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'Test_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -231,7 +231,7 @@
'resource="M#$%23_value::value"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'M#$%23_value::value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'M#$%23_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -242,7 +242,7 @@
'resource="_value::value"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value '_value::value' is not accepted by " .
"the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': '_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -253,7 +253,7 @@
'</menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'Magento_::value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'Magento_::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -264,7 +264,7 @@
'resource="Test_Value:value"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'Test_Value:value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'Test_Value:value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -275,7 +275,7 @@
'resource="Test_Value::"/></menu></config>',
[
"Element 'add', attribute 'resource': [facet 'pattern'] The value 'Test_Value::' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'add', attribute 'resource': 'Test_Value::' " .
"is not a valid value of the atomic type 'typeResource'."
],
Expand Down Expand Up @@ -608,7 +608,7 @@
'resource="test_Value::value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'test_Value::value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'test_Value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -618,7 +618,7 @@
'resource="Test_value::value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'Test_value::value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'Test_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -628,7 +628,7 @@
'resource="M#$%23_value::value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'M#$%23_value::value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'M#$%23_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -638,7 +638,7 @@
'resource="_value::value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value '_value::value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': '_value::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -648,7 +648,7 @@
'resource="Magento_::value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'Magento_::value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'Magento_::value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -658,7 +658,7 @@
'resource="Test_Value:value"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'Test_Value:value' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'Test_Value:value' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand All @@ -668,7 +668,7 @@
'resource="Test_Value::"/></menu></config>',
[
"Element 'update', attribute 'resource': [facet 'pattern'] The value 'Test_Value::' is not " .
"accepted by the pattern '[A-Z]+[a-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"accepted by the pattern '[A-Z]+[A-Za-z0-9]{1,}_[A-Z]+[A-Z0-9a-z]{1,}::[A-Za-z_0-9]{1,}'.",
"Element 'update', attribute 'resource': 'Test_Value::' is not a valid value of the atomic " .
"type 'typeResource'."
],
Expand Down