MAGETWO-87057: [EngCom Team] Batch 5. Forwardports to 2.3-develop #1286

 - Merge Pull Request magento-engcom/magento2ce#1286 from magento-engcom-team/magento2:batch-5-forwardport-2.3-develop
 - Merged commits:
   1. b529c16
   2. c25b34e
   3. 0742a0b
   4. 45f4535
   5. 6c1e5be
   6. d9eec50
   7. 34b8ad8
   8. 2c96f79
   9. 0a03029
   10. fc38208
   11. edc9ae2
   12. 8052842
   13. 9067b19
   14. 660a0a1
   15. 612bfbb
   16. 523aabe
   17. 5600c82
   18. e5cb3c1
   19. 097b701
   20. 6c7aee0
   21. 0fffced

Author: Oleksii Korshenko

app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php

@@ -40,6 +40,17 @@ public function getItems($attributeCode)
      */
     public function add($attributeCode, $option)
     {
+        /** @var \Magento\Eav\Api\Data\AttributeOptionInterface[] $currentOptions */
+        $currentOptions = $this->getItems($attributeCode);
+        if (is_array($currentOptions)) {
+            array_walk($currentOptions, function (&$attributeOption) {
+                /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
+                    $attributeOption = $attributeOption->getLabel();
+            });
+            if (in_array($option->getLabel(), $currentOptions)) {
+                return false;
+            }
+        }
         return $this->eavOptionManagement->add(
             \Magento\Catalog\Api\Data\ProductAttributeInterface::ENTITY_TYPE_CODE,
             $attributeCode,

app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/js.phtml

@@ -196,9 +196,11 @@ function switchDefaultValueField()
 
         <?php foreach ($this->helper('Magento\Catalog\Helper\Data')->getAttributeHiddenFields() as $type => $fields): ?>
             case '<?= /* @escapeNotVerified */ $type ?>':
+                var isFrontTabHidden = false;
                 <?php foreach ($fields as $one): ?>
                     <?php if ($one == '_front_fieldset'): ?>
                         getFrontTab().hide();
+                        isFrontTabHidden = true;
                     <?php elseif ($one == '_default_value'): ?>
                         defaultValueTextVisibility =
                         defaultValueTextareaVisibility =
@@ -210,6 +212,10 @@ function switchDefaultValueField()
                         setRowVisibility('<?= /* @escapeNotVerified */ $one ?>', false);
                     <?php endif; ?>
                 <?php endforeach; ?>
+
+                if (!isFrontTabHidden){
+                  getFrontTab().show();
+                }
             break;
         <?php endforeach; ?>
 

app/code/Magento/Customer/etc/adminhtml/system.xml

@@ -198,7 +198,8 @@
                 <field id="street_lines" translate="label comment" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Number of Lines in a Street Address</label>
                     <backend_model>Magento\Customer\Model\Config\Backend\Address\Street</backend_model>
-                    <comment>Leave empty for default (2). Valid range: 1-4</comment>
+                    <comment>Valid range: 1-4</comment>
+                    <validate>required-entry validate-digits validate-digits-range digits-range-1-4</validate>
                 </field>
                 <field id="prefix_show" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="0">
                     <label>Show Prefix</label>

app/code/Magento/Eav/Model/Entity/Attribute/Backend/JsonEncoded.php

@@ -58,7 +58,7 @@ public function afterLoad($object)
     {
         parent::afterLoad($object);
         $attrCode = $this->getAttribute()->getAttributeCode();
-        $object->setData($attrCode, $this->jsonSerializer->unserialize($object->getData($attrCode)));
+        $object->setData($attrCode, $this->jsonSerializer->unserialize($object->getData($attrCode) ?: '{}'));
         return $this;
     }
 }

app/code/Magento/Eav/Test/Unit/Model/Entity/Attribute/Backend/JsonEncodedTest.php

@@ -95,4 +95,18 @@ public function testAfterLoad()
         $this->model->afterLoad($product);
         $this->assertEquals([1, 2, 3], $product->getData('json_encoded'));
     }
