Skip to content

Commit 2771bb2

Browse files
author
Oleksii Korshenko
authored
Merge pull request #1016 from magento-engcom/develop-prs
Public Pull Requests #9108 #9170 #9061 #9095 #9044
2 parents 3cb0463 + 1101523 commit 2771bb2

File tree

23 files changed

+58
-45
lines changed

23 files changed

+58
-45
lines changed

app/code/Magento/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
'</option></config>',
3434
[
3535
"Element 'option', attribute 'renderer': [facet 'pattern'] The value 'true12' is not accepted by the " .
36-
"pattern '[a-zA-Z_\\\\\\\\]+'.\nLine: 1\n",
36+
"pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
3737
"Element 'option', attribute 'renderer': 'true12' is not a valid value of the atomic" .
3838
" type 'modelName'.\nLine: 1\n"
3939
],

app/code/Magento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
'<?xml version="1.0"?><config><type name="some_name" modelInstance="123" /></config>',
2424
[
2525
"Element 'type', attribute 'modelInstance': [facet 'pattern'] The value '123' is not accepted by the" .
26-
" pattern '[a-zA-Z_\\\\\\\\]+'.\nLine: 1\n",
26+
" pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
2727
"Element 'type', attribute 'modelInstance': '123' is not a valid value of the atomic type" .
2828
" 'modelName'.\nLine: 1\n"
2929
],
@@ -57,7 +57,7 @@
5757
'<?xml version="1.0"?><config><type name="some_name"><priceModel instance="123123" /></type></config>',
5858
[
5959
"Element 'priceModel', attribute 'instance': [facet 'pattern'] The value '123123' is not accepted " .
60-
"by the pattern '[a-zA-Z_\\\\\\\\]+'.\nLine: 1\n",
60+
"by the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
6161
"Element 'priceModel', attribute 'instance': '123123' is not a valid value of the atomic type" .
6262
" 'modelName'.\nLine: 1\n"
6363
],
@@ -66,7 +66,7 @@
6666
'<?xml version="1.0"?><config><type name="some_name"><indexerModel instance="123" /></type></config>',
6767
[
6868
"Element 'indexerModel', attribute 'instance': [facet 'pattern'] The value '123' is not accepted by " .
69-
"the pattern '[a-zA-Z_\\\\\\\\]+'.\nLine: 1\n",
69+
"the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
7070
"Element 'indexerModel', attribute 'instance': '123' is not a valid value of the atomic type" .
7171
" 'modelName'.\nLine: 1\n"
7272
],
@@ -83,7 +83,7 @@
8383
'<?xml version="1.0"?><config><type name="some_name"><stockIndexerModel instance="1234"/></type></config>',
8484
[
8585
"Element 'stockIndexerModel', attribute 'instance': [facet 'pattern'] The value '1234' is not " .
86-
"accepted by the pattern '[a-zA-Z_\\\\\\\\]+'.\nLine: 1\n",
86+
"accepted by the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
8787
"Element 'stockIndexerModel', attribute 'instance': '1234' is not a valid value of the atomic " .
8888
"type 'modelName'.\nLine: 1\n"
8989
],

app/code/Magento/Catalog/etc/product_options.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@
6161
<xs:simpleType name="modelName">
6262
<xs:annotation>
6363
<xs:documentation>
64-
Model name can contain only [a-zA-Z_\\\\].
64+
Model name can contain only [a-zA-Z_\\].
6565
</xs:documentation>
6666
</xs:annotation>
6767
<xs:restriction base="xs:string">
68-
<xs:pattern value="[a-zA-Z_\\\\]+" />
68+
<xs:pattern value="[a-zA-Z_\\]+" />
6969
</xs:restriction>
7070
</xs:simpleType>
7171
</xs:schema>

