From 0f23f7b99b22d7159a4f6f490fe8dfea6fa81d0e Mon Sep 17 00:00:00 2001
From: Medvediev <v.medvediev@atwix.com>
Date: Mon, 1 Mar 2021 17:20:02 +0200
Subject: [PATCH 1/2] Using \Magento\Framework\Data\OptionSourceInterface
 instead of Magento\Framework\Option\ArrayInterface

---
 app/code/Magento/PageBuilder/Model/Config/Source/Country.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/PageBuilder/Model/Config/Source/Country.php b/app/code/Magento/PageBuilder/Model/Config/Source/Country.php
index 6738636f599..fbaa25da0e9 100644
--- a/app/code/Magento/PageBuilder/Model/Config/Source/Country.php
+++ b/app/code/Magento/PageBuilder/Model/Config/Source/Country.php
@@ -13,7 +13,7 @@
  *
  * @api
  */
-class Country implements \Magento\Framework\Option\ArrayInterface
+class Country implements \Magento\Framework\Data\OptionSourceInterface
 {
     /**
      * @var \Magento\Directory\Model\ResourceModel\Country\Collection

From ece147ec83df44a8479cc974d4b0e7ca98a82bb1 Mon Sep 17 00:00:00 2001
From: Medvediev <v.medvediev@atwix.com>
Date: Mon, 1 Mar 2021 17:22:12 +0200
Subject: [PATCH 2/2] Removed pagebuilder_preview_sid_resolving plugin

---
 .../Plugin/Framework/Session/SidResolver.php  | 49 -------------------
 app/code/Magento/PageBuilder/etc/di.xml       |  3 --
 2 files changed, 52 deletions(-)
 delete mode 100644 app/code/Magento/PageBuilder/Plugin/Framework/Session/SidResolver.php

diff --git a/app/code/Magento/PageBuilder/Plugin/Framework/Session/SidResolver.php b/app/code/Magento/PageBuilder/Plugin/Framework/Session/SidResolver.php
deleted file mode 100644
index a1e9d943a18..00000000000
--- a/app/code/Magento/PageBuilder/Plugin/Framework/Session/SidResolver.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-namespace Magento\PageBuilder\Plugin\Framework\Session;
-
-/**
- * Plugin for SID resolver.
- */
-class SidResolver
-{
-    /**
-     * @var \Magento\Framework\App\RequestInterface
-     */
-    private $request;
-
-    /**
-     * @param \Magento\Framework\App\RequestInterface $request
-     */
-    public function __construct(
-        \Magento\Framework\App\RequestInterface $request
-    ) {
-        $this->request = $request;
-    }
-
-    /**
-     * Get Sid for pagebuilder preview
-     *
-     * @param \Magento\Framework\Session\SidResolver $subject
-     * @param string|null $result
-     * @param \Magento\Framework\Session\SessionManagerInterface $session
-     *
-     * @return string|null
-     */
-    public function afterGetSid(
-        \Magento\Framework\Session\SidResolver $subject,
-        $result,
-        \Magento\Framework\Session\SessionManagerInterface $session
-    ) {
-        if (strpos($this->request->getPathInfo(), '/pagebuilder/contenttype/preview') === 0) {
-            return $this->request->getQuery(
-                $subject->getSessionIdQueryParam($session)
-            );
-        }
-
-        return $result;
-    }
-}
diff --git a/app/code/Magento/PageBuilder/etc/di.xml b/app/code/Magento/PageBuilder/etc/di.xml
index 5dae5fe19ae..280876989cd 100644
--- a/app/code/Magento/PageBuilder/etc/di.xml
+++ b/app/code/Magento/PageBuilder/etc/di.xml
@@ -194,9 +194,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Session\SidResolver">
-        <plugin name="pagebuilder_preview_sid_resolving" type="Magento\PageBuilder\Plugin\Framework\Session\SidResolver" />
-    </type>
     <virtualType name="Magento\PageBuilder\Model\Catalog\Sorting\Date\NewestTop" type="Magento\PageBuilder\Model\Catalog\Sorting\SimpleOption">
         <arguments>
             <argument name="label" xsi:type="string">Newest products first</argument>