Merge pull request #49 from magento/develop-backport

Backport develop branch into 1.0

Author: shiftedreality

patches.json

@@ -244,6 +244,14 @@
     },
     "Fix load balancer issue": {
       ">=2.3.4 <2.3.6": "MCLOUD-5837__fix_filesystem_load_balancer_issue__2.3.4.patch"
+    },
+    "Cache Locking performance issue": {
+      "2.3.3": "MDVA-27538__fix_performance_issue_in_cache_locking_mechanism__2.3.3.patch",
+      ">=2.3.3-p1 <2.3.4": "MDVA-27538__fix_performance_issue_in_cache_locking_mechanism__2.3.3-p1.patch",
+      ">=2.3.4 <2.3.5": "MDVA-26795__fix_performance_issue_in_cache_locking_mechanism__2.3.4.patch"
+    },
+    "Large amount of Keys Block Cache": {
+      ">=2.3.1 <2.3.5": "MDVA-22950__large_amount_of_keys_block_cache__2.3.1.patch"
     }
   },
   "magento/module-paypal": {
@@ -266,7 +274,8 @@
   },
   "monolog/monolog": {
     "Fix monolog Slack Handler bug for magento 2.1.x": {
-      "1.16.0": "MAGECLOUD-2793__fix_monolog_slack_handler_2.1.x.patch"
+      "1.16.0": "MAGECLOUD-2793__fix_monolog_slack_handler_2.1.x.patch",
+      ">=1.16.0 <1.24.0": "MAGECLOUD-6029__add_processor_interface_2.1.x.patch"
     }
   },
   "colinmollenhour/cache-backend-redis": {

patches/MAGECLOUD-6029__add_processor_interface_2.1.x.patch

@@ -0,0 +1,29 @@
+diff -Naur a/vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php b/vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php
+--- /dev/null
++++ b/vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php
+@@ -0,0 +1,25 @@
++<?php
++
++/*
++ * This file is part of the Monolog package.
++ *
++ * (c) Jordi Boggiano <[email protected]>
++ *
++ * For the full copyright and license information, please view the LICENSE
++ * file that was distributed with this source code.
++ */
++
++namespace Monolog\Processor;
++
++/**
++ * An optional interface to allow labelling Monolog processors.
++ *
++ * @author Nicolas Grekas <[email protected]>
++ */
++interface ProcessorInterface
++{
++    /**
++     * @return array The processed records
++     */
++    public function __invoke(array $records);
++}

patches/MDVA-22950__large_amount_of_keys_block_cache__2.3.1.patch

@@ -0,0 +1,45 @@
+diff -Nuar a/vendor/magento/module-swatches/Block/Product/Renderer/Listing/Configurable.php b/vendor/magento/module-swatches/Block/Product/Renderer/Listing/Configurable.php
+--- a/vendor/magento/module-swatches/Block/Product/Renderer/Listing/Configurable.php
++++ b/vendor/magento/module-swatches/Block/Product/Renderer/Listing/Configurable.php
+@@ -9,7 +9,6 @@ use Magento\Catalog\Block\Product\Context;
+ use Magento\Catalog\Helper\Product as CatalogProduct;
+ use Magento\Catalog\Model\Product;
+ use Magento\Catalog\Model\Layer\Resolver;
+-use Magento\Catalog\Model\Layer\Category as CategoryLayer;
+ use Magento\ConfigurableProduct\Helper\Data;
+ use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
+ use Magento\Customer\Helper\Session\CurrentCustomer;
+@@ -244,9 +243,12 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
+
+         $layeredAttributes = [];
+
+-        $configurableAttributes = array_map(function ($attribute) {
+-            return $attribute->getAttributeCode();
+-        }, $configurableAttributes);
++        $configurableAttributes = array_map(
++            function ($attribute) {
++                return $attribute->getAttributeCode();
++            },
++            $configurableAttributes
++        );
+
+         $commonAttributeCodes = array_intersect(
+             $configurableAttributes,
+@@ -259,17 +261,4 @@ class Configurable extends \Magento\Swatches\Block\Product\Renderer\Configurable
+
+         return $layeredAttributes;
+     }
+-
+-    /**
+-     * @inheritdoc
+-     * @since 100.3.1
+-     */
+-    public function getCacheKeyInfo()
+-    {
+-        $cacheKeyInfo = parent::getCacheKeyInfo();
+-        /** @var CategoryLayer $catalogLayer */
+-        $catalogLayer = $this->layerResolver->get();
+-        $cacheKeyInfo[] = $catalogLayer->getStateKey();
+-        return $cacheKeyInfo;
+-    }
+ }