Merge remote-tracking branch 'trigger/MC-41710' into MC-41701

Author: xmav

app/code/Magento/Paypal/Block/PayLater/Banner.php

@@ -35,6 +35,7 @@ class Banner extends Template
     /**
      * @param Template\Context $context
      * @param PayLaterConfig $payLaterConfig
+     * @param SdkUrl $sdkUrl
      * @param array $data
      */
     public function __construct(
@@ -105,11 +106,11 @@ private function getPayPalSdkUrl(): string
     /**
      * Retrieve style configuration
      *
-     * @return array
+     * @return string[]
      */
     private function getStyleAttributesConfig(): array
     {
-        return $this->payLaterConfig->getStyleConfig($this->placement);
+        return $this->payLaterConfig->getSectionConfig($this->placement, PayLaterConfig::CONFIG_KEY_STYLES);
     }
 
     /**
@@ -120,6 +121,8 @@ private function getStyleAttributesConfig(): array
     private function isEnabled(): bool
     {
         $enabled = $this->payLaterConfig->isEnabled($this->placement);
-        return $enabled && $this->payLaterConfig->getPositionConfig($this->placement) == $this->position;
+        return $enabled &&
+            $this->payLaterConfig->getSectionConfig($this->placement, PayLaterConfig::CONFIG_KEY_POSITION) ===
+                $this->position;
     }
 }

app/code/Magento/Paypal/Model/PayLaterConfig.php

@@ -14,6 +14,16 @@
  */
 class PayLaterConfig
 {
+    /**
+     * Configuration key for Styles settings
+     */
+    const CONFIG_KEY_STYLES = 'styles';
+
+    /**
+     * Configuration key for Position setting
+     */
+    const CONFIG_KEY_POSITION = 'position';
+
     /**
      * @var Config
      */
@@ -41,28 +51,6 @@ public function __construct(
         $this->config = $config;
     }
 
-    /**
-     * Get configured styles for specified page
-     *
-     * @param string $placement
-     * @return array
-     */
-    public function getStyleConfig(string $placement): array
-    {
-        return $this->getSectionConfig($placement, 'style') ?? [];
-    }
-
-    /**
-     * Get configured Banner position on specified page
-     *
-     * @param string $placement
-     * @return string
-     */
-    public function getPositionConfig(string $placement): string
-    {
-        return $this->getSectionConfig($placement, 'position') ?? '';
-    }
-
     /**
      * Check if Banner enabled for specified page
      *
@@ -96,9 +84,9 @@ private function isPPCreditEnabled()
      *
      * @param string $section
      * @param string $key
-     * @return mixed
+     * @return array|string|int
      */
-    private function getSectionConfig($section, $key)
+    public function getSectionConfig(string $section, string $key)
     {
         if (!array_key_exists($section, $this->configData)) {
             $this->configData[$section] = [

app/code/Magento/Paypal/Plugin/CheckoutIndex.php

@@ -9,6 +9,7 @@
 
 use Magento\Checkout\Controller\Index\Index;
 use Magento\Paypal\Model\Config;
+use Magento\Paypal\Model\ConfigFactory;
 use Magento\Paypal\Model\SdkUrl;
 
 /**
@@ -25,19 +26,18 @@ class CheckoutIndex
     /**
      * @var Config
      */
-    private $config;
+    private $configFactory;
 
     /**
      * @param SdkUrl $sdkUrl
      * @param Config $config
      */
     public function __construct(
         SdkUrl $sdkUrl,
-        Config $config
+        ConfigFactory $config
     ) {
         $this->sdkUrl = $sdkUrl;
-        $this->config = $config;
-        $this->config->setMethod(Config::METHOD_EXPRESS);
+        $this->configFactory = $config;
     }
 
     /**
@@ -50,7 +50,8 @@ public function __construct(
     public function beforeExecute(Index $subject)
     {
         // Check If PP SmartButtons enabled
-        if ((bool)(int) $this->config->getValue('in_context')) {
+        $config = $this->configFactory->create()->setMethod(Config::METHOD_EXPRESS);
+        if ((bool)(int) $config->getValue('in_context')) {
             $this->sdkUrl->setQueryParam('commit', 'true');
         }
 

app/code/Magento/Paypal/Test/Unit/Model/SdkUrlTest.php

@@ -94,7 +94,7 @@ public function testGetConfig(
         string $intent,
         ?string $disallowedFunding,
         bool $isPaypalGuestCheckoutEnabled,
-        array $expected = []
+        array $expected
     ) {
         $this->localeResolverMock->method('getLocale')->willReturn($locale);
         $this->configMock->method('getValue')->willReturnMap(