From d3bcd3b57df901969d96a410fc4cdc1675ad0d9a Mon Sep 17 00:00:00 2001
From: Thomas Klein <thomas.klein@mpbio.com>
Date: Mon, 5 Sep 2022 22:46:01 +0200
Subject: [PATCH] Remove deprecated CMS Block reference

---
 Service/Export/Renderer/HtmlRenderer.php            | 5 -----
 ViewModel/Customer/Privacy/EraseDataProvider.php    | 5 ++---
 ViewModel/Customer/Privacy/ExportDataProvider.php   | 4 ----
 ViewModel/Customer/Privacy/SettingsDataProvider.php | 1 -
 etc/module.xml                                      | 1 +
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/Service/Export/Renderer/HtmlRenderer.php b/Service/Export/Renderer/HtmlRenderer.php
index fd2e6192..57c540f7 100644
--- a/Service/Export/Renderer/HtmlRenderer.php
+++ b/Service/Export/Renderer/HtmlRenderer.php
@@ -18,7 +18,6 @@
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\FileSystem as ViewFileSystem;
 use Magento\Framework\View\Page\Config;
-use Magento\Framework\View\Page\Config\RendererInterface;
 use Opengento\Gdpr\Service\Export\Renderer\HtmlRenderer\LayoutInitiatorInterface;
 use Opengento\Gdpr\Service\Export\Renderer\HtmlRenderer\View\RendererFactory;
 use function extract;
@@ -76,8 +75,6 @@ function () use ($data): string { return $this->renderHtml($data); }
     }
 
     /**
-     * @param array $data
-     * @return string
      * @throws Exception
      */
     private function renderHtml(array $data): string
@@ -105,8 +102,6 @@ private function renderHtml(array $data): string
     }
 
     /**
-     * @param array $viewVars
-     * @return string
      * @throws Exception
      */
     private function renderPage(array $viewVars): string
diff --git a/ViewModel/Customer/Privacy/EraseDataProvider.php b/ViewModel/Customer/Privacy/EraseDataProvider.php
index 42d2af7d..1bdcc634 100644
--- a/ViewModel/Customer/Privacy/EraseDataProvider.php
+++ b/ViewModel/Customer/Privacy/EraseDataProvider.php
@@ -7,7 +7,6 @@
 
 namespace Opengento\Gdpr\ViewModel\Customer\Privacy;
 
-use Magento\Cms\Block\Block;
 use Magento\Cms\Block\BlockByIdentifier;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
@@ -49,8 +48,8 @@ public function getErasureInformationHtml(): string
     public function getAnonymizeInformationHtml(): string
     {
         return $this->anonymizeInformation ??= $this->blockFactory->createBlock(
-            Block::class,
-            ['data' => ['block_id' => (string) $this->scopeConfig->getValue(
+            BlockByIdentifier::class,
+            ['data' => ['identifier' => (string) $this->scopeConfig->getValue(
                 self::CONFIG_PATH_ANONYMIZE_INFORMATION_BLOCK,
                 ScopeInterface::SCOPE_STORE
             )]]
diff --git a/ViewModel/Customer/Privacy/ExportDataProvider.php b/ViewModel/Customer/Privacy/ExportDataProvider.php
index 3c408cc4..37aef3f6 100644
--- a/ViewModel/Customer/Privacy/ExportDataProvider.php
+++ b/ViewModel/Customer/Privacy/ExportDataProvider.php
@@ -7,7 +7,6 @@
 
 namespace Opengento\Gdpr\ViewModel\Customer\Privacy;
 
-use Magento\Cms\Block\Block;
 use Magento\Cms\Block\BlockByIdentifier;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
@@ -22,9 +21,6 @@ final class ExportDataProvider implements ArgumentInterface
 
     private BlockFactory $blockFactory;
 
-    /**
-     * @var string|null
-     */
     private ?string $exportInformation;
 
     public function __construct(
diff --git a/ViewModel/Customer/Privacy/SettingsDataProvider.php b/ViewModel/Customer/Privacy/SettingsDataProvider.php
index c18a58fd..eb688b77 100644
--- a/ViewModel/Customer/Privacy/SettingsDataProvider.php
+++ b/ViewModel/Customer/Privacy/SettingsDataProvider.php
@@ -7,7 +7,6 @@
 
 namespace Opengento\Gdpr\ViewModel\Customer\Privacy;
 
-use Magento\Cms\Block\Block;
 use Magento\Cms\Block\BlockByIdentifier;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
diff --git a/etc/module.xml b/etc/module.xml
index c450796c..8da68711 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -10,6 +10,7 @@
         <sequence>
             <module name="Magento_Theme"/>
             <module name="Magento_Config"/>
+            <module name="Magento_Cookie"/>
             <module name="Magento_Customer"/>
             <module name="Magento_Quote"/>
             <module name="Magento_Sales"/>