Merge branch 'master' into magento2.4.x

Author: thomas-kl1

Model/Config/Backend/Export.php

@@ -14,7 +14,6 @@
 use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\Exception\CouldNotDeleteException;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Model\Context;
 use Magento\Framework\Model\ResourceModel\AbstractResource;
 use Magento\Framework\Registry;
@@ -52,7 +51,6 @@ public function __construct(
      * @return $this
      * @throws CouldNotDeleteException
      * @throws LocalizedException
-     * @throws NoSuchEntityException
      */
     public function afterSave(): self
     {

Model/Config/PrivacyMessage.php

@@ -64,6 +64,6 @@ public function getLearnMoreUrl(): string
         return $this->helperPage->getPageUrl((string) $this->scopeConfig->getValue(
             self::CONFIG_PATH_GENERAL_INFORMATION_PAGE,
             ScopeInterface::SCOPE_STORE
-        ));
+        )) ?? '#';
     }
 }

Service/Export/Renderer/HtmlRenderer.php

@@ -33,6 +33,9 @@ final class HtmlRenderer extends AbstractRenderer
      */
     private $appState;
 
+    /**
+     * @var DesignInterface
+     */
     private $design;
 
     /**

TODO.md

@@ -27,6 +27,10 @@ Area:
 - Payment Data
 - Invitation Data
 
+# Export
+
+Invalidation on entity updates
+
 ## yu
 
 https://github.com/magento/architecture/pull/145/files

view/base/templates/export/renderer/default.phtml

@@ -22,9 +22,9 @@ $viewModel = $block->getData('viewModel');
 $exportData = array_filter($viewModel->toArray());
 
 if (!function_exists('formatLabel')) {
-    function formatLabel(string $label): string
+    function formatLabel($label): string
     {
-        return ucwords(str_replace('_', ' ', $label));
+        return ucwords(str_replace('_', ' ', (string) $label));
     }
 }
 if (!function_exists('renderNestedItems')) {

view/frontend/layout/customer_account.xml

@@ -11,7 +11,7 @@
             <block class="Magento\Framework\View\Element\Html\Link\Current" name="customer-account-navigation-privacy-link" after="customer-account-navigation-wish-list-link" ifconfig="gdpr/general/enabled">
                 <arguments>
                     <argument name="path" xsi:type="string">customer/privacy/settings</argument>
-                    <argument name="label" xsi:type="string">Privacy settings</argument>
+                    <argument name="label" xsi:type="string" translate="true">Privacy Settings</argument>
                 </arguments>
             </block>
         </referenceBlock>

view/frontend/templates/account/privacy/erase.phtml

@@ -48,15 +48,13 @@ $eraseCustomerDataProvider = $block->getData('eraseCustomerDataProvider');
                     <?= $eraseDataProvider->getAnonymizeInformationHtml() ?>
                 </div>
             <?php endif; ?>
-            <form action="<?= $escaper->escapeUrl($block->getData('eraseActionUrl')) ?>" method="post">
-                <div class="actions-toolbar">
-                    <div class="primary">
-                        <button type="submit" class="action submit primary primary-danger" id="delete">
-                            <span><?= $escaper->escapeHtml(__('Erase Personal Data')) ?></span>
-                        </button>
-                    </div>
+            <div class="actions-toolbar">
+                <div class="primary">
+                    <a href="<?= $escaper->escapeUrl($block->getData('eraseActionUrl')) ?>" class="action primary primary-danger" id="delete">
+                        <span><?= $escaper->escapeHtml(__('Erase Personal Data')) ?></span>
+                    </a>
                 </div>
-            </form>
+            </div>
         <?php else: ?>
             <div class="message info">
                 <span><?= $escaper->escapeHtml(__('Your account cannot be erased while you have pending orders.')) ?></span>