🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #22378: [Backport] Same product quantity not increment when added with guest user. #21375 (by @amol2jcommerce)
 - #22464: [Backport] Remove all marketing get params on Varnish to minimize the cache objects (added facebook and bronto parameter) (by @ihor-sviziev)
 - #22415: filter config values on testSuiteStart (by @bcerban)


Fixed GitHub Issues:
 - #21375: Same product quantity not increment when added with guest user. (reported by @krishprakash) has been fixed in #22378 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. 57af527

 - #22370: Filtering ignored config values in test framework causes error (reported by @bcerban) has been fixed in #22415 by @bcerban in 2.2-develop branch
   Related commits:
     1. 79e90ba

app/code/Magento/PageCache/etc/varnish4.vcl

@@ -92,8 +92,8 @@ sub vcl_recv {
     }
 
     # Remove all marketing get parameters to minimize the cache objects
-    if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=") {
-        set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
+    if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=") {
+        set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
         set req.url = regsub(req.url, "[?|&]+$", "");
     }
 

app/code/Magento/PageCache/etc/varnish5.vcl

@@ -93,8 +93,8 @@ sub vcl_recv {
     }
 
     # Remove all marketing get parameters to minimize the cache objects
-    if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=") {
-        set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|mc_[a-z]+|utm_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
+    if (req.url ~ "(\?|&)(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=") {
+        set req.url = regsuball(req.url, "(gclid|cx|ie|cof|siteurl|zanpid|origin|fbclid|mc_[a-z]+|utm_[a-z]+|_bta_[a-z]+)=[-_A-z0-9+()%.]+&?", "");
         set req.url = regsub(req.url, "[?|&]+$", "");
     }
 

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

@@ -50,7 +50,7 @@ protected function getOptionValues($value)
         if (is_string($value) && $this->jsonValidator->isValid($value)) {
             $value = $this->serializer->unserialize($value);
             if (is_array($value)) {
-                unset($value['qty'], $value['uenc']);
+                unset($value['qty'], $value['uenc'], $value['related_product'], $value['item']);
                 $value = array_filter($value, function ($optionValue) {
                     return !empty($optionValue);
                 });

dev/tests/integration/framework/Magento/TestFramework/Isolation/DeploymentConfig.php

@@ -51,7 +51,7 @@ public function startTestSuite()
     {
         if (null === $this->reader) {
             $this->reader = Bootstrap::getObjectManager()->get(\Magento\Framework\App\DeploymentConfig\Reader::class);
-            $this->config = $this->reader->load();
+            $this->config = $this->filterIgnoredConfigValues($this->reader->load());
         }
     }