Merge pull request #1016 from magento-engcom/develop-prs

Public Pull Requests #9108 #9170 #9061 #9095 #9044
magento · Apr 11, 2017 · 2771bb2 · 2771bb2
2 parents 3cb0463 + 1101523
commit 2771bb2
Show file tree

Hide file tree

Showing 23 changed files with 58 additions and 45 deletions.
diff --git a/...to/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php b/...to/Catalog/Test/Unit/Model/ProductOptions/Config/_files/invalidProductOptionsXmlArray.php
@@ -33,7 +33,7 @@
         '</option></config>',
         [
             "Element 'option', attribute 'renderer': [facet 'pattern'] The value 'true12' is not accepted by the " .
-            "pattern '[a-zA-Z_\\\\\\\\]+'.\nLine: 1\n",
+            "pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
             "Element 'option', attribute 'renderer': 'true12' is not a valid value of the atomic" .
             " type 'modelName'.\nLine: 1\n"
         ],

diff --git a/...agento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php b/...agento/Catalog/Test/Unit/Model/ProductTypes/Config/_files/invalidProductTypesXmlArray.php
@@ -23,7 +23,7 @@
         '<?xml version="1.0"?><config><type name="some_name" modelInstance="123" /></config>',
         [
             "Element 'type', attribute 'modelInstance': [facet 'pattern'] The value '123' is not accepted by the" .
-            " pattern '[a-zA-Z_\\\\\\\\]+'.\nLine: 1\n",
+            " pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
             "Element 'type', attribute 'modelInstance': '123' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -57,7 +57,7 @@
         '<?xml version="1.0"?><config><type name="some_name"><priceModel instance="123123" /></type></config>',
         [
             "Element 'priceModel', attribute 'instance': [facet 'pattern'] The value '123123' is not accepted " .
-            "by the pattern '[a-zA-Z_\\\\\\\\]+'.\nLine: 1\n",
+            "by the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
             "Element 'priceModel', attribute 'instance': '123123' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -66,7 +66,7 @@
         '<?xml version="1.0"?><config><type name="some_name"><indexerModel instance="123" /></type></config>',
         [
             "Element 'indexerModel', attribute 'instance': [facet 'pattern'] The value '123' is not accepted by " .
-            "the pattern '[a-zA-Z_\\\\\\\\]+'.\nLine: 1\n",
+            "the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
             "Element 'indexerModel', attribute 'instance': '123' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -83,7 +83,7 @@
         '<?xml version="1.0"?><config><type name="some_name"><stockIndexerModel instance="1234"/></type></config>',
         [
             "Element 'stockIndexerModel', attribute 'instance': [facet 'pattern'] The value '1234' is not " .
-            "accepted by the pattern '[a-zA-Z_\\\\\\\\]+'.\nLine: 1\n",
+            "accepted by the pattern '[a-zA-Z_\\\\]+'.\nLine: 1\n",
             "Element 'stockIndexerModel', attribute 'instance': '1234' is not a valid value of the atomic " .
             "type 'modelName'.\nLine: 1\n"
         ],

diff --git a/app/code/Magento/Catalog/etc/product_options.xsd b/app/code/Magento/Catalog/etc/product_options.xsd
@@ -61,11 +61,11 @@
     <xs:simpleType name="modelName">
         <xs:annotation>
             <xs:documentation>
-                Model name can contain only [a-zA-Z_\\\\].
+                Model name can contain only [a-zA-Z_\\].
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z_\\\\]+" />
+            <xs:pattern value="[a-zA-Z_\\]+" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>
diff --git a/app/code/Magento/Catalog/etc/product_types_base.xsd b/app/code/Magento/Catalog/etc/product_types_base.xsd
@@ -92,11 +92,11 @@
     <xs:simpleType name="modelName">
         <xs:annotation>
             <xs:documentation>
-                Model name can contain only [a-zA-Z_\\\\].
+                Model name can contain only [a-zA-Z_\\].
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z_\\\\]+" />
+            <xs:pattern value="[a-zA-Z_\\]+" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/_files/invalidSystemXmlArray.php b/app/code/Magento/Config/Test/Unit/Model/Config/_files/invalidSystemXmlArray.php
@@ -63,7 +63,7 @@
             "Element 'config_path': [facet 'minLength'] The value has a length of '2'; this underruns " .
             "the allowed minimum length of '5'.\nLine: 1\n",
             "Element 'config_path': [facet 'pattern'] The value 'co' is not " .
-            "accepted by the pattern '[a-zA-Z0-9_\\\\\\\\]+/[a-zA-Z0-9_\\\\\\\\]+/[a-zA-Z0-9_\\\\\\\\]+'.\nLine: 1\n",
+            "accepted by the pattern '[a-zA-Z0-9_\\\\]+/[a-zA-Z0-9_\\\\]+/[a-zA-Z0-9_\\\\]+'.\nLine: 1\n",
             "Element 'config_path': 'co' is " . "not a valid value of the atomic type 'typeConfigPath'.\nLine: 1\n"
         ],
     ],