app/code/Magento/Catalog/etc/product_types_base.xsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@
9292
<xs:simpleType name="modelName">
9393
<xs:annotation>
9494
<xs:documentation>
95-
Model name can contain only [a-zA-Z_\\\\].
95+
Model name can contain only [a-zA-Z_\\].
9696
</xs:documentation>
9797
</xs:annotation>
9898
<xs:restriction base="xs:string">
99-
<xs:pattern value="[a-zA-Z_\\\\]+" />
99+
<xs:pattern value="[a-zA-Z_\\]+" />
100100
</xs:restriction>
101101
</xs:simpleType>
102102
</xs:schema>

app/code/Magento/Config/Test/Unit/Model/Config/_files/invalidSystemXmlArray.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"Element 'config_path': [facet 'minLength'] The value has a length of '2'; this underruns " .
6464
"the allowed minimum length of '5'.\nLine: 1\n",
6565
"Element 'config_path': [facet 'pattern'] The value 'co' is not " .
66-
"accepted by the pattern '[a-zA-Z0-9_\\\\\\\\]+/[a-zA-Z0-9_\\\\\\\\]+/[a-zA-Z0-9_\\\\\\\\]+'.\nLine: 1\n",
66+
"accepted by the pattern '[a-zA-Z0-9_\\\\]+/[a-zA-Z0-9_\\\\]+/[a-zA-Z0-9_\\\\]+'.\nLine: 1\n",
6767
"Element 'config_path': 'co' is " . "not a valid value of the atomic type 'typeConfigPath'.\nLine: 1\n"
6868
],
6969
],
@@ -76,7 +76,7 @@
7676
"Element 'if_module_enabled': [facet 'minLength'] The value has a length of '3'; this underruns the " .
7777
"allowed minimum length of '5'.\nLine: 1\n",
7878
"Element 'if_module_enabled': [facet 'pattern'] The value 'Som' is not " .
79-
"accepted by the pattern '[A-Z]+[a-zA-Z0-9]{1,}[_\\\\\\\\][A-Z]+[A-Z0-9a-z]{1,}'.\nLine: 1\n",
79+
"accepted by the pattern '[A-Z]+[a-zA-Z0-9]{1,}[_\\\\][A-Z]+[A-Z0-9a-z]{1,}'.\nLine: 1\n",
8080
"Element 'if_module_enabled': 'Som' " . "is not a valid value of the atomic type 'typeModule'.\nLine: 1\n"
8181
],
8282
],

app/code/Magento/Config/etc/system.xsd

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
</xs:annotation>
318318

319319
<xs:restriction base="xs:string">
320-
<xs:pattern value="[a-zA-Z0-9_///\\\\*]{3,}" />
320+
<xs:pattern value="[a-zA-Z0-9_///\\*]{3,}" />
321321
<xs:minLength value="3" />
322322
</xs:restriction>
323323
</xs:simpleType>
@@ -395,7 +395,7 @@
395395
</xs:annotation>
396396

397397
<xs:restriction base="xs:string">
398-
<xs:pattern value="[a-zA-Z0-9_\\\\]{1,}" />
398+
<xs:pattern value="[a-zA-Z0-9_\\]{1,}" />
399399
<xs:minLength value="3" />
400400
</xs:restriction>
401401
</xs:simpleType>
@@ -408,7 +408,7 @@
408408
</xs:annotation>
409409

