MAGETWO-70870: Braintree online refund not working for two websites using individual Braintree accounts

Author: OlgaVasyltsun

app/code/Magento/Braintree/Controller/Adminhtml/Payment/GetClientToken.php

@@ -13,6 +13,9 @@
 use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * Retrieve client token controller.
+ */
 class GetClientToken extends Action
 {
     const ADMIN_RESOURCE = 'Magento_Braintree::get_client_token';

app/code/Magento/Braintree/Gateway/Command/GetPaymentNonceCommand.php

@@ -6,7 +6,6 @@
 
 namespace Magento\Braintree\Gateway\Command;
 
-use Exception;
 use Magento\Braintree\Gateway\SubjectReader;
 use Magento\Braintree\Gateway\Validator\PaymentNonceResponseValidator;
 use Magento\Braintree\Model\Adapter\BraintreeAdapterFactory;
@@ -76,7 +75,7 @@ public function execute(array $commandSubject)
         $customerId = $this->subjectReader->readCustomerId($commandSubject);
         $paymentToken = $this->tokenManagement->getByPublicHash($publicHash, $customerId);
         if (!$paymentToken) {
-            throw new Exception('No available payment tokens');
+            throw new \Exception('No available payment tokens');
         }
 
         $storeId = $this->subjectReader->readStoreId($commandSubject);
@@ -85,7 +84,7 @@ public function execute(array $commandSubject)
         $result = $this->responseValidator->validate(['response' => ['object' => $data]]);
 
         if (!$result->isValid()) {
-            throw new Exception(__(implode("\n", $result->getFailsDescription())));
+            throw new \Exception(__(implode("\n", $result->getFailsDescription())));
         }
 
         return $this->resultFactory->create(['array' => ['paymentMethodNonce' => $data->paymentMethodNonce->nonce]]);

app/code/Magento/Braintree/Gateway/Config/Config.php

@@ -188,7 +188,6 @@ public function getEnvironment($storeId = null)
      *
      * @param int|null $storeId
      * @return string
-     * @internal param null $storeId
      */
     public function getKountMerchantId($storeId = null)
     {

app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php

@@ -37,7 +37,7 @@ public function __construct($merchantId, $publicKey, $privateKey, $environment)
         $this->publicKey($publicKey);
         $this->privateKey($privateKey);
 
-        if ($environment == Environment::ENVIRONMENT_PRODUCTION) {
+        if ($environment === Environment::ENVIRONMENT_PRODUCTION) {
             $this->environment(Environment::ENVIRONMENT_PRODUCTION);
         } else {
             $this->environment(Environment::ENVIRONMENT_SANDBOX);

app/code/Magento/Braintree/Model/Adapter/BraintreeAdapterFactory.php

@@ -36,7 +36,7 @@ public function __construct(ObjectManagerInterface $objectManager, Config $confi
     /**
      * Creates instance of Braintree Adapter.
      *
-     * @param int $storeId if null is provided as an argument, then current scope will be resolved
+     * @param int|null $storeId if null is provided as an argument, then current scope will be resolved
      * by \Magento\Framework\App\Config\ScopeCodeResolver (useful for most cases) but for adminhtml area the store
      * should be provided as the argument for correct config settings loading.
      * @return BraintreeAdapter
@@ -49,7 +49,7 @@ public function create($storeId = null)
                 'merchantId' => $this->config->getMerchantId($storeId),
                 'publicKey' => $this->config->getValue(Config::KEY_PUBLIC_KEY, $storeId),
                 'privateKey' => $this->config->getValue(Config::KEY_PRIVATE_KEY, $storeId),
-                'environment' => $this->config->getEnvironment($storeId)
+                'environment' => $this->config->getEnvironment($storeId),
             ]
         );
     }

app/code/Magento/Braintree/Model/Ui/ConfigProvider.php

@@ -79,14 +79,14 @@ public function getConfig()
                     'kountMerchantId' => $this->config->getKountMerchantId($storeId),
                     'hasFraudProtection' => $this->config->hasFraudProtection($storeId),
                     'merchantId' => $this->config->getMerchantId($storeId),
-                    'ccVaultCode' => self::CC_VAULT_CODE
+                    'ccVaultCode' => self::CC_VAULT_CODE,
                 ],
                 Config::CODE_3DSECURE => [
                     'enabled' => $this->config->isVerify3DSecure($storeId),
                     'thresholdAmount' => $this->config->getThresholdAmount($storeId),
-                    'specificCountries' => $this->config->get3DSecureSpecificCountries($storeId)
+                    'specificCountries' => $this->config->get3DSecureSpecificCountries($storeId),
                 ],
-            ]
+            ],
         ];
     }
 

app/code/Magento/Braintree/Test/Unit/Block/FormTest.php

@@ -14,7 +14,7 @@
 use Magento\Payment\Helper\Data;
 use Magento\Payment\Model\Config;
 use Magento\Vault\Model\VaultPaymentInterface;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Tests \Magento\Braintree\Block\Form.
@@ -60,6 +60,9 @@ class FormTest extends \PHPUnit\Framework\TestCase
      */
     private $paymentDataHelperMock;
 
+    /**
+     * @var string
+     */
     private $storeId = '1';
 
     protected function setUp()

app/code/Magento/Braintree/Test/Unit/Controller/Adminhtml/Payment/GetClientTokenTest.php

@@ -14,7 +14,7 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Controller\ResultInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Tests \Magento\Braintree\Controller\Adminhtml\Payment\GetClientToken

app/code/Magento/Braintree/Test/Unit/Controller/Payment/GetNonceTest.php

@@ -15,7 +15,7 @@
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Webapi\Exception;
 use Magento\Payment\Gateway\Command\ResultInterface as CommandResultInterface;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 use Psr\Log\LoggerInterface;
 
 /**

app/code/Magento/Braintree/Test/Unit/Gateway/Command/CaptureStrategyCommandTest.php

@@ -21,7 +21,7 @@
 use Magento\Sales\Api\TransactionRepositoryInterface;
 use Magento\Sales\Model\Order\Payment;
 use Magento\Sales\Model\ResourceModel\Order\Payment\Transaction\CollectionFactory;
-use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 /**
  * Tests \Magento\Braintree\Gateway\Command\CaptureStrategyCommand.
@@ -99,11 +99,11 @@ protected function setUp()
         $this->braintreeAdapterMock = $this->getMockBuilder(BraintreeAdapter::class)
             ->disableOriginalConstructor()
             ->getMock();
-        /** @var BraintreeAdapterFactory|MockObject $adapterFactory */
-        $adapterFactory = $this->getMockBuilder(BraintreeAdapterFactory::class)
+        /** @var BraintreeAdapterFactory|MockObject $adapterFactoryMock */
+        $adapterFactoryMock = $this->getMockBuilder(BraintreeAdapterFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $adapterFactory->expects(self::any())
+        $adapterFactoryMock->expects(self::any())
             ->method('create')
             ->willReturn($this->braintreeAdapterMock);
 
@@ -115,7 +115,7 @@ protected function setUp()
             $this->filterBuilderMock,
             $this->searchCriteriaBuilderMock,
             $this->subjectReaderMock,
-            $adapterFactory,
+            $adapterFactoryMock,
             $this->braintreeSearchAdapter
         );
     }
@@ -339,12 +339,12 @@ private function getPaymentDataObjectMock()
             ->method('getPayment')
             ->willReturn($this->paymentMock);
 
-        $order = $this->getMockBuilder(OrderAdapterInterface::class)
+        $orderMock = $this->getMockBuilder(OrderAdapterInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
 
         $mock->method('getOrder')
-            ->willReturn($order);
+            ->willReturn($orderMock);
 
         return $mock;
     }