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

vrann · web-flow · commit 607a3019bfc2 · 2017-03-22T17:54:31.000-05:00
[EngCom] Public Pull Requests
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Image.php
@@ -21,7 +21,7 @@ protected function _getUrl()
         $url = false;
         if ($this->getValue()) {
             $url = $this->_urlBuilder->getBaseUrl(
-                \Magento\Framework\UrlInterface::URL_TYPE_MEDIA
+                ['_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA]
             ) . 'catalog/product/' . $this->getValue();
         }
         return $url;
diff --git a/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php b/app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php
@@ -129,7 +129,7 @@ public function execute()
             $attributeCode = $this->getRequest()->getParam('attribute_code')
                 ?: $this->generateCode($this->getRequest()->getParam('frontend_label')[0]);
             if (strlen($attributeCode) > 0) {
-                $validatorAttrCode = new \Zend_Validate_Regex(['pattern' => '/^[a-z][a-z_0-9]{0,30}$/']);
+                $validatorAttrCode = new \Zend_Validate_Regex(['pattern' => '/^[a-z\x{600}-\x{6FF}][a-z\x{600}-\x{6FF}_0-9]{0,30}$/u']);
                 if (!$validatorAttrCode->isValid($attributeCode)) {
                     $this->messageManager->addError(
                         __(
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/CreateHandler.php
@@ -164,7 +164,7 @@ public function execute($product, $arguments = [])
                 $product->setData($mediaAttrCode . '_label', $newImages[$attrData]['label']);
             }
 
-            if (in_array($attrData, array_keys($existImages))) {
+            if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) {
                 $product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']);
             }
             if (!empty($product->getData($mediaAttrCode))) {
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php b/app/code/Magento/Catalog/Model/ResourceModel/AbstractResource.php
@@ -568,6 +568,6 @@ public function getAttributeRawValue($entityId, $attribute, $store)
             $attributesData = $_data[1];
         }
 
-        return $attributesData ? $attributesData : false;
+        return $attributesData === false ? false : $attributesData;
     }
 }
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/form.html
@@ -8,7 +8,7 @@
     <!-- ko foreach: getRegion('before-fields') -->
     <!-- ko template: getTemplate() --><!-- /ko -->
     <!--/ko-->
-    <form data-hasrequired="* Required Fields">
+    <form data-bind="attr: {'data-hasrequired': $t('* Required Fields')}">
         <fieldset id="billing-new-address-form" class="fieldset address">
             <!-- ko foreach: getRegion('additional-fieldsets') -->
             <!-- ko template: getTemplate() --><!-- /ko -->
diff --git a/app/code/Magento/Cms/Setup/InstallData.php b/app/code/Magento/Cms/Setup/InstallData.php
@@ -106,7 +106,7 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
 <div class="privacy-policy cms-content">
     <div class="message info">
         <span>
-            Please replace this text with you Privacy Policy.
+            Please replace this text with your Privacy Policy.
             Please add any additional cookies your website uses below (e.g. Google Analytics).
         </span>
     </div>
diff --git a/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml b/app/code/Magento/Config/view/adminhtml/templates/system/config/form/field/array.phtml
@@ -15,7 +15,7 @@ $_colspan = $block->isAddAfter() ? 2 : 1;
 
 <div class="design_theme_ua_regexp" id="grid<?php /* @escapeNotVerified */ echo $_htmlId; ?>">
     <div class="admin__control-table-wrapper">
-        <table class="admin__control-table">
+        <table class="admin__control-table" id="<?php /* @escapeNotVerified */ echo $block->getElement()->getId(); ?>">
             <thead>
             <tr>
                 <?php foreach ($block->getColumns() as $columnName => $column): ?>
diff --git a/app/code/Magento/Deploy/Console/Command/DeployStaticOptionsInterface.php b/app/code/Magento/Deploy/Console/Command/DeployStaticOptionsInterface.php
@@ -84,7 +84,7 @@ interface DeployStaticOptionsInterface
     const EXCLUDE_AREA = 'exclude-area';
 
     /**
-     * Jey for jobs option
+     * Key for jobs option
      */
     const JOBS_AMOUNT = 'jobs';
 
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
@@ -1018,7 +1018,7 @@ public function filter($value)
             if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {
                 $value = sprintf(__('Error filtering template: %s'), $e->getMessage());
             } else {
-                $value = __("We're sorry, an error has occurred while generating this email.");
+                $value = __("We're sorry, an error has occurred while generating this content.");
             }
             $this->_logger->critical($e);
         }
diff --git a/app/code/Magento/Newsletter/Model/Queue.php b/app/code/Magento/Newsletter/Model/Queue.php
@@ -236,7 +236,7 @@ public function sendPerSubscriber($count = 20)
             )->setTemplateVars(
                 ['subscriber' => $item]
             )->setFrom(
-                ['name' => $this->getNewsletterSenderEmail(), 'email' => $this->getNewsletterSenderName()]
+                ['name' => $this->getNewsletterSenderName(), 'email' => $this->getNewsletterSenderEmail()]
             )->addTo(
                 $item->getSubscriberEmail(),
                 $item->getSubscriberFullName()
diff --git a/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js b/app/code/Magento/PageCache/view/frontend/web/js/page-cache.js
@@ -41,12 +41,17 @@ define([
          * @param {jQuery} element - Comment holder
          */
         (function lookup(element) {
-            if ($.nodeName(element, 'iframe') && $(element).prop('src').indexOf(window.location.hostname) === -1) {
-                return [];
+            // prevent cross origin iframe content reading
+            if ($(element).prop('tagName') === 'IFRAME') {
+                var iframeHostName = $('<a>').prop('href', $(element).prop('src'))
+                                             .prop('hostname');
+
+                if (window.location.hostname !== iframeHostName) {
+                    return [];
+                }
             }
-            $(element).contents().each(function (index, el) {
-                var hostName, iFrameHostName;
 
+            $(element).contents().each(function (index, el) {
                 switch (el.nodeType) {
                     case 1: // ELEMENT_NODE
                         lookup(el);
@@ -57,14 +62,7 @@ define([
                         break;
 
                     case 9: // DOCUMENT_NODE
-                        hostName = window.location.hostname;
-                        iFrameHostName = $('<a>')
-                            .prop('href', $(element).prop('src'))
-                            .prop('hostname');
-
-                        if (hostName === iFrameHostName) {
-                            lookup($(el).find('body'));
-                        }
+                        lookup($(el).find('body'));
                         break;
                 }
             });
diff --git a/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml b/dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest.xml
@@ -73,6 +73,7 @@
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertProductCanBeOpenedFromSearchResult" />
         </variation>
         <variation name="SearchEntityResultsTestVariation15" summary="Search for simple product name using 129 symbols query length" ticketId="MAGETWO-36542">
+            <data name="tag" xsi:type="string">stable:no</data>
             <data name="catalogSearch/data/query_text/value" xsi:type="string">catalogProductSimple::product_with_long_name::name</data>
             <data name="queryLength" xsi:type="string">129</data>
             <constraint name="Magento\CatalogSearch\Test\Constraint\AssertCatalogSearchQueryLength" />
diff --git a/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml b/dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml
@@ -81,7 +81,7 @@
             <constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal" />
         </variation>
         <variation name="OnePageCheckoutTestVariation3" summary="Checkout as UK guest with simple product" ticketId="MAGETWO-42603, MAGETWO-43282, MAGETWO-43318">
-            <data name="tag" xsi:type="string">severity:S1</data>
+            <data name="tag" xsi:type="string">severity:S1, stable:no</data>
             <data name="products/0" xsi:type="string">catalogProductSimple::product_with_qty_25</data>
             <data name="expectedQty/0" xsi:type="string">0</data>
             <data name="expectedStockStatus/0" xsi:type="string">out of stock</data>
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/PageCache/frontend/js/page-cache.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/PageCache/frontend/js/page-cache.test.js
@@ -60,7 +60,7 @@ define([
 
         it('on iframe from other host returns empty Array', function () {
             iframe.contents().find('body').html(comment);
-            iframe.attr('src', '//' + host + '.otherHost/');
+            iframe.attr('src', '//' + host + '.otherHost/?origin_url=' + host);
 
             expect(iframe.comments().length).toEqual(0);
         });
diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php
@@ -24,7 +24,7 @@ class FrontController implements FrontControllerInterface
      * @param \Magento\Framework\App\Response\Http $response
      */
     public function __construct(
-        RouterList $routerList,
+        RouterListInterface $routerList,
         \Magento\Framework\App\Response\Http $response
     ) {
         $this->_routerList = $routerList;
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigLoader.php
@@ -30,7 +30,7 @@ class ConfigLoader implements ConfigLoaderInterface
     /**
      * Cache
      *
-     * @var \Magento\Framework\Cache\FrontendInterface
+     * @var \Magento\Framework\Config\CacheInterface
      */
     protected $_cache;
 
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -2502,7 +2502,7 @@ public function dropTemporaryTable($tableName, $schemaName = null)
     public function truncateTable($tableName, $schemaName = null)
     {
         if (!$this->isTableExists($tableName, $schemaName)) {
-            throw new \Zend_Db_Exception(sprintf('Table "%s" is not exists', $tableName));
+            throw new \Zend_Db_Exception(sprintf('Table "%s" does not exist', $tableName));
         }
 
         $table = $this->quoteIdentifier($this->_getTableName($tableName, $schemaName));
@@ -2536,7 +2536,7 @@ public function isTableExists($tableName, $schemaName = null)
     public function renameTable($oldTableName, $newTableName, $schemaName = null)
     {
         if (!$this->isTableExists($oldTableName, $schemaName)) {
-            throw new \Zend_Db_Exception(sprintf('Table "%s" is not exists', $oldTableName));
+            throw new \Zend_Db_Exception(sprintf('Table "%s" does not exist', $oldTableName));
         }
         if ($this->isTableExists($newTableName, $schemaName)) {
             throw new \Zend_Db_Exception(sprintf('Table "%s" already exists', $newTableName));

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ protected function _getUrl()`
`21`	`21`	`$url = false;`
`22`	`22`	`if ($this->getValue()) {`
`23`	`23`	`$url = $this->_urlBuilder->getBaseUrl(`
`24`		`- \Magento\Framework\UrlInterface::URL_TYPE_MEDIA`
	`24`	`+ ['_type' => \Magento\Framework\UrlInterface::URL_TYPE_MEDIA]`
`25`	`25`	`) . 'catalog/product/' . $this->getValue();`
`26`	`26`	`}`
`27`	`27`	`return $url;`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ public function execute($product, $arguments = [])`
`164`	`164`	`$product->setData($mediaAttrCode . '_label', $newImages[$attrData]['label']);`
`165`	`165`	`}`
`166`	`166`
`167`		`- if (in_array($attrData, array_keys($existImages))) {`
	`167`	`+ if (in_array($attrData, array_keys($existImages)) && isset($existImages[$attrData]['label'])) {`
`168`	`168`	`$product->setData($mediaAttrCode . '_label', $existImages[$attrData]['label']);`
`169`	`169`	`}`
`170`	`170`	`if (!empty($product->getData($mediaAttrCode))) {`
Original file line number	Diff line number	Diff line change
`@@ -568,6 +568,6 @@ public function getAttributeRawValue($entityId, $attribute, $store)`
`568`	`568`	`$attributesData = $_data[1];`
`569`	`569`	`}`
`570`	`570`
`571`		`- return $attributesData ? $attributesData : false;`
	`571`	`+ return $attributesData === false ? false : $attributesData;`
`572`	`572`	`}`
`573`	`573`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1018,7 +1018,7 @@ public function filter($value)`
`1018`	`1018`	`if ($this->_appState->getMode() == \Magento\Framework\App\State::MODE_DEVELOPER) {`
`1019`	`1019`	`$value = sprintf(__('Error filtering template: %s'), $e->getMessage());`
`1020`	`1020`	`} else {`
`1021`		`- $value = __("We're sorry, an error has occurred while generating this email.");`
	`1021`	`+ $value = __("We're sorry, an error has occurred while generating this content.");`
`1022`	`1022`	`}`
`1023`	`1023`	`$this->_logger->critical($e);`
`1024`	`1024`	`}`