From b06f148c1043d366bbf64d9c155beac69853661b Mon Sep 17 00:00:00 2001 From: andreaspenz Date: Wed, 21 Jan 2015 08:55:25 +0100 Subject: [PATCH 1/2] Allow camelcase in vendorname - changed regex in menu.xsd --- app/code/Magento/Backend/etc/menu.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Backend/etc/menu.xsd b/app/code/Magento/Backend/etc/menu.xsd index 311bc95d85aaa..5ba2e6a84e93e 100644 --- a/app/code/Magento/Backend/etc/menu.xsd +++ b/app/code/Magento/Backend/etc/menu.xsd @@ -131,7 +131,7 @@ - + From 498f6cafae8b8ca470aaed69806db8b14450b29c Mon Sep 17 00:00:00 2001 From: andreaspenz Date: Wed, 21 Jan 2015 09:02:49 +0100 Subject: [PATCH 2/2] Allow camelcase in vendorname - fix files for unit-tests --- .../Config/_files/invalidMenuXmlArray.php | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/invalidMenuXmlArray.php b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/invalidMenuXmlArray.php index 5ce31bbd979ee..a187bc629dcbb 100644 --- a/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/invalidMenuXmlArray.php +++ b/dev/tests/unit/testsuite/Magento/Backend/Model/Menu/Config/_files/invalidMenuXmlArray.php @@ -209,7 +209,7 @@ 'resource="test_Value::value"/>', [ "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'." ], @@ -220,7 +220,7 @@ 'resource="Test_value::value"/>', [ "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'." ], @@ -231,7 +231,7 @@ 'resource="M#$%23_value::value"/>', [ "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'." ], @@ -242,7 +242,7 @@ 'resource="_value::value"/>', [ "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'." ], @@ -253,7 +253,7 @@ '', [ "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'." ], @@ -264,7 +264,7 @@ 'resource="Test_Value:value"/>', [ "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'." ], @@ -275,7 +275,7 @@ 'resource="Test_Value::"/>', [ "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'." ], @@ -608,7 +608,7 @@ 'resource="test_Value::value"/>', [ "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'." ], @@ -618,7 +618,7 @@ 'resource="Test_value::value"/>', [ "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'." ], @@ -628,7 +628,7 @@ 'resource="M#$%23_value::value"/>', [ "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'." ], @@ -638,7 +638,7 @@ 'resource="_value::value"/>', [ "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'." ], @@ -648,7 +648,7 @@ 'resource="Magento_::value"/>', [ "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'." ], @@ -658,7 +658,7 @@ 'resource="Test_Value:value"/>', [ "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'." ], @@ -668,7 +668,7 @@ 'resource="Test_Value::"/>', [ "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'." ],