From 22982cdf5fc172bb18037d5b64e6923536f852c9 Mon Sep 17 00:00:00 2001
From: Joan He <joan@x.com>
Date: Wed, 7 Oct 2015 14:57:26 -0500
Subject: [PATCH] MAGETWO-43268: n98 prefix cannot be used in resources
 defintion

---
 .../_files/invalidResourcesXmlArray.php       | 24 +++++++++----------
 .../Config/_files/valid_resources.xml         |  2 +-
 .../Magento/Framework/App/etc/resources.xsd   |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Resource/Config/_files/invalidResourcesXmlArray.php b/lib/internal/Magento/Framework/App/Test/Unit/Resource/Config/_files/invalidResourcesXmlArray.php
index aade50b4b2146..63b3442d0583d 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Resource/Config/_files/invalidResourcesXmlArray.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Resource/Config/_files/invalidResourcesXmlArray.php
@@ -13,30 +13,30 @@
         ["Element 'resource': The attribute 'name' is required but missing."],
     ],
     'resource_name_attribute_invalid_value' => [
-        '<?xml version="1.0"?><config><resource name="testinvalidname1" /></config>',
+        '<?xml version="1.0"?><config><resource name="testinvalidname$" /></config>',
         [
-            "Element 'resource', attribute 'name': [facet 'pattern'] The value 'testinvalidname1' is not accepted" .
-            " by the pattern '[A-Za-z_]+'.",
-            "Element 'resource', attribute 'name': 'testinvalidname1' is not a valid value of the atomic " .
+            "Element 'resource', attribute 'name': [facet 'pattern'] The value 'testinvalidname$' is not accepted" .
+            " by the pattern '[A-Za-z_0-9]+'.",
+            "Element 'resource', attribute 'name': 'testinvalidname$' is not a valid value of the atomic " .
             "type 'nameIdentifier'.",
             "Element 'resource', attribute 'name': Warning: No precomputed value available, the value was either " .
             "invalid or something strange happend."
         ],
     ],
     'resource_extends_attribute_invalid_value' => [
-        '<?xml version="1.0"?><config><resource name="test_name" extends="test1"/></config>',
+        '<?xml version="1.0"?><config><resource name="test_name" extends="test@"/></config>',
         [
-            "Element 'resource', attribute 'extends': [facet 'pattern'] The value 'test1' is not accepted " .
-            "by the pattern '[A-Za-z_]+'.",
-            "Element 'resource', attribute 'extends': 'test1' is not a valid value of the atomic type 'nameIdentifier'."
+            "Element 'resource', attribute 'extends': [facet 'pattern'] The value 'test@' is not accepted " .
+            "by the pattern '[A-Za-z_0-9]+'.",
+            "Element 'resource', attribute 'extends': 'test@' is not a valid value of the atomic type 'nameIdentifier'."
         ],
     ],
     'resource_connection_attribute_invalid_value' => [
-        '<?xml version="1.0"?><config><resource name="test_name" connection="test1"/></config>',
+        '<?xml version="1.0"?><config><resource name="test_name" connection="test#"/></config>',
         [
-            "Element 'resource', attribute 'connection': [facet 'pattern'] The value 'test1' is not accepted " .
-            "by the pattern '[A-Za-z_]+'.",
-            "Element 'resource', attribute 'connection': 'test1' is not a valid value of the atomic" .
+            "Element 'resource', attribute 'connection': [facet 'pattern'] The value 'test#' is not accepted " .
+            "by the pattern '[A-Za-z_0-9]+'.",
+            "Element 'resource', attribute 'connection': 'test#' is not a valid value of the atomic" .
             " type 'nameIdentifier'."
         ],
     ],
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Resource/Config/_files/valid_resources.xml b/lib/internal/Magento/Framework/App/Test/Unit/Resource/Config/_files/valid_resources.xml
index 511edaf040b90..80cbd17436102 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Resource/Config/_files/valid_resources.xml
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Resource/Config/_files/valid_resources.xml
@@ -6,6 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../../../../lib/internal/Magento/Framework/App/etc/resources.xsd">
-    <resource name="test_name" extends="test_extends" connection="test_connection" />
+    <resource name="test_name1" extends="test_extends1" connection="test_connection1" />
     <resource name="test_name_two" />
 </config>
diff --git a/lib/internal/Magento/Framework/App/etc/resources.xsd b/lib/internal/Magento/Framework/App/etc/resources.xsd
index ee95beeea44f6..4bd59f3d2f416 100644
--- a/lib/internal/Magento/Framework/App/etc/resources.xsd
+++ b/lib/internal/Magento/Framework/App/etc/resources.xsd
@@ -37,11 +37,11 @@
     <xs:simpleType name="nameIdentifier">
         <xs:annotation>
             <xs:documentation>
-                Name identifier can contain only [A-Za-z_].
+                Name identifier can contain only [A-Za-z_0-9].
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Za-z_]+" />
+            <xs:pattern value="[A-Za-z_0-9]+" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>