diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php index 707bb6932569c..b87481be98f11 100644 --- a/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php +++ b/app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php @@ -21,16 +21,16 @@ ], 'attributes_with_type_modelName_and_invalid_value' => [ '' - . ' ', + . 'entityAttributeFilterType="model_one"/>' + . ' ', [ - "Element 'entityType', attribute 'model': [facet 'pattern'] The value '1' is not accepted by the " . - "pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n", - "Element 'entityType', attribute 'model': '1' is not a valid value of the atomic type" . + "Element 'entityType', attribute 'model': [facet 'pattern'] The value '-' is not accepted by the " . + "pattern '[A-Za-z_0-9\\\\\\\\]+'.\nLine: 1\n", + "Element 'entityType', attribute 'model': '-' is not a valid value of the atomic type" . " 'modelName'.\nLine: 1\n", - "Element 'fileFormat', attribute 'model': [facet 'pattern'] The value 'model1' is not " . - "accepted by the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n", - "Element 'fileFormat', attribute 'model': 'model1' is not a valid " . + "Element 'fileFormat', attribute 'model': [facet 'pattern'] The value 'model-1' is not " . + "accepted by the pattern '[A-Za-z_0-9\\\\\\\\]+'.\nLine: 1\n", + "Element 'fileFormat', attribute 'model': 'model-1' is not a valid " . "value of the atomic type 'modelName'.\nLine: 1\n" ], ], diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php index f63163d5f5f6b..4ab68faff439d 100644 --- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php +++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php @@ -26,22 +26,22 @@ ["Element 'entity', attribute 'notallowed': The attribute 'notallowed' is not allowed.\nLine: 1\n"], ], 'entity_model_with_invalid_value' => [ - '', [ - "Element 'entity', attribute 'model': [facet 'pattern'] The value 'afwer34' is not " . - "accepted by the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n", - "Element 'entity', attribute 'model': 'afwer34' is not a valid value of the atomic type" . + "Element 'entity', attribute 'model': [facet 'pattern'] The value 'afwer-blam' is not " . + "accepted by the pattern '[A-Za-z_0-9\\\\\\\\]+'.\nLine: 1\n", + "Element 'entity', attribute 'model': 'afwer-blam' is not a valid value of the atomic type" . " 'modelName'.\nLine: 1\n" ], ], 'entity_behaviorModel_with_invalid_value' => [ - '' . - '', + '', [ - "Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '666' is not accepted by " . - "the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n", - "Element 'entity', attribute 'behaviorModel': '666' is not a valid value of the atomic type" . + "Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '6-66' is not accepted by " . + "the pattern '[A-Za-z_0-9\\\\\\\\]+'.\nLine: 1\n", + "Element 'entity', attribute 'behaviorModel': '6-66' is not a valid value of the atomic type" . " 'modelName'.\nLine: 1\n" ], ] diff --git a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php index e68335b48f6e2..24edebbafb7c9 100644 --- a/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php +++ b/app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportXmlArray.php @@ -16,11 +16,11 @@ ["Element 'entity': The attribute 'name' is required but missing.\nLine: 1\n"], ], 'entity_with_invalid_model_value' => [ - '', + '', [ - "Element 'entity', attribute 'model': [facet 'pattern'] The value '12345' is not accepted by " . - "the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n", - "Element 'entity', attribute 'model': '12345' is not a valid value of the atomic type" . + "Element 'entity', attribute 'model': [facet 'pattern'] The value '123-45' is not accepted by " . + "the pattern '[A-Za-z_0-9\\\\\\\\]+'.\nLine: 1\n", + "Element 'entity', attribute 'model': '123-45' is not a valid value of the atomic type" . " 'modelName'.\nLine: 1\n" ], ], @@ -28,7 +28,7 @@ '', [ "Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '=--09' is not " . - "accepted by the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n", + "accepted by the pattern '[A-Za-z_0-9\\\\\\\\]+'.\nLine: 1\n", "Element 'entity', attribute 'behaviorModel': '=--09' is not a valid value of the atomic type" . " 'modelName'.\nLine: 1\n" ], @@ -46,11 +46,11 @@ ["Element 'entityType': The attribute 'model' is required but missing.\nLine: 1\n"], ], 'entitytype_with_invalid_model_attribute_value' => [ - '', + '', [ - "Element 'entityType', attribute 'model': [facet 'pattern'] The value 'test1' is not " . - "accepted by the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n", - "Element 'entityType', attribute 'model': 'test1' is not a valid value of the atomic type" . + "Element 'entityType', attribute 'model': [facet 'pattern'] The value 'test-1' is not " . + "accepted by the pattern '[A-Za-z_0-9\\\\\\\\]+'.\nLine: 1\n", + "Element 'entityType', attribute 'model': 'test-1' is not a valid value of the atomic type" . " 'modelName'.\nLine: 1\n" ], ], diff --git a/app/code/Magento/ImportExport/etc/export.xsd b/app/code/Magento/ImportExport/etc/export.xsd index c7316873d8998..c3f2456d8fefe 100644 --- a/app/code/Magento/ImportExport/etc/export.xsd +++ b/app/code/Magento/ImportExport/etc/export.xsd @@ -71,11 +71,11 @@ - Model name can contain only [A-Za-z_\\\\]. + Model name can contain only [A-Za-z_0-9\\\\]. - + diff --git a/app/code/Magento/ImportExport/etc/import.xsd b/app/code/Magento/ImportExport/etc/import.xsd index 2d6ab40c3c895..5aba1a69fb21f 100644 --- a/app/code/Magento/ImportExport/etc/import.xsd +++ b/app/code/Magento/ImportExport/etc/import.xsd @@ -61,11 +61,11 @@ - Model name can contain only [A-Za-z_\\\\]. + Model name can contain only [A-Za-z_0-9\\\\]. - +