Merge remote-tracking branch 'origin/MAGETWO-71185' into MPI-PR-2.1-develop

Author: viktym

app/code/Magento/Braintree/Gateway/Http/Client/AbstractTransaction.php

@@ -33,7 +33,7 @@ abstract class AbstractTransaction implements ClientInterface
     /**
      * @var BraintreeAdapter
      */
-    protected $braintreeAdapter;
+    protected $braintree;
 
     /**
      * @var BraintreeAdapterFactory

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

@@ -29,13 +29,20 @@ class BraintreeAdapter
      * All arguments have `null` values to provide backward compatibility. This class MUST be initialized only
      * via BraintreeAdapterFactory.
      *
+     * @param Config|null $config
      * @param string|null $merchantId
      * @param string|null $publicKey
      * @param string|null $privateKey
      * @param string|null $environment
      */
-    public function __construct($merchantId = null, $publicKey = null, $privateKey = null, $environment = null)
-    {
+    public function __construct(
+        Config $config = null,
+        $merchantId = null,
+        $publicKey = null,
+        $privateKey = null,
+        $environment = null
+    ) {
+        $this->config = $config;
         $this->merchantId($merchantId);
         $this->publicKey($publicKey);
         $this->privateKey($privateKey);