410410
<xs:restriction base="xs:string">
411-
<xs:pattern value="[a-zA-Z0-9_\\\\]{1,}" />
411+
<xs:pattern value="[a-zA-Z0-9_\\]{1,}" />
412412
<xs:minLength value="2" />
413413
</xs:restriction>
414414
</xs:simpleType>
@@ -433,7 +433,7 @@
433433
</xs:documentation>
434434
</xs:annotation>
435435
<xs:restriction base="xs:string">
436-
<xs:pattern value="[A-Z]+[a-zA-Z0-9]{1,}[_\\\\][A-Z]+[A-Z0-9a-z]{1,}" />
436+
<xs:pattern value="[A-Z]+[a-zA-Z0-9]{1,}[_\\][A-Z]+[A-Z0-9a-z]{1,}" />
437437
<xs:minLength value="5" />
438438
</xs:restriction>
439439
</xs:simpleType>
@@ -445,7 +445,7 @@
445445
</xs:documentation>
446446
</xs:annotation>
447447
<xs:restriction base="xs:string">
448-
<xs:pattern value="[A-Za-z0-9_\\\\:]+" />
448+
<xs:pattern value="[A-Za-z0-9_\\:]+" />
449449
<xs:minLength value="5" />
450450
</xs:restriction>
451451
</xs:simpleType>
@@ -473,14 +473,14 @@
473473
</xs:documentation>
474474
</xs:annotation>
475475
<xs:restriction base="xs:string">
476-
<xs:pattern value="[a-zA-Z0-9_\\\\]+/[a-zA-Z0-9_\\\\]+/[a-zA-Z0-9_\\\\]+" />
476+
<xs:pattern value="[a-zA-Z0-9_\\]+/[a-zA-Z0-9_\\]+/[a-zA-Z0-9_\\]+" />
477477
<xs:minLength value="5" />
478478
</xs:restriction>
479479
</xs:simpleType>
480480

481481
<xs:simpleType name="typeUploadDirRestriction">
482482
<xs:restriction base="xs:string">
483-
<xs:pattern value="([a-zA-Z0-9_\\\\]+/{0,1}){1,}" />
483+
<xs:pattern value="([a-zA-Z0-9_\\]+/{0,1}){1,}" />
484484
</xs:restriction>
485485
</xs:simpleType>
486486
<xs:complexType name="typeUploadDir">

app/code/Magento/Config/etc/system_file.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@
474474
</xs:documentation>
475475
</xs:annotation>
476476
<xs:restriction base="xs:string">
477-
<xs:pattern value="[A-Za-z0-9\\\\:]+" />
477+
<xs:pattern value="[A-Za-z0-9\\:]+" />
478478
<xs:minLength value="5" />
479479
</xs:restriction>
480480
</xs:simpleType>

app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-downloadable-products-link">
1212
<arguments>
1313
<argument name="path" xsi:type="string">downloadable/customer/products</argument>
14-
<argument name="label" xsi:type="string">My Downloadable Products</argument>
14+
<argument name="label" xsi:type="string" translate="true">My Downloadable Products</argument>
1515
<argument name="sortOrder" xsi:type="number">220</argument>
1616
</arguments>
1717
</block>

app/code/Magento/ImportExport/Test/Unit/Model/Export/Config/_files/invalidExportXmlArray.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
. ' <fileFormat name="name_one" model="model1"/></config>',
2626
[
2727
"Element 'entityType', attribute 'model': [facet 'pattern'] The value '1' is not accepted by the " .
28-
"pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n",
28+
"pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
2929
"Element 'entityType', attribute 'model': '1' is not a valid value of the atomic type" .
3030
" 'modelName'.\nLine: 1\n",
3131
"Element 'fileFormat', attribute 'model': [facet 'pattern'] The value 'model1' is not " .
32-
"accepted by the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n",
32+
"accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
3333
"Element 'fileFormat', attribute 'model': 'model1' is not a valid " .
3434
"value of the atomic type 'modelName'.\nLine: 1\n"
3535
],

app/code/Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
'behaviorModel="test" /></config>',
3131
[
3232
"Element 'entity', attribute 'model': [facet 'pattern'] The value 'afwer34' is not " .
33-
"accepted by the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n",
33+
"accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
3434
"Element 'entity', attribute 'model': 'afwer34' is not a valid value of the atomic type" .
3535
" 'modelName'.\nLine: 1\n"
3636
],
@@ -40,7 +40,7 @@
4040
'</config>',
4141
[
4242
"Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '666' is not accepted by " .
43-
"the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n",
43+
"the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
4444
"Element 'entity', attribute 'behaviorModel': '666' is not a valid value of the atomic type" .
4545
" 'modelName'.\nLine: 1\n"
4646
],

0 commit comments

Comments
 (0)