diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 1a5f1ec85b99f..3da59d72c118a 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -181,7 +181,7 @@
-
+
Magento\Config\Model\Config\Source\Image\Adapter
Magento\Config\Model\Config\Backend\Image\Adapter
@@ -298,11 +298,11 @@
Magento\Config\Model\Config\Source\Yesno
-
+
For Windows server only.
-
+
For Windows server only.
@@ -419,7 +419,7 @@
Warning! When using Store Code in URLs, in some cases system may not work properly if URLs without Store Codes are specified in the third-party services (e.g. PayPal etc.).]]>
-
+
Magento\Config\Model\Config\Source\Web\Redirect
I.e. redirect from http://example.com/store/ to http://www.example.com/store/
@@ -432,7 +432,7 @@
Magento\Config\Model\Config\Source\Yesno
-
+
Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. http://example.com/magento/
@@ -440,7 +440,7 @@
Magento\Config\Model\Config\Backend\Baseurl
Specify URL or {{base_url}} placeholder.
-
+
Magento\Config\Model\Config\Backend\Baseurl
May start with {{unsecure_base_url}} placeholder.
@@ -450,13 +450,13 @@
Magento\Config\Model\Config\Backend\Baseurl
May be empty or start with {{unsecure_base_url}} placeholder.
-
+
Magento\Config\Model\Config\Backend\Baseurl
May be empty or start with {{unsecure_base_url}} placeholder.
-
+
Any of the fields allow fully qualified URLs that end with '/' (slash) e.g. https://example.com/magento/
@@ -464,7 +464,7 @@
Magento\Config\Model\Config\Backend\Baseurl
Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.
-
+
Magento\Config\Model\Config\Backend\Baseurl
May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.
@@ -474,24 +474,24 @@
Magento\Config\Model\Config\Backend\Baseurl
May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.
-
+
Magento\Config\Model\Config\Backend\Baseurl
May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.
-
+
Magento\Config\Model\Config\Source\Yesno
Magento\Config\Model\Config\Backend\Secure
Enter https protocol to use Secure URLs on Storefront.
-
+
Magento\Config\Model\Config\Source\Yesno
Magento\Config\Model\Config\Backend\Secure
Enter https protocol to use Secure URLs in Admin.
-
+
Magento\Config\Model\Config\Source\Yesno
Magento\Config\Model\Config\Backend\Secure
@@ -501,7 +501,7 @@
1
-
+
Magento\Config\Model\Config\Source\Yesno
Magento\Config\Model\Config\Backend\Secure
diff --git a/app/code/Magento/Braintree/etc/adminhtml/system.xml b/app/code/Magento/Braintree/etc/adminhtml/system.xml
index c49402070f0fd..5215dbc00b7ef 100644
--- a/app/code/Magento/Braintree/etc/adminhtml/system.xml
+++ b/app/code/Magento/Braintree/etc/adminhtml/system.xml
@@ -84,18 +84,18 @@
payment/braintree_cc_vault/title
-
+
If you don't specify the merchant account to use to process a transaction, Braintree will process it using your default merchant account.
payment/braintree/merchant_account_id
-
+
Magento\Config\Model\Config\Source\Yesno
Be sure to Enable Advanced Fraud Protection in Your Braintree Account in Settings/Processing Section
payment/braintree/fraudprotection
-
+
accounts@braintreepayments.com to setup your Kount account.]]>
@@ -108,7 +108,7 @@
Magento\Config\Model\Config\Source\Yesno
payment/braintree/debug
-
+
Magento\Config\Model\Config\Source\Yesno
Be sure to Enable AVS and/or CVV in Your Braintree Account in Settings/Processing Section.
@@ -149,7 +149,7 @@
Magento\Config\Block\System\Config\Form\Fieldset
-
+
payment/braintree_paypal/title
It is recommended to set this value to "PayPal" per store views.
@@ -187,7 +187,7 @@
1
payment/braintree_paypal/specificcountry
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/require_billing_address
@@ -203,7 +203,7 @@
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/debug
-
+
Magento\Config\Model\Config\Source\Yesno
payment/braintree_paypal/display_on_shopping_cart
@@ -239,14 +239,14 @@
payment/braintree/verify_specific_countries
-
+
Braintree Support.]]>
Magento\Config\Block\System\Config\Form\Fieldset
-
+
payment/braintree/descriptor_name
@@ -254,14 +254,14 @@
and the product descriptor can be up to 18, 14, or 9 characters respectively (with an * in between for a total descriptor name of 22 characters).
-
+
payment/braintree/descriptor_phone
The value in the phone number field of a customer's statement. Phone must be 10-14 characters and can only contain numbers, dashes, parentheses and periods.
-
+
payment/braintree/descriptor_url
diff --git a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
index c0a091ca2d0d9..027c9a9085b47 100644
--- a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
+++ b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
@@ -13,7 +13,7 @@ class DefaultCaptcha extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'default.phtml';
+ protected $_template = 'Magento_Captcha::default.phtml';
/**
* @var string
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php
index 69618f04eb2af..c718563d7576e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/AssignProducts.php
@@ -13,7 +13,7 @@ class AssignProducts extends \Magento\Backend\Block\Template
*
* @var string
*/
- protected $_template = 'catalog/category/edit/assign_products.phtml';
+ protected $_template = 'Magento_Catalog::catalog/category/edit/assign_products.phtml';
/**
* @var \Magento\Catalog\Block\Adminhtml\Category\Tab\Product
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
index 12b468ee445aa..ed615b41644e2 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php
@@ -29,7 +29,7 @@ class Tree extends \Magento\Catalog\Block\Adminhtml\Category\AbstractCategory
/**
* @var string
*/
- protected $_template = 'catalog/category/tree.phtml';
+ protected $_template = 'Magento_Catalog::catalog/category/tree.phtml';
/**
* @var \Magento\Backend\Model\Auth\Session
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
index b5330ab66af71..9c83d4aea61c7 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php
@@ -24,7 +24,7 @@ class Chooser extends \Magento\Catalog\Block\Adminhtml\Category\Tree
*
* @var string
*/
- protected $_template = 'catalog/category/widget/tree.phtml';
+ protected $_template = 'Magento_Catalog::catalog/category/widget/tree.phtml';
/**
* @return void
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index 6760b44c22ee1..1b188de40710f 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -22,7 +22,7 @@ class Main extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'catalog/product/attribute/set/main.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
index cf8de44c3d9df..93c2dcc76263c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main/Tree/Group.php
@@ -14,5 +14,5 @@ class Group extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'catalog/product/attribute/set/main/tree/group.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/attribute/set/main/tree/group.phtml';
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
index 329afa968307c..f69e58985bfc5 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
@@ -18,7 +18,7 @@ class Add extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'catalog/product/attribute/set/toolbar/add.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/add.phtml';
/**
* @return AbstractBlock
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
index f707c5c340b68..e29ab26065dc3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
@@ -20,7 +20,7 @@ class Main extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'catalog/product/attribute/set/toolbar/main.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/attribute/set/toolbar/main.phtml';
/**
* @return $this
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
index 9270c1ac38ba3..98280d8d31237 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Composite/Configure.php
@@ -22,7 +22,7 @@ class Configure extends \Magento\Backend\Block\Widget
/**
* @var string
*/
- protected $_template = 'catalog/product/composite/configure.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/composite/configure.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
index c18106fe567d0..285caa974fd17 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit.php
@@ -17,7 +17,7 @@ class Edit extends \Magento\Backend\Block\Widget
/**
* @var string
*/
- protected $_template = 'catalog/product/edit.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/edit.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
index 4a3d7c4e14e30..d620cd5fee2b9 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Alerts.php
@@ -18,7 +18,7 @@ class Alerts extends \Magento\Backend\Block\Widget\Tab
/**
* @var string
*/
- protected $_template = 'catalog/product/tab/alert.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/tab/alert.phtml';
/**
* @return $this
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
index e52c1d3aa4985..20e12889cae0d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Inventory.php
@@ -15,7 +15,7 @@ class Inventory extends \Magento\Backend\Block\Widget
/**
* @var string
*/
- protected $_template = 'catalog/product/tab/inventory.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/tab/inventory.phtml';
/**
* @var \Magento\Framework\Module\Manager
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
index a7a919e53f56e..2c79f5a6fa718 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options.php
@@ -16,7 +16,7 @@ class Options extends Widget
/**
* @var string
*/
- protected $_template = 'catalog/product/edit/options.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/edit/options.phtml';
/**
* @return Widget
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
index 339239ea491e0..651d9a00095a3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Option.php
@@ -38,7 +38,7 @@ class Option extends Widget
/**
* @var string
*/
- protected $_template = 'catalog/product/edit/options/option.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/edit/options/option.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
index babfc1b072bd2..a0bbc4ad033de 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Date.php
@@ -16,5 +16,5 @@ class Date extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ
/**
* @var string
*/
- protected $_template = 'catalog/product/edit/options/type/date.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/date.phtml';
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
index 322aa02f97731..d3d5f08fa9eae 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/File.php
@@ -16,5 +16,5 @@ class File extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ
/**
* @var string
*/
- protected $_template = 'catalog/product/edit/options/type/file.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/file.phtml';
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
index 24de84958ef4a..f6ab5134ae6bd 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Select.php
@@ -16,7 +16,7 @@ class Select extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\T
/**
* @var string
*/
- protected $_template = 'catalog/product/edit/options/type/select.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/select.phtml';
/**
* Class constructor
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
index 7241128fac3b4..e6f78dc3ed169 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Options/Type/Text.php
@@ -16,5 +16,5 @@ class Text extends \Magento\Catalog\Block\Adminhtml\Product\Edit\Tab\Options\Typ
/**
* @var string
*/
- protected $_template = 'catalog/product/edit/options/type/text.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/edit/options/type/text.phtml';
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
index a80ddd8c122a1..7cb1c2c9e4263 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Price/Tier.php
@@ -13,7 +13,7 @@ class Tier extends Group\AbstractGroup
/**
* @var string
*/
- protected $_template = 'catalog/product/edit/price/tier.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/edit/price/tier.phtml';
/**
* Retrieve list of initial customer groups
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
index 6a3347b44512f..6189a97dbe761 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Websites.php
@@ -21,7 +21,7 @@ class Websites extends \Magento\Backend\Block\Store\Switcher
/**
* @var string
*/
- protected $_template = 'catalog/product/edit/websites.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/edit/websites.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
index 7ad4befa60cb4..ac9e75493bdc3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Gallery/Content.php
@@ -23,7 +23,7 @@ class Content extends \Magento\Backend\Block\Widget
/**
* @var string
*/
- protected $_template = 'catalog/product/helper/gallery.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/helper/gallery.phtml';
/**
* @var \Magento\Catalog\Model\Product\Media\Config
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
index 19c1574d6e9a5..b8967f1f30e55 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Widget/Chooser/Container.php
@@ -18,5 +18,5 @@ class Container extends Template
/**
* @var string
*/
- protected $_template = 'catalog/product/widget/chooser/container.phtml';
+ protected $_template = 'Magento_Catalog::catalog/product/widget/chooser/container.phtml';
}
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
index 9d13d89d54b80..a9ec80c5f0232 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
@@ -13,7 +13,7 @@ class Link extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'rss/grid/link.phtml';
+ protected $_template = 'Magento_Catalog::rss/grid/link.phtml';
/**
* @var \Magento\Framework\App\Rss\UrlBuilderInterface
diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index e9c383901b5ff..674b20a49c837 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -83,7 +83,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'product/list/toolbar.phtml';
+ protected $_template = 'Magento_Catalog::product/list/toolbar.phtml';
/**
* Catalog config
diff --git a/app/code/Magento/Catalog/Block/Product/View/Additional.php b/app/code/Magento/Catalog/Block/Product/View/Additional.php
index 37c82c2bc84c8..66527985e41fd 100644
--- a/app/code/Magento/Catalog/Block/Product/View/Additional.php
+++ b/app/code/Magento/Catalog/Block/Product/View/Additional.php
@@ -25,7 +25,7 @@ class Additional extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'product/view/additional.phtml';
+ protected $_template = 'Magento_Catalog::product/view/additional.phtml';
/**
* @return array
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index ce0e727f747d8..1f78de93b369d 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -103,7 +103,6 @@
1
Magento\Catalog\Model\Config\CatalogClone\Media\Image
-
Magento\Config\Model\Config\Backend\Image
catalog/product/placeholder
catalog/product/placeholder
diff --git a/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml b/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml
index b9332575c96f7..08ed0a8f49470 100644
--- a/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml
+++ b/app/code/Magento/CatalogInventory/etc/adminhtml/system.xml
@@ -41,13 +41,13 @@
-
+
Magento\Config\Model\Config\Source\Yesno
Magento\CatalogInventory\Model\Config\Backend\Managestock
Changing can take some time due to processing whole catalog.
-
+
Magento\CatalogInventory\Model\Source\Backorders
Magento\CatalogInventory\Model\Config\Backend\Backorders
diff --git a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
index f5ebd3c6c9dc4..70aa276f965ca 100644
--- a/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
+++ b/app/code/Magento/CatalogSearch/etc/adminhtml/system.xml
@@ -27,7 +27,7 @@
validate-digits
-
+
Number of popular search terms to be cached for faster response. Use “0” to cache all results after a term is searched for the second time.
validate-digits
diff --git a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php
index 04ae7c6a2d750..9f7962301cab4 100644
--- a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php
+++ b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php
@@ -51,7 +51,7 @@ class Conditions extends Template implements RendererInterface
/**
* @var string
*/
- protected $_template = 'product/widget/conditions.phtml';
+ protected $_template = 'Magento_CatalogWidget::product/widget/conditions.phtml';
/**
* @param \Magento\Framework\Data\Form\Element\Factory $elementFactory
diff --git a/app/code/Magento/Checkout/i18n/en_US.csv b/app/code/Magento/Checkout/i18n/en_US.csv
index 6db1fd74734d6..2dcb611c1fe60 100644
--- a/app/code/Magento/Checkout/i18n/en_US.csv
+++ b/app/code/Magento/Checkout/i18n/en_US.csv
@@ -177,4 +177,7 @@ Payment,Payment
"We received your order!","We received your order!"
"Thank you for your purchase!","Thank you for your purchase!"
"Password", "Password"
-"Something went wrong while saving the page. Please refresh the page and try again.","Something went wrong while saving the page. Please refresh the page and try again."
\ No newline at end of file
+"Something went wrong while saving the page. Please refresh the page and try again.","Something went wrong while saving the page. Please refresh the page and try again."
+"Item in Cart","Item in Cart"
+"Items in Cart","Items in Cart"
+"Close","Close"
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index 11ad1ef2a43e9..0721d05e5d910 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -5,8 +5,10 @@
*/
namespace Magento\Config\Model;
+use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
use Magento\Config\Model\Config\Structure\Element\Group;
use Magento\Config\Model\Config\Structure\Element\Field;
+use Magento\Framework\App\ObjectManager;
/**
* Backend config model
@@ -80,6 +82,11 @@ class Config extends \Magento\Framework\DataObject
*/
protected $_storeManager;
+ /**
+ * @var Config\Reader\Source\Deployed\SettingChecker
+ */
+ private $settingChecker;
+
/**
* @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -88,6 +95,7 @@ class Config extends \Magento\Framework\DataObject
* @param \Magento\Config\Model\Config\Loader $configLoader
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
+ * @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
* @param array $data
*/
public function __construct(
@@ -98,6 +106,7 @@ public function __construct(
\Magento\Config\Model\Config\Loader $configLoader,
\Magento\Framework\App\Config\ValueFactory $configValueFactory,
\Magento\Store\Model\StoreManagerInterface $storeManager,
+ SettingChecker $settingChecker = null,
array $data = []
) {
parent::__construct($data);
@@ -108,6 +117,7 @@ public function __construct(
$this->_configLoader = $configLoader;
$this->_configValueFactory = $configValueFactory;
$this->_storeManager = $storeManager;
+ $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
}
/**
@@ -351,6 +361,16 @@ protected function _processGroup(
// use extra memory
$fieldsetData = [];
foreach ($groupData['fields'] as $fieldId => $fieldData) {
+ $isReadOnly = $this->settingChecker->isReadOnly(
+ $groupPath . '/' . $fieldId,
+ $this->getScope(),
+ $this->getScopeCode()
+ );
+
+ if ($isReadOnly) {
+ continue;
+ }
+
$field = $this->getField($sectionPath, $groupId, $fieldId);
/** @var \Magento\Framework\App\Config\ValueInterface $backendModel */
$backendModel = $field->hasBackendModel()
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
index 5e11e46439c8b..fcc1ff8b9c70c 100644
--- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -60,6 +60,11 @@ class ConfigTest extends \PHPUnit\Framework\TestCase
*/
protected $_configStructure;
+ /**
+ * @var \PHPUnit_Framework_MockObject_MockObject
+ */
+ private $_settingsChecker;
+
protected function setUp()
{
$this->_eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
@@ -79,7 +84,7 @@ protected function setUp()
$this->_transFactoryMock = $this->createPartialMock(
\Magento\Framework\DB\TransactionFactory::class,
- ['create']
+ ['create', 'addObject']
);
$this->_appConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
$this->_configLoaderMock = $this->createPartialMock(
@@ -90,6 +95,9 @@ protected function setUp()
$this->_storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
+ $this->_settingsChecker = $this
+ ->createMock(\Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker::class);
+
$this->_model = new \Magento\Config\Model\Config(
$this->_appConfigMock,
$this->_eventManagerMock,
@@ -97,7 +105,8 @@ protected function setUp()
$this->_transFactoryMock,
$this->_configLoaderMock,
$this->_dataFactoryMock,
- $this->_storeManager
+ $this->_storeManager,
+ $this->_settingsChecker
);
}
@@ -149,6 +158,49 @@ public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
$this->_model->save();
}
+ public function testDoNotSaveReadOnlyFields()
+ {
+ $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
+ $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+
+ $this->_settingsChecker->expects($this->any())->method('isReadOnly')->will($this->returnValue(true));
+ $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+
+ $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
+ $this->_model->setSection('section');
+
+ $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
+ $group->method('getPath')->willReturn('section/1');
+
+ $field = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Field::class);
+ $field->method('getGroupPath')->willReturn('section/1');
+ $field->method('getId')->willReturn('key');
+
+ $this->_configStructure->expects($this->at(0))
+ ->method('getElement')
+ ->with('section/1')
+ ->will($this->returnValue($group));
+ $this->_configStructure->expects($this->at(1))
+ ->method('getElement')
+ ->with('section/1')
+ ->will($this->returnValue($group));
+ $this->_configStructure->expects($this->at(2))
+ ->method('getElement')
+ ->with('section/1/key')
+ ->will($this->returnValue($field));
+
+ $backendModel = $this->createPartialMock(
+ \Magento\Framework\App\Config\Value::class,
+ ['addData']
+ );
+ $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
+
+ $this->_transFactoryMock->expects($this->never())->method('addObject');
+ $backendModel->expects($this->never())->method('addData');
+
+ $this->_model->save();
+ }
+
public function testSaveToCheckScopeDataSet()
{
$transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
index 9ebd5f3ee3705..92c40f71f2db9 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Attribute/NewAttribute/Product/Created.php
@@ -16,7 +16,7 @@ class Created extends \Magento\Backend\Block\Widget
/**
* @var string
*/
- protected $_template = 'catalog/product/attribute/new/created.phtml';
+ protected $_template = 'Magento_ConfigurableProduct::catalog/product/attribute/new/created.phtml';
/**
* Core registry
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
index c02a922c71b5c..1c5d01da574cf 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Variations/Config.php
@@ -18,7 +18,7 @@ class Config extends Widget implements TabInterface
/**
* @var string
*/
- protected $_template = 'catalog/product/edit/super/config.phtml';
+ protected $_template = 'Magento_ConfigurableProduct::catalog/product/edit/super/config.phtml';
/**
* Core registry
diff --git a/app/code/Magento/Cookie/etc/adminhtml/system.xml b/app/code/Magento/Cookie/etc/adminhtml/system.xml
index 26c963ddba76d..9790410969055 100644
--- a/app/code/Magento/Cookie/etc/adminhtml/system.xml
+++ b/app/code/Magento/Cookie/etc/adminhtml/system.xml
@@ -22,7 +22,7 @@
Magento\Cookie\Model\Config\Backend\Domain
-
+
Warning: Do not set to "No". User security could be compromised.]]>
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
index c740b17ed008c..ec73ac0cf7aa5 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
@@ -20,7 +20,7 @@ class Currency extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'system/currency/rates.phtml';
+ protected $_template = 'Magento_CurrencySymbol::system/currency/rates.phtml';
/**
* Prepare layout
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
index 80415c9486898..e20054a5a8084 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Matrix.php
@@ -16,7 +16,7 @@ class Matrix extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'system/currency/rate/matrix.phtml';
+ protected $_template = 'Magento_CurrencySymbol::system/currency/rate/matrix.phtml';
/**
* @var \Magento\Directory\Model\CurrencyFactory
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
index 919a4d0ed6d7b..491ed93900bde 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency/Rate/Services.php
@@ -16,7 +16,7 @@ class Services extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'system/currency/rate/services.phtml';
+ protected $_template = 'Magento_CurrencySymbol::system/currency/rate/services.phtml';
/**
* @var \Magento\Directory\Model\Currency\Import\Source\ServiceFactory
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
index 032d1ae5d732f..46a8dcfb28f1b 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
@@ -17,7 +17,7 @@ class Newsletter extends \Magento\Backend\Block\Widget\Form\Generic implements T
/**
* @var string
*/
- protected $_template = 'tab/newsletter.phtml';
+ protected $_template = 'Magento_Customer::tab/newsletter.phtml';
/**
* @var \Magento\Newsletter\Model\SubscriberFactory
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
index 4a0d0f66425bb..9ee856f6e0af9 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Sales/Order/Address/Form/Renderer/Vat.php
@@ -24,7 +24,7 @@ class Vat extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Element
/**
* @var string
*/
- protected $_template = 'sales/order/create/address/form/renderer/vat.phtml';
+ protected $_template = 'Magento_Customer::sales/order/create/address/form/renderer/vat.phtml';
/**
* @var \Magento\Framework\Json\EncoderInterface
diff --git a/app/code/Magento/Customer/Block/Newsletter.php b/app/code/Magento/Customer/Block/Newsletter.php
index 7a34b1d892bc1..a5e768915f91b 100644
--- a/app/code/Magento/Customer/Block/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Newsletter.php
@@ -20,7 +20,7 @@ class Newsletter extends \Magento\Customer\Block\Account\Dashboard
/**
* @var string
*/
- protected $_template = 'form/newsletter.phtml';
+ protected $_template = 'Magento_Customer::form/newsletter.phtml';
/**
* @return bool
diff --git a/app/code/Magento/Customer/etc/adminhtml/system.xml b/app/code/Magento/Customer/etc/adminhtml/system.xml
index 31e968de14d99..86e5852d67aeb 100644
--- a/app/code/Magento/Customer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Customer/etc/adminhtml/system.xml
@@ -26,7 +26,7 @@
-
+
Magento\Config\Model\Config\Source\Yesno
@@ -170,7 +170,7 @@
Use 0 to disable account locking.
required-entry validate-digits
-
+
Account will be unlocked after provided time.
required-entry validate-digits
@@ -272,16 +272,16 @@
-
+
-
+
-
+
-
+
diff --git a/app/code/Magento/Developer/etc/adminhtml/system.xml b/app/code/Magento/Developer/etc/adminhtml/system.xml
index 9663cff72bc9d..db685a5453cd4 100644
--- a/app/code/Magento/Developer/etc/adminhtml/system.xml
+++ b/app/code/Magento/Developer/etc/adminhtml/system.xml
@@ -6,7 +6,7 @@
*/-->
-
+
@@ -25,7 +25,7 @@
Magento\Developer\Model\Config\Backend\AllowedIps
-
+
Not available in production mode.
diff --git a/app/code/Magento/Dhl/etc/adminhtml/system.xml b/app/code/Magento/Dhl/etc/adminhtml/system.xml
index c0f7e209ad61b..91ed6c6568a70 100644
--- a/app/code/Magento/Dhl/etc/adminhtml/system.xml
+++ b/app/code/Magento/Dhl/etc/adminhtml/system.xml
@@ -94,7 +94,7 @@
N
-
+
Package ready time after order submission (in hours)
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index 4019def9e0cd0..e2694b3b93bb9 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -33,7 +33,7 @@ class Downloadable extends Widget implements TabInterface
/**
* @var string
*/
- protected $_template = 'product/edit/downloadable.phtml';
+ protected $_template = 'Magento_Downloadable::product/edit/downloadable.phtml';
/**
* Accordion block id
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
index fab33673e182d..947e6dc1e8339 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php
@@ -30,7 +30,7 @@ class Links extends \Magento\Backend\Block\Template
/**
* @var string
*/
- protected $_template = 'product/edit/downloadable/links.phtml';
+ protected $_template = 'Magento_Downloadable::product/edit/downloadable/links.phtml';
/**
* Downloadable file
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
index 8b808c6020c5b..3c86bfb2f8d00 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Samples.php
@@ -22,7 +22,7 @@ class Samples extends \Magento\Backend\Block\Widget
/**
* @var string
*/
- protected $_template = 'product/edit/downloadable/samples.phtml';
+ protected $_template = 'Magento_Downloadable::product/edit/downloadable/samples.phtml';
/**
* Downloadable file
diff --git a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
index 3ddfe494c7fbc..2633b78c67c78 100644
--- a/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
+++ b/app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Js.php
@@ -17,5 +17,5 @@ class Js extends \Magento\Backend\Block\Template
*
* @var string
*/
- protected $_template = 'attribute/edit/js.phtml';
+ protected $_template = 'Magento_Eav::attribute/edit/js.phtml';
}
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template.php b/app/code/Magento/Email/Block/Adminhtml/Template.php
index e12a5f15ad624..25348f9638f3e 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template.php
@@ -22,7 +22,7 @@ class Template extends \Magento\Backend\Block\Template implements \Magento\Backe
*
* @var string
*/
- protected $_template = 'template/list.phtml';
+ protected $_template = 'Magento_Email::template/list.phtml';
/**
* @var \Magento\Backend\Block\Widget\Button\ButtonList
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
index e1f4add630d7c..d6a2f1961ad18 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -42,7 +42,7 @@ class Edit extends Widget implements ContainerInterface
*
* @var string
*/
- protected $_template = 'template/edit.phtml';
+ protected $_template = 'Magento_Email::template/edit.phtml';
/**
* @var \Magento\Framework\Json\EncoderInterface
diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
index 9e2747cf97fc1..9f68199106cc7 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Inline.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php
@@ -33,7 +33,7 @@ class Inline extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'inline.phtml';
+ protected $_template = 'Magento_GiftMessage::inline.phtml';
/**
* Gift message message
diff --git a/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml b/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml
index f0c703b7693c7..3c91c30c5cfa6 100644
--- a/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml
+++ b/app/code/Magento/GoogleOptimizer/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
-->
-
+
diff --git a/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml b/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml
index bbb2054abb14f..569423f43913e 100644
--- a/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml
+++ b/app/code/Magento/GroupedProduct/etc/adminhtml/system.xml
@@ -7,8 +7,8 @@
-->
-
-
+
+
Magento\Catalog\Model\Config\Source\Product\Thumbnail
diff --git a/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml b/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml
index 4b7a6029507b4..76785c023ed0b 100644
--- a/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml
+++ b/app/code/Magento/InstantPurchase/etc/adminhtml/system.xml
@@ -10,7 +10,7 @@
-
+
Magento\Config\Model\Config\Source\Yesno
Payment method with vault and instant purchase support should be enabled.
diff --git a/app/code/Magento/Integration/etc/adminhtml/system.xml b/app/code/Magento/Integration/etc/adminhtml/system.xml
index 97aec083e7abb..5abec8efbfdd6 100644
--- a/app/code/Magento/Integration/etc/adminhtml/system.xml
+++ b/app/code/Magento/Integration/etc/adminhtml/system.xml
@@ -13,48 +13,48 @@
Magento_Integration::config_oauth
-
+
We will disable this feature if the value is empty.
-
+
We will disable this feature if the value is empty.
-
+
Integer. Launch cleanup in X OAuth requests. 0 (not recommended) - to disable cleanup
-
+
Cleanup entries older than X minutes.
-
+
Consumer key/secret will expire if not used within X seconds after Oauth token exchange starts.
-
+
Number of maximum redirects for OAuth consumer credentials Post request.
-
+
Timeout for OAuth consumer credentials Post request within X seconds.
-
+
Maximum Number of authentication failures to lock out account.
-
+
Period of time in seconds after which account will be unlocked.
diff --git a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
index ff3ab124a65ad..1f868a5b71754 100644
--- a/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
+++ b/app/code/Magento/LayeredNavigation/Block/Navigation/State.php
@@ -18,7 +18,7 @@ class State extends \Magento\Framework\View\Element\Template
/**
* @var string
*/
- protected $_template = 'layer/state.phtml';
+ protected $_template = 'Magento_LayeredNavigation::layer/state.phtml';
/**
* Catalog layer
diff --git a/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml b/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
index e9bf7933b94a9..de4637847456e 100644
--- a/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
+++ b/app/code/Magento/LayeredNavigation/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
-->
-
+
diff --git a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml
index 09b6b23744053..d7244a5d4fd01 100644
--- a/app/code/Magento/MediaStorage/etc/adminhtml/system.xml
+++ b/app/code/Magento/MediaStorage/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
-->
-
+
diff --git a/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml b/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
index b47bd8f749040..89cc4d0986a00 100644
--- a/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
+++ b/app/code/Magento/OfflinePayments/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
-->
-
+
diff --git a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml b/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
index 306aac1769913..4db5f489aa4a2 100644
--- a/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
+++ b/app/code/Magento/OfflineShipping/etc/adminhtml/system.xml
@@ -7,7 +7,7 @@
-->
-
+
diff --git a/app/code/Magento/PageCache/etc/adminhtml/system.xml b/app/code/Magento/PageCache/etc/adminhtml/system.xml
index 1d6c0d890737b..5055b17956819 100644
--- a/app/code/Magento/PageCache/etc/adminhtml/system.xml
+++ b/app/code/Magento/PageCache/etc/adminhtml/system.xml
@@ -49,7 +49,7 @@
1
-
+
Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish4
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system.xml b/app/code/Magento/Paypal/etc/adminhtml/system.xml
index c1ff4c9b1c6ca..26ec9b3152e4b 100644
--- a/app/code/Magento/Paypal/etc/adminhtml/system.xml
+++ b/app/code/Magento/Paypal/etc/adminhtml/system.xml
@@ -77,7 +77,7 @@
http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-pro.html
-
+
0
payment/paypal_payment_pro/active
@@ -90,7 +90,7 @@
-
+
Accept credit card and PayPal payments securely.
payment/wps_express/active
@@ -110,7 +110,7 @@
payment/wps_express_bml/active
-
+
@@ -124,7 +124,7 @@
-
+
@@ -158,7 +158,7 @@
-
+
Accept credit card and PayPal payments securely.
payment/wps_express/active
@@ -166,7 +166,7 @@
http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html
-
+
@@ -178,7 +178,7 @@
-
+
@@ -227,7 +227,7 @@
Choose a secure bundled payment solution for your business.
https://www.paypal-marketing.com/emarketing/partner/na/merchantlineup/home.page#mainTab=checkoutlineup&subTab=newlineup
other_paypal_payment_solutions
-
+
complex
Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Payment
@@ -237,7 +237,7 @@
http://docs.magento.com/m2/ce/user_guide/payment/paypal-payments-standard.html
-
+
@@ -271,7 +271,7 @@
-
+
complex paypal-other-section paypal-gateways-section
Magento\Paypal\Block\Adminhtml\System\Config\Fieldset\Expanded
diff --git a/app/code/Magento/Sales/etc/adminhtml/system.xml b/app/code/Magento/Sales/etc/adminhtml/system.xml
index 9d6d11d56c81f..ccfd9c2ac7bfd 100644
--- a/app/code/Magento/Sales/etc/adminhtml/system.xml
+++ b/app/code/Magento/Sales/etc/adminhtml/system.xml
@@ -393,7 +393,7 @@
-
+
diff --git a/app/code/Magento/Signifyd/etc/adminhtml/system.xml b/app/code/Magento/Signifyd/etc/adminhtml/system.xml
index 71f5916ca5325..2dd75d2d91e5b 100644
--- a/app/code/Magento/Signifyd/etc/adminhtml/system.xml
+++ b/app/code/Magento/Signifyd/etc/adminhtml/system.xml
@@ -11,7 +11,7 @@
sales
Magento_Sales::fraud_protection
-
+
signifyd-logo-header
Magento\Signifyd\Block\Adminhtml\System\Config\Fieldset\Info
@@ -52,7 +52,7 @@
Magento\Config\Model\Config\Source\Yesno
fraud_protection/signifyd/debug
-
+
configure a guarantee completed webhook in Signifyd. Webhooks are used to sync Signifyd`s guarantee decisions back to Magento.]]>
signifyd/webhooks/handler
diff --git a/app/code/Magento/Swatches/etc/adminhtml/system.xml b/app/code/Magento/Swatches/etc/adminhtml/system.xml
index 219fa9c913e5c..ef4c2601f2d8d 100644
--- a/app/code/Magento/Swatches/etc/adminhtml/system.xml
+++ b/app/code/Magento/Swatches/etc/adminhtml/system.xml
@@ -7,8 +7,8 @@
-->
-
-
+
+
diff --git a/app/code/Magento/Tax/etc/adminhtml/system.xml b/app/code/Magento/Tax/etc/adminhtml/system.xml
index c03a8aa44bf7b..7fc1744b8e27e 100644
--- a/app/code/Magento/Tax/etc/adminhtml/system.xml
+++ b/app/code/Magento/Tax/etc/adminhtml/system.xml
@@ -62,7 +62,7 @@
Magento\Tax\Model\Config\Notification
Warning: To apply the discount on prices including tax and apply the tax after discount, set Catalog Prices to “Including Tax”.
-
+
Magento\Tax\Model\Config\Source\Apply\On
diff --git a/app/code/Magento/Translation/etc/adminhtml/system.xml b/app/code/Magento/Translation/etc/adminhtml/system.xml
index 8c3cdc5c39916..ab854f8a4db52 100644
--- a/app/code/Magento/Translation/etc/adminhtml/system.xml
+++ b/app/code/Magento/Translation/etc/adminhtml/system.xml
@@ -9,7 +9,7 @@
-
+
Magento\Translation\Model\Js\Config\Source\Strategy
Please put your store into maintenance mode and redeploy static files after changing strategy
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
index 40b10749db21e..eb811bfae788f 100644
--- a/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
+++ b/app/code/Magento/Ui/Model/Export/ConvertToCsv.php
@@ -9,7 +9,6 @@
use Magento\Framework\Exception\FileSystemException;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
use Magento\Ui\Component\MassAction\Filter;
/**
@@ -18,7 +17,7 @@
class ConvertToCsv
{
/**
- * @var WriteInterface
+ * @var DirectoryList
*/
protected $directory;
diff --git a/app/code/Magento/Ui/Model/Export/ConvertToXml.php b/app/code/Magento/Ui/Model/Export/ConvertToXml.php
index 5f6e45a948f24..19eb651113fcf 100644
--- a/app/code/Magento/Ui/Model/Export/ConvertToXml.php
+++ b/app/code/Magento/Ui/Model/Export/ConvertToXml.php
@@ -13,7 +13,6 @@
use Magento\Framework\Exception\FileSystemException;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\WriteInterface;
use Magento\Ui\Component\MassAction\Filter;
/**
@@ -22,7 +21,7 @@
class ConvertToXml
{
/**
- * @var WriteInterface
+ * @var DirectoryList
*/
protected $directory;
diff --git a/app/code/Magento/Ui/etc/adminhtml/system.xml b/app/code/Magento/Ui/etc/adminhtml/system.xml
index 74e2e076b93c8..ab4272f8d2a34 100644
--- a/app/code/Magento/Ui/etc/adminhtml/system.xml
+++ b/app/code/Magento/Ui/etc/adminhtml/system.xml
@@ -9,12 +9,12 @@
-
+
Magento\Config\Model\Config\Source\Yesno
If enabled, can be used by functional tests for extended reporting
-
+
Use this key to retrieve collected js errors
diff --git a/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml b/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml
index 425a2047cfd51..7660b10814ad4 100644
--- a/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml
+++ b/app/code/Magento/WebapiSecurity/etc/adminhtml/system.xml
@@ -8,7 +8,7 @@
-
+
Magento\Config\Model\Config\Source\Yesno
This feature applies only to CMS, Catalog and Store APIs. Please consult your developers for details on potential security risks.
diff --git a/app/code/Magento/Wishlist/etc/adminhtml/system.xml b/app/code/Magento/Wishlist/etc/adminhtml/system.xml
index 86c24bab11ffb..50ea4b01fe12b 100644
--- a/app/code/Magento/Wishlist/etc/adminhtml/system.xml
+++ b/app/code/Magento/Wishlist/etc/adminhtml/system.xml
@@ -22,12 +22,12 @@
Email template chosen based on theme fallback when "Default" option is selected.
Magento\Config\Model\Config\Source\Email\Template
-
+
10 by default. Max - 10000
validate-digits validate-digits-range digits-range-1-10000
-
+
255 by default
validate-digits validate-digits-range digits-range-1-10000
diff --git a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoPayflowLinkTest.xml b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoPayflowLinkTest.xml
index f3922aa474735..f212f48237ecb 100644
--- a/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoPayflowLinkTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Paypal/Test/TestCase/CreateOnlineCreditMemoPayflowLinkTest.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
test_type:3rd_party_test, severity:S0
catalogProductSimple::product_100_dollar
diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
index 10b9d3e80d0c2..521d7d68ac4a6 100644
--- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
+++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Repository/SalesRule.xml
@@ -96,8 +96,8 @@
Yes
- Cart Price Rule with with complex conditions %isolation%
- Cart Price Rule with with complex conditions
+ Cart Price Rule with complex conditions %isolation%
+ Cart Price Rule with complex conditions
Yes
- Main Website
@@ -129,8 +129,8 @@
Yes
For matching items only
- - Cart Price Rule with with complex conditions
- - Cart Price Rule with with complex conditions
+ - Cart Price Rule with complex conditions
+ - Cart Price Rule with complex conditions
diff --git a/dev/tests/functional/tests/app/Magento/Search/Test/Fixture/SynonymGroup.xml b/dev/tests/functional/tests/app/Magento/Search/Test/Fixture/SynonymGroup.xml
index fc30822ab8bed..2cebaf93ff2a9 100644
--- a/dev/tests/functional/tests/app/Magento/Search/Test/Fixture/SynonymGroup.xml
+++ b/dev/tests/functional/tests/app/Magento/Search/Test/Fixture/SynonymGroup.xml
@@ -13,7 +13,7 @@
collection="Magento\Search\Model\ResourceModel\Block\Grid\Collection"
handler_interface="Magento\Search\Test\Handler\SynonymGroup\SynonymGroupInterface"
repository_class="Magento\Search\Test\Repository\SynonymGroup" class="Magento\Search\Test\Fixture\SynonymGroup">
-
+
diff --git a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
index 7f7741d2f1c13..25acb75ee134f 100644
--- a/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Weee/Test/TestCase/CreateTaxWithFptTest.xml
@@ -97,7 +97,7 @@
to_maintain:yes
- Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option catalog price Excluding Tax
+ Check taxed FPT display set to Excluding, Description and Including FPT on product with custom option catalog price Excluding Tax
shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_excl
with_custom_option_and_fpt
70.00
@@ -117,7 +117,7 @@
- Check taxed FPT display set to Including FPT and Description on product with with custom option catalog price Excluding Tax
+ Check taxed FPT display set to Including FPT and Description on product with custom option catalog price Excluding Tax
shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_excl_disc_on_incl, display_including_tax
with_custom_option_and_fpt
86.60
@@ -173,7 +173,7 @@
- Check taxed FPT display set to Excluding, Description and Including FPT on product with with special price and catalog price Including Tax
+ Check taxed FPT display set to Excluding, Description and Including FPT on product with special price and catalog price Including Tax
shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl
with_special_price_and_fpt
92.38
@@ -193,7 +193,7 @@
- Check taxed FPT display set to Including FPT and Description on product with with special price and catalog price Including Tax
+ Check taxed FPT display set to Including FPT and Description on product with special price and catalog price Including Tax
shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_incl
with_special_price_and_fpt
101.62
@@ -210,7 +210,7 @@
MAGETWO-44968: FPT Final price includes tax on custom option, when display is set to excluding tax
- Check taxed FPT display set to Excluding, Description and Including FPT on product with with custom option and catalog price Including Tax
+ Check taxed FPT display set to Excluding, Description and Including FPT on product with custom option and catalog price Including Tax
shipping_tax_class_taxable_goods,tax_with_fpt_taxed_cat_incl_disc_on_excl
with_custom_option_and_fpt
64.67
diff --git a/lib/internal/Magento/Framework/Locale/Format.php b/lib/internal/Magento/Framework/Locale/Format.php
index 7bb4cb4b7d432..00379c87daaf9 100644
--- a/lib/internal/Magento/Framework/Locale/Format.php
+++ b/lib/internal/Magento/Framework/Locale/Format.php
@@ -99,7 +99,10 @@ public function getPriceFormat($localeCode = null, $currencyCode = null)
$currency = $this->_scopeResolver->getScope()->getCurrentCurrency();
}
- $formatter = new \NumberFormatter($localeCode, \NumberFormatter::CURRENCY);
+ $formatter = new \NumberFormatter(
+ $localeCode . '@currency=' . $currency->getCode(),
+ \NumberFormatter::CURRENCY
+ );
$format = $formatter->getPattern();
$decimalSymbol = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
$groupSymbol = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
diff --git a/lib/web/css/source/lib/_tables.less b/lib/web/css/source/lib/_tables.less
index 9c37e17b4fe82..43b63152946f8 100644
--- a/lib/web/css/source/lib/_tables.less
+++ b/lib/web/css/source/lib/_tables.less
@@ -530,7 +530,7 @@
display: block;
.lib-css(padding, @_table-responsive-cell-padding);
- &:before {
+ &[data-th]:before {
.lib-css(padding-right, @table-cell__padding-horizontal);
content: attr(data-th)': ';
display: inline-block;
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
index 5cd9c6ad3f719..78a22adfd5038 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Reader/ClassesScanner.php
@@ -114,7 +114,7 @@ private function extract(\RecursiveIteratorIterator $recursiveIterator)
/**
* @param array $classNames
* @param string $fileItemPath
- * @return bool Whether the clas is included or not
+ * @return bool Whether the class is included or not
*/
private function includeClasses(array $classNames, $fileItemPath)
{
diff --git a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php
index fac5b1b4aec98..747865f7cfef9 100644
--- a/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php
+++ b/setup/src/Magento/Setup/Module/Di/Code/Scanner/ConfigurationScanner.php
@@ -28,7 +28,7 @@ public function __construct(
*
* @param string $fileName
*
- * @return array array of paths to the configuration files
+ * @return array of paths to the configuration files
*/
public function scan($fileName)
{