@@ -76,7 +76,7 @@
             "Element 'if_module_enabled': [facet 'minLength'] The value has a length of '3'; this underruns the " .
             "allowed minimum length of '5'.\nLine: 1\n",
             "Element 'if_module_enabled': [facet 'pattern'] The value 'Som' is not " .
-            "accepted by the pattern '[A-Z]+[a-zA-Z0-9]{1,}[_\\\\\\\\][A-Z]+[A-Z0-9a-z]{1,}'.\nLine: 1\n",
+            "accepted by the pattern '[A-Z]+[a-zA-Z0-9]{1,}[_\\\\][A-Z]+[A-Z0-9a-z]{1,}'.\nLine: 1\n",
             "Element 'if_module_enabled': 'Som' " . "is not a valid value of the atomic type 'typeModule'.\nLine: 1\n"
         ],
     ],

diff --git a/app/code/Magento/Config/etc/system.xsd b/app/code/Magento/Config/etc/system.xsd
@@ -317,7 +317,7 @@
         </xs:annotation>
 
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z0-9_///\\\\*]{3,}" />
+            <xs:pattern value="[a-zA-Z0-9_///\\*]{3,}" />
             <xs:minLength value="3" />
         </xs:restriction>
     </xs:simpleType>
@@ -395,7 +395,7 @@
         </xs:annotation>
 
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z0-9_\\\\]{1,}" />
+            <xs:pattern value="[a-zA-Z0-9_\\]{1,}" />
             <xs:minLength value="3" />
         </xs:restriction>
     </xs:simpleType>
@@ -408,7 +408,7 @@
         </xs:annotation>
 
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z0-9_\\\\]{1,}" />
+            <xs:pattern value="[a-zA-Z0-9_\\]{1,}" />
             <xs:minLength value="2" />
         </xs:restriction>
     </xs:simpleType>
@@ -433,7 +433,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Z]+[a-zA-Z0-9]{1,}[_\\\\][A-Z]+[A-Z0-9a-z]{1,}" />
+            <xs:pattern value="[A-Z]+[a-zA-Z0-9]{1,}[_\\][A-Z]+[A-Z0-9a-z]{1,}" />
             <xs:minLength value="5" />
         </xs:restriction>
     </xs:simpleType>
@@ -445,7 +445,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Za-z0-9_\\\\:]+" />
+            <xs:pattern value="[A-Za-z0-9_\\:]+" />
             <xs:minLength value="5" />
         </xs:restriction>
     </xs:simpleType>
@@ -473,14 +473,14 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[a-zA-Z0-9_\\\\]+/[a-zA-Z0-9_\\\\]+/[a-zA-Z0-9_\\\\]+" />
+            <xs:pattern value="[a-zA-Z0-9_\\]+/[a-zA-Z0-9_\\]+/[a-zA-Z0-9_\\]+" />
             <xs:minLength value="5" />
         </xs:restriction>
     </xs:simpleType>
 
     <xs:simpleType name="typeUploadDirRestriction">
         <xs:restriction base="xs:string">
