merge magento/2.3-develop into magento-epam/EPAM-PR-66

serhiyzhovnir · Aug 20, 2019 · 5c5978a · 5c5978a
2 parents de50b34 + a9a32dc
commit 5c5978a
Show file tree

Hide file tree

Showing 16 changed files with 122 additions and 51 deletions.
diff --git a/app/code/Magento/Catalog/Block/Product/ImageFactory.php b/app/code/Magento/Catalog/Block/Product/ImageFactory.php
@@ -160,6 +160,8 @@ public function create(Product $product, string $imageId, array $attributes = nu
             );
         }
 
+        $attributes = $attributes === null ? [] : $attributes;
+
         $data = [
             'data' => [
                 'template' => 'Magento_Catalog::product/image_with_borders.phtml',

diff --git a/.../Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml b/.../Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptionsWithLongValuesTitle.xml
@@ -114,6 +114,6 @@
         </assertEquals>
         <moveMouseOver selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd" stepKey="hoverProduct"/>
         <waitForElementVisible selector="{{AdminOrderItemsOrderedSection.productNameOptions}} dd:nth-child(2)" stepKey="waitForCustomOptionValueFullName"/>
-        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj111 11Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
+        <see selector="{{AdminOrderItemsOrderedSection.productNameOptions}}" userInput="Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111Optisfvdklvfnkljvnfdklpvnfdjklfdvnjkvfdkjnvfdjkfvndj11111" stepKey="seeAdminOrderProductOptionValueDropdown1"/>
     </test>
 </tests>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/form.phtml
@@ -39,19 +39,13 @@
         <?= $block->getChildHtml('form_bottom') ?>
     </form>
 </div>
-<script>
-    require([
-        'jquery',
-        'priceBox'
-    ], function($){
-        var dataPriceBoxSelector = '[data-role=priceBox]',
-            dataProductIdSelector = '[data-product-id=<?= $block->escapeHtml($_product->getId()) ?>]',
-            priceBoxes = $(dataPriceBoxSelector + dataProductIdSelector);
 
-        priceBoxes = priceBoxes.filter(function(index, elem){
-            return !$(elem).find('.price-from').length;
-        });
-
-        priceBoxes.priceBox({'priceConfig': <?= /* @noEscape */ $block->getJsonConfig() ?>});
-    });
+<script type="text/x-magento-init">
+    {
+        "[data-role=priceBox][data-price-box=product-id-<?= $block->escapeHtml($_product->getId()) ?>]": {
+            "priceBox": {
+                "priceConfig":  <?= /* @noEscape */ $block->getJsonConfig() ?>
+            }
+        }
+    }
 </script>
diff --git a/app/code/Magento/Customer/Controller/Account/CreatePost.php b/app/code/Magento/Customer/Controller/Account/CreatePost.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Controller\Account;
 
 use Magento\Customer\Api\CustomerRepositoryInterface as CustomerRepository;
@@ -349,15 +351,14 @@ public function execute()
             $confirmation = $this->getRequest()->getParam('password_confirmation');
             $redirectUrl = $this->session->getBeforeAuthUrl();
             $this->checkPasswordConfirmation($password, $confirmation);
+
+            $extensionAttributes = $customer->getExtensionAttributes();
+            $extensionAttributes->setIsSubscribed($this->getRequest()->getParam('is_subscribed', false));
+            $customer->setExtensionAttributes($extensionAttributes);
+
             $customer = $this->accountManagement
                 ->createAccount($customer, $password, $redirectUrl);
 
-            if ($this->getRequest()->getParam('is_subscribed', false)) {
-                $extensionAttributes = $customer->getExtensionAttributes();
-                $extensionAttributes->setIsSubscribed(true);
-                $customer->setExtensionAttributes($extensionAttributes);
-                $this->customerRepository->save($customer);
-            }
             $this->_eventManager->dispatch(
                 'customer_register_success',
                 ['account_controller' => $this, 'customer' => $customer]

diff --git a/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php b/app/code/Magento/Eav/Model/ResourceModel/ReadHandler.php
@@ -3,20 +3,27 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Eav\Model\ResourceModel;
 
+use Exception;
 use Magento\Eav\Model\Config;
+use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\DataObject;
 use Magento\Framework\DB\Select;
 use Magento\Framework\DB\Sql\UnionExpression;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\EntityManager\Operation\AttributeInterface;
+use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Model\Entity\ScopeInterface;
 use Magento\Framework\Model\Entity\ScopeResolver;
 use Psr\Log\LoggerInterface;
 
 /**
  * EAV read handler
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ReadHandler implements AttributeInterface
 {
@@ -63,7 +70,7 @@ public function __construct(
      *
      * @param string $entityType
      * @return \Magento\Eav\Api\Data\AttributeInterface[]
-     * @throws \Exception if for unknown entity type
+     * @throws Exception if for unknown entity type
      * @deprecated Not used anymore
      * @see ReadHandler::getEntityAttributes
      */
@@ -80,7 +87,7 @@ protected function getAttributes($entityType)
      * @param string $entityType
      * @param DataObject $entity
      * @return \Magento\Eav\Api\Data\AttributeInterface[]
-     * @throws \Exception if for unknown entity type
+     * @throws Exception if for unknown entity type
      */
     private function getEntityAttributes(string $entityType, DataObject $entity): array
     {
@@ -111,9 +118,9 @@ protected function getContextVariables(ScopeInterface $scope)
      * @param array $entityData
      * @param array $arguments
      * @return array
-     * @throws \Exception
-     * @throws \Magento\Framework\Exception\ConfigurationMismatchException
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws Exception
+     * @throws ConfigurationMismatchException
+     * @throws LocalizedException
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function execute($entityType, $entityData, $arguments = [])
@@ -129,7 +136,7 @@ public function execute($entityType, $entityData, $arguments = [])
         $attributesMap = [];
         $selects = [];
 
-        /** @var \Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute */
+        /** @var AbstractAttribute $attribute */
         foreach ($this->getEntityAttributes($entityType, new DataObject($entityData)) as $attribute) {
             if (!$attribute->isStatic()) {
                 $attributeTables[$attribute->getBackend()->getTable()][] = $attribute->getAttributeId();
@@ -170,8 +177,11 @@ public function execute($entityType, $entityData, $arguments = [])
                     $entityData[$attributesMap[$attributeValue['attribute_id']]] = $attributeValue['value'];
                 } else {
                     $this->logger->warning(
-                        "Attempt to load value of nonexistent EAV attribute '{$attributeValue['attribute_id']}'
-                        for entity type '$entityType'."
+                        "Attempt to load value of nonexistent EAV attribute",
+                        [
+                            'attribute_id' => $attributeValue['attribute_id'],
+                            'entity_type' => $entityType
+                        ]
                     );
                 }
             }
@@ -184,8 +194,9 @@ public function execute($entityType, $entityData, $arguments = [])
      *
      * @param Select[] $selects
      * @param array $identifiers
+     * @return void
      */
-    private function applyIdentifierForSelects(array $selects, array $identifiers)
+    private function applyIdentifierForSelects(array $selects, array $identifiers): void
     {
         foreach ($selects as $select) {
             foreach ($identifiers as $identifier) {

diff --git a/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml b/app/code/Magento/Sales/view/adminhtml/templates/items/column/name.phtml
@@ -28,9 +28,8 @@
                     <?php else : ?>
                         <?php $_option = $block->getFormattedOption($_option['value']); ?>
                         <?php $dots = 'dots' . uniqid(); ?>
-                        <?= $block->escapeHtml($_option['value'], ['a']) ?><?php if (isset($_option['remainder']) && $_option['remainder']) : ?> <span id="<?= /* @noEscape */ $dots; ?>"> ...</span>
-                            <?php $id = 'id' . uniqid(); ?>
-                            <span id="<?= /* @noEscape */ $id; ?>"><?= $block->escapeHtml($_option['remainder'], ['a']) ?></span>
+                        <?php $id = 'id' . uniqid(); ?>
+                        <?= $block->escapeHtml($_option['value'], ['a']) ?><?php if (isset($_option['remainder']) && $_option['remainder']) : ?><span id="<?= /* @noEscape */ $dots; ?>"> ...</span><span id="<?= /* @noEscape */ $id; ?>"><?= $block->escapeHtml($_option['remainder'], ['a']) ?></span>
                             <script>
                                 require(['prototype'], function() {
                                     $('<?= /* @noEscape */ $id; ?>').hide();

diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -33,6 +33,10 @@
 
 //
 
+.modals-overlay {
+    &:extend(.abs-modal-overlay all);
+}
+
 .modal-popup,
 .modal-slide {
     .action-close {

diff --git a/app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_AdvancedCheckout/web/css/source/_module.less
@@ -53,12 +53,6 @@
             }
 
             .block-content {
-                &:extend(.abs-add-clearfix-desktop all);
-
-                .box {
-                    &:extend(.abs-blocks-2columns all);
-                }
-
                 .actions-toolbar {
                     clear: both;
                     .lib-actions-toolbar(
@@ -167,4 +161,16 @@
             &:extend(.abs-add-clearfix-desktop all);
         }
     }
+
+    .column {
+        .block-addbysku {
+            .block-content {
+                &:extend(.abs-add-clearfix-desktop all);
+
+                .box {
+                    &:extend(.abs-blocks-2columns all);
+                }
+            }
+        }
+    }
 }
diff --git a/...ntend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less b/...ntend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less
@@ -15,7 +15,6 @@
 
     .opc-estimated-wrapper {
         &:extend(.abs-add-clearfix all);
-        &:extend(.abs-no-display-desktop all);
         .lib-css(border-bottom, @border-width__base solid @color-gray80);
         margin: 0 0 15px;
         padding: 18px 15px;
@@ -37,7 +36,7 @@
                     &:before {
                         .lib-css(color, @button__color);
                     }
-                    
+
                     &:hover:before {
                         .lib-css(color, @button__hover__color);
                     }
@@ -53,6 +52,6 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .opc-estimated-wrapper {
-        display: none;
+        &:extend(.abs-no-display-desktop all);
     }
 }
diff --git a/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_GiftMessage/web/css/source/_module.less
@@ -18,7 +18,6 @@
 & when (@media-common = true) {
     .gift-message {
         .field {
-            &:extend(.abs-clearfix all);
             margin-bottom: @indent__base;
 
             .label {

diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
@@ -179,7 +179,7 @@
 & when (@media-common = true) {
     .abs-block-title {
         margin-bottom: 15px;
-        
+
         > strong {
             .lib-heading(h3);
         }
@@ -194,7 +194,7 @@
     .abs-account-blocks {
         .block-title {
             &:extend(.abs-block-title all);
-            
+
             > .action {
                 margin-left: 15px;
             }
@@ -849,6 +849,51 @@
     }
 }
 
+//
+//  Account pages: title
+//  ---------------------------------------------
+
+& when (@media-common = true) {
+    .abs-account-title {
+        > strong,
+        > span {
+            .lib-font-size(22);
+            .lib-css(font-weight, @font-weight__light);
+        }
+
+        .lib-css(border-bottom, 1px solid @border-color__base);
+        .lib-css(margin-bottom, @indent__m);
+        .lib-css(padding-bottom, @indent__s);
+    }
+}
+
+//
+//  Ratings: vertical alignment
+//  ---------------------------------------------
+
+& when (@media-common = true) {
+    .abs-rating-summary {
+        .rating {
+            &-summary {
+                display: table-row;
+            }
+
+            &-label {
+                display: table-cell;
+                padding-bottom: @indent__xs;
+                padding-right: @indent__m;
+                padding-top: 1px;
+                vertical-align: top;
+            }
+
+            &-result {
+                display: table-cell;
+                vertical-align: top;
+            }
+        }
+    }
+}
+
 //
 //  Add colon
 //  ---------------------------------------------

diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1212,7 +1212,7 @@
 }
 
 //
-//  Forms: margin-bottom for small forms
+//  Ratings: vertical alignment
 //  ---------------------------------------------
 
 & when (@media-common = true) {

diff --git a/lib/web/css/source/components/_modals.less b/lib/web/css/source/components/_modals.less
@@ -150,7 +150,6 @@
 
     //  Modals overlay
     .modals-overlay {
-        &:extend(.abs-modal-overlay all);
         .lib-css(z-index, @overlay__z-index);
     }
 

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentovariable/editor_plugin.js
@@ -171,7 +171,8 @@ define([
              * @returns {String}
              */
             decodeVariables: function (content) {
-                var doc = (new DOMParser()).parseFromString(content.replace(/&quot;/g, '&amp;quot;'), 'text/html');
+                var doc = (new DOMParser()).parseFromString(content.replace(/&quot;/g, '&amp;quot;'), 'text/html'),
+                    returnval = '';
 
                 [].forEach.call(doc.querySelectorAll('span.magento-variable'), function (el) {
                     var $el = jQuery(el);
@@ -195,7 +196,12 @@ define([
                     }
                 });
 
-                return doc.body ? doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : content;
+                returnval += doc.head.innerHTML ?
+                    doc.head.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
+                returnval += doc.body.innerHTML ?
+                    doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
+
+                return returnval ? returnval : content;
             },
 
             /**

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/plugins/magentowidget/editor_plugin.js
@@ -189,7 +189,7 @@ define([
              * @return {String}
              */
             removeDuplicateAncestorWidgetSpanElement: function (content) {
-                var parser, doc;
+                var parser, doc, returnval = '';
 
                 if (!window.DOMParser) {
                     return content;
@@ -212,7 +212,12 @@ define([
                     widgetEl.parentNode.removeChild(widgetEl);
                 });
 
-                return doc.body ? doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : content;
+                returnval += doc.head.innerHTML ?
+                    doc.head.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
+                returnval += doc.body.innerHTML ?
+                    doc.body.innerHTML.replace(/&amp;quot;/g, '&quot;') : '';
+
+                return returnval ? returnval : content;
             },
 
             /**

diff --git a/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js b/lib/web/mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter.js
@@ -198,6 +198,7 @@ define([
                 'convert_urls': false,
                 'content_css': this.config.tinymce4['content_css'],
                 'relative_urls': true,
+                'valid_children': '+body[style]',
                 menubar: false,
                 plugins: this.config.tinymce4.plugins,
                 toolbar: this.config.tinymce4.toolbar,