Remove deprecated CMS Block reference

opengento · Sep 5, 2022 · d3bcd3b · d3bcd3b
1 parent f18ce7c
commit d3bcd3b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"/>