-            <xs:pattern value="([a-zA-Z0-9_\\\\]+/{0,1}){1,}" />
+            <xs:pattern value="([a-zA-Z0-9_\\]+/{0,1}){1,}" />
         </xs:restriction>
     </xs:simpleType>
     <xs:complexType name="typeUploadDir">

diff --git a/app/code/Magento/Config/etc/system_file.xsd b/app/code/Magento/Config/etc/system_file.xsd
@@ -474,7 +474,7 @@
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Za-z0-9\\\\:]+" />
+            <xs:pattern value="[A-Za-z0-9\\:]+" />
             <xs:minLength value="5" />
         </xs:restriction>
     </xs:simpleType>

diff --git a/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml b/app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
@@ -11,7 +11,7 @@
             <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-downloadable-products-link">
                 <arguments>
                     <argument name="path" xsi:type="string">downloadable/customer/products</argument>
-                    <argument name="label" xsi:type="string">My Downloadable Products</argument>
+                    <argument name="label" xsi:type="string" translate="true">My Downloadable Products</argument>
                     <argument name="sortOrder" xsi:type="number">220</argument>
                 </arguments>
             </block>

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
@@ -25,11 +25,11 @@
             . ' <fileFormat name="name_one" model="model1"/></config>',
         [
             "Element 'entityType', attribute 'model': [facet 'pattern'] The value '1' is not accepted by the " .
-            "pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n",
+            "pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
             "Element 'entityType', attribute 'model': '1' 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",
+            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
             "Element 'fileFormat', attribute 'model': 'model1' is not a valid " .
             "value of the atomic type 'modelName'.\nLine: 1\n"
         ],

