Merge branch '2.4-develop' of http://github.com/magento/magento2 into…

… fix-adobe-stock-issue-1002
magento · Apr 1, 2020 · c83fbc6 · c83fbc6
2 parents 9735426 + 1116437
commit c83fbc6
Show file tree

Hide file tree

Showing 219 changed files with 16 additions and 17,250 deletions.
diff --git a/app/code/Magento/Backend/README.md b/app/code/Magento/Backend/README.md
@@ -16,7 +16,6 @@ Before disabling or uninstalling this module, note that the following modules de
 - Magento_ReleaseNotification
 - Magento_Search
 - Magento_Security
-- Magento_Signifyd
 - Magento_Swatches
 - Magento_Ui
 - Magento_User

diff --git a/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php b/app/code/Magento/Paypal/Block/Express/InContext/Minicart/SmartButton.php
@@ -27,6 +27,8 @@ class SmartButton extends Template implements ShortcutInterface
 {
     private const ALIAS_ELEMENT_INDEX = 'alias';
 
+    const PAYPAL_BUTTON_ID = 'paypal-express-in-context-checkout-main';
+
     /**
      * @var Config
      */

diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/in-context/component.phtml
@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-use Magento\Paypal\Block\Express\InContext\Minicart\Button;
+use Magento\Paypal\Block\Express\InContext\Minicart\SmartButton;
 
 /** @var \Magento\Paypal\Block\Express\InContext\Component $block */
 
 $configuration = [
-    'id' => Button::PAYPAL_BUTTON_ID,
+    'id' => SmartButton::PAYPAL_BUTTON_ID,
     'path' => $block->getUrl(
         'paypal/express/gettoken',
         [
@@ -21,17 +21,18 @@ $configuration = [
         'locale' => $block->getLocale(),
         'environment' => $block->getEnvironment(),
         'button' => [
-            Button::PAYPAL_BUTTON_ID,
+            SmartButton::PAYPAL_BUTTON_ID,
         ]
     ]
 ];
 
 ?>
-<div style="display: none;" id="<?= /* @noEscape */ Button::PAYPAL_BUTTON_ID ?>"></div>
+<div style="display: none;" id="<?= /* @noEscape */ SmartButton::PAYPAL_BUTTON_ID ?>"></div>
 <script type="text/x-magento-init">
     {
         "*": {
-            "Magento_Paypal/js/in-context/express-checkout": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($configuration) ?>
+            "Magento_Paypal/js/in-context/express-checkout":
+            <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($configuration) ?>
         }
     }
 </script>
diff --git a/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php b/app/code/Magento/Signifyd/Api/CaseCreationServiceInterface.php
diff --git a/app/code/Magento/Signifyd/Api/CaseManagementInterface.php b/app/code/Magento/Signifyd/Api/CaseManagementInterface.php
diff --git a/app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php b/app/code/Magento/Signifyd/Api/CaseRepositoryInterface.php