+
+    /**
+     * Test after load handler with null attribute value
+     */
+    public function testAfterLoadWithNullAttributeValue()
+    {
+        $product = new \Magento\Framework\DataObject(
+            [
+                'json_encoded' => null
+            ]
+        );
+        $this->model->afterLoad($product);
+        $this->assertEquals([], $product->getData('json_encoded'));
+    }
 }

app/code/Magento/Newsletter/Model/Subscriber.php

@@ -94,6 +94,12 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      */
     protected $_customerSession;
 
+    /**
+     * Date
+     * @var \Magento\Framework\Stdlib\DateTime\DateTime
+     */
+    private $dateTime;
+
     /**
      * Store manager
      *
@@ -134,9 +140,10 @@ class Subscriber extends \Magento\Framework\Model\AbstractModel
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $customerAccountManagement
      * @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
-     * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
-     * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
+     * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime|null $dateTime
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -152,13 +159,17 @@ public function __construct(
         \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Stdlib\DateTime\DateTime $dateTime = null
     ) {
         $this->_newsletterData = $newsletterData;
         $this->_scopeConfig = $scopeConfig;
         $this->_transportBuilder = $transportBuilder;
         $this->_storeManager = $storeManager;
         $this->_customerSession = $customerSession;
+        $this->dateTime = $dateTime ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\Stdlib\DateTime\DateTime::class
+        );
         $this->customerRepository = $customerRepository;
         $this->customerAccountManagement = $customerAccountManagement;
         $this->inlineTranslation = $inlineTranslation;
@@ -812,4 +823,18 @@ public function getSubscriberFullName()
         }
         return $name;
     }
+
+    /**
+     * Set date of last changed status
+     *
+     * @return $this
+     */
+    public function beforeSave()
+    {
+        parent::beforeSave();
+        if ($this->dataHasChangedFor('subscriber_status')) {
+            $this->setChangeStatusAt($this->dateTime->gmtDate());
+        }
+        return $this;
+    }
 }

app/code/Magento/Quote/Model/Quote.php

@@ -1046,7 +1046,7 @@ public function addCustomerAddress(\Magento\Customer\Api\Data\AddressInterface $
     public function updateCustomerData(\Magento\Customer\Api\Data\CustomerInterface $customer)
     {
         $quoteCustomer = $this->getCustomer();
-        $this->dataObjectHelper->mergeDataObjects(get_class($quoteCustomer), $quoteCustomer, $customer);
+        $this->dataObjectHelper->mergeDataObjects(CustomerInterface::class, $quoteCustomer, $customer);
         $this->setCustomer($quoteCustomer);
         return $this;
     }

app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php

@@ -101,7 +101,7 @@ protected function _construct()
      */
     public function getStoreId()
     {
-        return (int)$this->_quote->getStoreId();
+        return (int)$this->_productCollectionFactory->create()->getStoreId();
     }
 
     /**

app/code/Magento/Swatches/view/adminhtml/web/js/product-attributes.js

@@ -182,6 +182,7 @@ define([
                         useProductImageForSwatch = false,
                         defaultValueUpdateImage = false,
                         optionDefaultInputType = '',
+                        isFrontTabHidden = false,
                         thing = this;
 
                     if (!this.frontendInput.length) {
@@ -247,6 +248,7 @@ define([
                             switch (option) {
                                 case '_front_fieldset':
                                     thing.tabsFront.hide();
+                                    isFrontTabHidden = true;
                                     break;
 
                                 case '_default_value':
@@ -263,6 +265,11 @@ define([
                                     thing.setRowVisibility($('#' + option), false);
                             }
                         });
+
+                        if (!isFrontTabHidden) {
+                            thing.tabsFront.show();
+                        }
+
                     } else {
                         this.tabsFront.show();
                         this.showDefaultRows();

app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php

@@ -79,7 +79,10 @@ private function validateAclResource($dataProviderConfigData)
     {
         if (isset($dataProviderConfigData['aclResource'])) {
             if (!$this->_authorization->isAllowed($dataProviderConfigData['aclResource'])) {
-                $this->_redirect('admin/denied');
+                if (!$this->_request->isAjax()) {
+                    $this->_redirect('admin/denied');
+                }
+
                 return false;
             }
         }