🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #9347: Zend feed refactoring (by @ldusan84)
 - #15154: [Forwardport] Fixed documentation about viewModels (by @dmytro-ch)
 - #15143: [Forwardport] chore: checkout last 5 commits (by @mzeis)
 - #15123: [Forwardport] small optimization in if-condition (by @mzeis)
 - #15071: [Forwardport] Add statement to 'beforeSave' method to allow app:config:import (by @adrian-martinez-interactiv4)
 - #15070: [Forwardport] Duplicate Order Confirmation Emails for PayPal Express checkout order (by @adrian-martinez-interactiv4)
 - #15063: [2.3-develop][Forwardport] #7822 Empty Checkout Agreement Edit Form when Single Store Mode is enabled (by @gwharton)
 - #14429: [ForwardPort 2.3-develop] Fix \Magento\Checkout\Controller\Index\Index::isSecureRequest method to take care of current request being secure and also from referer, as stated in phpdoc block (by @adrian-martinez-interactiv4)


Fixed GitHub Issues:
 - #9240: Upgrade ZF components. Zend_Feed (reported by @okorshenko) has been fixed in #9347 by @ldusan84 in 2.3-develop branch
   Related commits:
     1. ca9e582
     2. ed33b18
     3. c7ba65a
     4. 9d0a290
     5. 109047f
     6. 4534a2e
     7. c413389
     8. caa4471
     9. 66154e6
     10. 49bcf98
     11. c0b4c7a
     12. 411d0fc
     13. 9779ebe
     14. eba92d0
     15. 983d74f
     16. 0b51e8c
     17. 74d431a
     18. 7f73d67
     19. 2933223
     20. 64610d3
     21. d2d397a
     22. 0770227
     23. 735c840
     24. 7e17d20
     25. 46c51ba
     26. 3a3683f
     27. 6311d5c
     28. 4462eaf

 - #7822: Empty Checkout Agreement Edit Form when Single Store Mode is enabled (reported by @RedEnzian) has been fixed in #15063 by @gwharton in 2.3-develop branch
   Related commits:
     1. d61fe1d
     2. 9c4a26f
     3. 76be1b9

 - #4301: Hit fast twice F5 on checout page, customer loggs out automatically (reported by @daniel-ifrim) has been fixed in #14429 by @adrian-martinez-interactiv4 in 2.3-develop branch
   Related commits:
     1. f82a175
     2. 4d23b8b

 - #12362: Concurrent (quick reload) requests on checkout cause cart to empty - related to session_regenerate_id (reported by @minlare) has been fixed in #14429 by @adrian-martinez-interactiv4 in 2.3-develop branch
   Related commits:
     1. f82a175
     2. 4d23b8b

 - #13427: [2.1.11] Add to cart, try to checkout, cart is empty but mini-cart has items. (reported by @aeu) has been fixed in #14429 by @adrian-martinez-interactiv4 in 2.3-develop branch
   Related commits:
     1. f82a175
     2. 4d23b8b

Author: magento-engcom-team

.travis.yml

@@ -18,6 +18,8 @@ language: php
 php:
   - 7.1
   - 7.2
+git:
+  depth: 5
 env:
   global:
     - COMPOSER_BIN_DIR=~/bin

app/code/Magento/Backend/Block/Template.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backend\Block;
 
 /**
@@ -17,10 +20,12 @@
  * Example:
  * <block name="my.block" class="Magento\Backend\Block\Template" template="My_Module::template.phtml" >
  *      <arguments>
- *          <argument name="viewModel" xsi:type="object">My\Module\ViewModel\Custom</argument>
+ *          <argument name="view_model" xsi:type="object">My\Module\ViewModel\Custom</argument>
  *      </arguments>
  * </block>
  *
+ * Your class object can then be accessed by doing $block->getViewModel()
+ *
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @since 100.0.2

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper/AttributeFilter.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Controller\Adminhtml\Product\Initialization\Helper;
 
 use \Magento\Catalog\Model\Product;
@@ -28,14 +31,25 @@ class AttributeFilter
     public function prepareProductAttributes(Product $product, array $productData, array $useDefaults)
     {
         foreach ($productData as $attribute => $value) {
-            $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
-            if ($value === '' && $considerUseDefaultsAttribute) {
-                /** @var $product Product */
-                if ((bool)$product->getData($attribute) === (bool)$value) {
-                    unset($productData[$attribute]);
-                }
+            if ($this->isAttributeShouldNotBeUpdated($product, $useDefaults, $attribute, $value)) {
+                unset($productData[$attribute]);
             }
         }
+
         return $productData;
     }
+
+    /**
+     * @param Product $product
+     * @param $useDefaults
+     * @param $attribute
+     * @param $value
+     * @return bool
+     */
+    private function isAttributeShouldNotBeUpdated(Product $product, $useDefaults, $attribute, $value) : bool
+    {
+        $considerUseDefaultsAttribute = !isset($useDefaults[$attribute]) || $useDefaults[$attribute] === "1";
+
+        return ($value === '' && $considerUseDefaultsAttribute && !$product->getData($attribute));
+    }
 }

app/code/Magento/Checkout/Controller/Index/Index.php

@@ -4,6 +4,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Checkout\Controller\Index;
 
 class Index extends \Magento\Checkout\Controller\Onepage
@@ -32,11 +35,35 @@ public function execute()
             return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
 
-        $this->_customerSession->regenerateId();
+        // generate session ID only if connection is unsecure according to issues in session_regenerate_id function.
+        // @see http://php.net/manual/en/function.session-regenerate-id.php
+        if (!$this->isSecureRequest()) {
+            $this->_customerSession->regenerateId();
+        }
         $this->_objectManager->get(\Magento\Checkout\Model\Session::class)->setCartWasUpdated(false);
         $this->getOnepage()->initCheckout();
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getConfig()->getTitle()->set(__('Checkout'));
         return $resultPage;
     }
+
+    /**
+     * Checks if current request uses SSL and referer also is secure.
+     *
+     * @return bool
+     */
+    private function isSecureRequest(): bool
+    {
+        $request = $this->getRequest();
+
+        $referrer = $request->getHeader('referer');
+        $secure = false;
+
+        if ($referrer) {
+            $scheme = parse_url($referrer, PHP_URL_SCHEME);
+            $secure = $scheme === 'https';
+        }
+
+        return $secure && $request->isSecure();
+    }
 }