ENGCOM-5630: PayPal - fix configuration path in config model for "Disable Funding Options" #24121

Author: sidolov

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

@@ -293,7 +293,7 @@ public function isMethodActive($method)
             case Config::METHOD_WPS_BML:
             case Config::METHOD_WPP_BML:
                 $disabledFunding = $this->_scopeConfig->getValue(
-                    'payment/paypal_express/disable_funding_options',
+                    'paypal/style/disable_funding_options',
                     ScopeInterface::SCOPE_STORE,
                     $this->_storeId
                 );

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

@@ -306,7 +306,7 @@ public function testIsMethodActiveBml($disableFundingOptions, $expectedFlag, $ex
     {
         $this->scopeConfigMock->method('getValue')
             ->with(
-                self::equalTo('payment/paypal_express/disable_funding_options'),
+                self::equalTo('paypal/style/disable_funding_options'),
                 self::equalTo('store')
             )
             ->willReturn($disableFundingOptions);

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

@@ -9,6 +9,9 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
+/**
+ * Class ConfigTest
+ */
 class ConfigTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -122,7 +125,7 @@ public function testIsMethodAvailableForIsMethodActive($methodName, $expected)
             $valueMap = [
                 ['paypal/general/merchant_country', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, 'US'],
                 ['paypal/general/merchant_country', ScopeInterface::SCOPE_STORE, null, 'US'],
-                ['payment/paypal_express/disable_funding_options', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, []],
+                ['paypal/style/disable_funding_options', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null, []],
             ];
             $this->scopeConfig
                 ->method('getValue')
@@ -362,11 +365,15 @@ public function testGetBmlDisplay($section, $expectedValue, $expectedFlag, $expe
             ->will($this->returnValue($expectedFlag));
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
-            ->will($this->returnValueMap([
-                ['payment/' . Config::METHOD_WPP_BML . '/' . $section . '_display', 'store', 1, $expectedValue],
-                ['payment/' . Config::METHOD_WPP_BML . '/active', 'store', 1, $expectedValue],
-                ['payment/' . Config::METHOD_WPP_PE_BML . '/active', 'store', 1, $expectedValue],
-            ]));
+            ->will(
+                $this->returnValueMap(
+                    [
+                        ['payment/' . Config::METHOD_WPP_BML . '/' . $section . '_display', 'store', 1, $expectedValue],
+                        ['payment/' . Config::METHOD_WPP_BML . '/active', 'store', 1, $expectedValue],
+                        ['payment/' . Config::METHOD_WPP_PE_BML . '/active', 'store', 1, $expectedValue],
+                    ]
+                )
+            );
         $this->assertEquals($expected, $this->model->getBmlDisplay($section));
     }
 
@@ -407,11 +414,13 @@ public function testGetExpressCheckoutShortcutImageUrl(
 
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
-            ->willReturnMap([
-                ['paypal/wpp/button_flavor', ScopeInterface::SCOPE_STORE, 123, $areButtonDynamic],
-                ['paypal/wpp/sandbox_flag', ScopeInterface::SCOPE_STORE, 123, $sandboxFlag],
-                ['paypal/wpp/button_type', ScopeInterface::SCOPE_STORE, 123, $buttonType],
-            ]);
+            ->willReturnMap(
+                [
+                    ['paypal/wpp/button_flavor', ScopeInterface::SCOPE_STORE, 123, $areButtonDynamic],
+                    ['paypal/wpp/sandbox_flag', ScopeInterface::SCOPE_STORE, 123, $sandboxFlag],
+                    ['paypal/wpp/button_type', ScopeInterface::SCOPE_STORE, 123, $buttonType],
+                ]
+            );
 
         $this->assertEquals(
             $result,
@@ -475,10 +484,12 @@ public function testGetPaymentMarkImageUrl(
 
         $this->scopeConfig->expects($this->any())
             ->method('getValue')
-            ->willReturnMap([
-                ['paypal/wpp/button_flavor', ScopeInterface::SCOPE_STORE, 123, $areButtonDynamic],
-                ['paypal/wpp/sandbox_flag', ScopeInterface::SCOPE_STORE, 123, $sandboxFlag],
-            ]);
+            ->willReturnMap(
+                [
+                    ['paypal/wpp/button_flavor', ScopeInterface::SCOPE_STORE, 123, $areButtonDynamic],
+                    ['paypal/wpp/sandbox_flag', ScopeInterface::SCOPE_STORE, 123, $sandboxFlag],
+                ]
+            );
 
         $this->assertEquals(
             $result,