diff --git a/...Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php b/...Magento/ImportExport/Test/Unit/Model/Import/Config/_files/invalidImportMergedXmlArray.php
@@ -30,7 +30,7 @@
         'behaviorModel="test" /></config>',
         [
             "Element 'entity', attribute 'model': [facet 'pattern'] The value 'afwer34' is not " .
-            "accepted by the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n",
+            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
             "Element 'entity', attribute 'model': 'afwer34' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -40,7 +40,7 @@
         '</config>',
         [
             "Element 'entity', attribute 'behaviorModel': [facet 'pattern'] The value '666' is not accepted by " .
-            "the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n",
+            "the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
             "Element 'entity', attribute 'behaviorModel': '666' 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
@@ -19,7 +19,7 @@
         '<?xml version="1.0"?><config><entity name="some_name" model="12345"/></config>',
         [
             "Element 'entity', attribute 'model': [facet 'pattern'] The value '12345' is not accepted by " .
-            "the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n",
+            "the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
             "Element 'entity', attribute 'model': '12345' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -28,7 +28,7 @@
         '<?xml version="1.0"?><config><entity name="some_name" behaviorModel="=--09"/></config>',
         [
             "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_\\\\]+'.\nLine: 1\n",
             "Element 'entity', attribute 'behaviorModel': '=--09' is not a valid value of the atomic type" .
             " 'modelName'.\nLine: 1\n"
         ],
@@ -49,7 +49,7 @@
         '<?xml version="1.0"?><config><entityType entity="entity_name" name="some_name" model="test1"/></config>',
         [
             "Element 'entityType', attribute 'model': [facet 'pattern'] The value 'test1' is not " .
-            "accepted by the pattern '[A-Za-z_\\\\\\\\]+'.\nLine: 1\n",
+            "accepted by the pattern '[A-Za-z_\\\\]+'.\nLine: 1\n",
             "Element 'entityType', attribute 'model': 'test1' 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
@@ -71,11 +71,11 @@
     <xs:simpleType name="modelName">
         <xs:annotation>
             <xs:documentation>
-                Model name can contain only [A-Za-z_\\\\].
+                Model name can contain only [A-Za-z_\\].
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Za-z_\\\\]+" />
+            <xs:pattern value="[A-Za-z_\\]+" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>
diff --git a/app/code/Magento/ImportExport/etc/import.xsd b/app/code/Magento/ImportExport/etc/import.xsd
@@ -61,11 +61,11 @@
     <xs:simpleType name="modelName">
         <xs:annotation>
             <xs:documentation>
-                Model name can contain only [A-Za-z_\\\\].
+                Model name can contain only [A-Za-z_\\].
             </xs:documentation>
         </xs:annotation>
         <xs:restriction base="xs:string">
-            <xs:pattern value="[A-Za-z_\\\\]+" />
+            <xs:pattern value="[A-Za-z_\\]+" />
         </xs:restriction>
     </xs:simpleType>
 </xs:schema>
diff --git a/app/code/Magento/Quote/Model/Quote.php b/app/code/Magento/Quote/Model/Quote.php
@@ -329,7 +329,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
     protected $totalsCollector;
 
     /**
-     * @var \\Magento\Quote\Model\Quote\TotalsReader
+     * @var \Magento\Quote\Model\Quote\TotalsReader
      */
     protected $totalsReader;
 

diff --git a/app/code/Magento/Review/view/frontend/layout/customer_account.xml b/app/code/Magento/Review/view/frontend/layout/customer_account.xml
@@ -11,7 +11,7 @@
             <block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-product-reviews-link">
                 <arguments>
                     <argument name="path" xsi:type="string">review/customer</argument>
-                    <argument name="label" xsi:type="string">My Product Reviews</argument>
+                    <argument name="label" xsi:type="string" translate="true">My Product Reviews</argument>
                     <argument name="sortOrder" xsi:type="number">50</argument>
                 </arguments>
             </block>

diff --git a/app/code/Magento/Rss/view/frontend/layout/default.xml b/app/code/Magento/Rss/view/frontend/layout/default.xml
@@ -10,7 +10,7 @@
         <referenceBlock name="footer_links">
             <block class="Magento\Framework\View\Element\Html\Link\Current" name="rss-link" ifconfig="rss/config/active">
                 <arguments>
-                    <argument name="label" xsi:type="string">RSS</argument>
+                    <argument name="label" xsi:type="string" translate="true">RSS</argument>
                     <argument name="path" xsi:type="string">rss</argument>
                 </arguments>
             </block>

diff --git a/app/code/Magento/Sales/etc/crontab.xml b/app/code/Magento/Sales/etc/crontab.xml
@@ -28,28 +28,28 @@
             <schedule>0 0 * * *</schedule>
         </job>
         <job name="sales_grid_order_async_insert" instance="SalesOrderIndexGridAsyncInsertCron" method="execute">
-            <schedule>*/1 * * * *</schedule>
+            <schedule>* * * * *</schedule>
         </job>
         <job name="sales_grid_order_invoice_async_insert" instance="SalesInvoiceIndexGridAsyncInsertCron" method="execute">
-            <schedule>*/1 * * * *</schedule>
+            <schedule>* * * * *</schedule>
         </job>
         <job name="sales_grid_order_shipment_async_insert" instance="SalesShipmentIndexGridAsyncInsertCron" method="execute">
-            <schedule>*/1 * * * *</schedule>
+            <schedule>* * * * *</schedule>
         </job>
         <job name="sales_grid_order_creditmemo_async_insert" instance="SalesCreditmemoIndexGridAsyncInsertCron" method="execute">
-            <schedule>*/1 * * * *</schedule>
+            <schedule>* * * * *</schedule>
         </job>
         <job name="sales_send_order_emails" instance="SalesOrderSendEmailsCron" method="execute">
-            <schedule>*/1 * * * *</schedule>
+            <schedule>* * * * *</schedule>
         </job>
         <job name="sales_send_order_invoice_emails" instance="SalesInvoiceSendEmailsCron" method="execute">
-            <schedule>*/1 * * * *</schedule>
+            <schedule>* * * * *</schedule>
         </job>
         <job name="sales_send_order_shipment_emails" instance="SalesShipmentSendEmailsCron" method="execute">
-            <schedule>*/1 * * * *</schedule>
+            <schedule>* * * * *</schedule>
         </job>
         <job name="sales_send_order_creditmemo_emails" instance="SalesCreditmemoSendEmailsCron" method="execute">
-            <schedule>*/1 * * * *</schedule>
+            <schedule>* * * * *</schedule>
         </job>
     </group>
 </config>
diff --git a/app/code/Magento/Shipping/i18n/en_US.csv b/app/code/Magento/Shipping/i18n/en_US.csv
@@ -180,3 +180,4 @@ City,City
 "Shipping Policy","Shipping Policy"
 "Shipping Methods","Shipping Methods"
 "Track your order","Track your order"
+"Track All Shipments","Track All Shipments"
diff --git a/app/code/Magento/Shipping/view/frontend/layout/sales_guest_shipment.xml b/app/code/Magento/Shipping/view/frontend/layout/sales_guest_shipment.xml
@@ -14,7 +14,7 @@
                     <block class="Magento\Framework\View\Element\RendererList" name="sales.order.shipment.renderers" as="renderer.list"/>
                     <block class="Magento\Shipping\Block\Tracking\Link" name="track-all-link" template="Magento_Shipping::tracking/link.phtml">
                         <arguments>
-                            <argument name="label" xsi:type="string">Track All Shipments</argument>
+                            <argument name="label" xsi:type="string" translate="true">Track All Shipments</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Sales\Block\Order\Comments" name="shipment_comments" template="Magento_Sales::order/comments.phtml"/>

diff --git a/app/code/Magento/Shipping/view/frontend/layout/sales_order_shipment.xml b/app/code/Magento/Shipping/view/frontend/layout/sales_order_shipment.xml
@@ -14,7 +14,7 @@
                     <block class="Magento\Framework\View\Element\RendererList" name="sales.order.shipment.renderers" as="renderer.list"/>
                     <block class="Magento\Shipping\Block\Tracking\Link" name="track-all-link" template="Magento_Shipping::tracking/link.phtml">
                         <arguments>
-                            <argument name="label" xsi:type="string">Track All Shipments</argument>
+                            <argument name="label" xsi:type="string" translate="true">Track All Shipments</argument>
                         </arguments>
                     </block>
                     <block class="Magento\Sales\Block\Order\Comments" name="shipment_comments" template="Magento_Sales::order/comments.phtml"/>

diff --git a/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml b/app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml
@@ -11,7 +11,7 @@
             <block class="Magento\Customer\Block\Account\SortLinkInterface" ifconfig="wishlist/general/active" name="customer-account-navigation-wish-list-link">
                 <arguments>
                     <argument name="path" xsi:type="string">wishlist</argument>
-                    <argument name="label" xsi:type="string">My Wish List</argument>
+                    <argument name="label" xsi:type="string" translate="true">My Wish List</argument>
                     <argument name="sortOrder" xsi:type="number">210</argument>
                 </arguments>
             </block>

diff --git a/lib/internal/Magento/Framework/App/Config.php b/lib/internal/Magento/Framework/App/Config.php
@@ -95,6 +95,7 @@ public function isSetFlag($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAU
 
     /**
      * Invalidate cache by type
+     * Clean scopeCodeResolver
      *
      * @return void
      */
@@ -103,6 +104,7 @@ public function clean()
         foreach ($this->types as $type) {
             $type->clean();
         }
+        $this->scopeCodeResolver->clean();
     }
 
     /**

diff --git a/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php b/lib/internal/Magento/Framework/App/Config/ScopeCodeResolver.php
@@ -58,4 +58,14 @@ public function resolve($scopeType, $scopeCode)
         $this->resolvedScopeCodes[$scopeType][$scopeCode] = $resolverScopeCode;
         return $resolverScopeCode;
     }
+
+    /**
+     * Clean resolvedScopeCodes, store codes may have been renamed
+     *
+     * @return void
+     */
+    public function clean()
+    {
+        $this->resolvedScopeCodes = [];
+    }
 }