Merge remote-tracking branch 'remotes/origin/MAGETWO-68936' into MPI-PR-Bugfixes

Author: YevSent

app/code/Magento/Paypal/Helper/Data.php

@@ -6,8 +6,11 @@
 namespace Magento\Paypal\Helper;
 
 use Magento\Framework\App\ObjectManager;
-use Magento\Payment\Model\Method\AbstractMethod;
-use Magento\Paypal\Model\Billing\Agreement\MethodInterface;
+use Magento\Payment\Api\Data\PaymentMethodInterface;
+use Magento\Payment\Api\PaymentMethodListInterface;
+use Magento\Payment\Model\Method\InstanceFactory;
+use Magento\Payment\Model\MethodInterface;
+use Magento\Paypal\Model\Billing\Agreement\MethodInterface as BillingAgreementMethodInterface;
 
 /**
  * Paypal Data helper
@@ -45,12 +48,12 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
     private $configFactory;
 
     /**
-     * @var \Magento\Payment\Api\PaymentMethodListInterface
+     * @var PaymentMethodListInterface
      */
     private $paymentMethodList;
 
     /**
-     * @var \Magento\Payment\Model\Method\InstanceFactory
+     * @var InstanceFactory
      */
     private $paymentMethodInstanceFactory;
 
@@ -100,21 +103,21 @@ public function shouldAskToCreateBillingAgreement(\Magento\Paypal\Model\Config $
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
      * @param \Magento\Quote\Model\Quote|null $quote
-     * @return MethodInterface[]
+     * @return BillingAgreementMethodInterface[]
      */
     public function getBillingAgreementMethods($store = null, $quote = null)
     {
         $activeMethods = array_map(
-            function (\Magento\Payment\Api\Data\PaymentMethodInterface $method) {
+            function (PaymentMethodInterface $method) {
                 return $this->getPaymentMethodInstanceFactory()->create($method);
             },
             $this->getPaymentMethodList()->getActiveList($store)
         );
 
         $result = array_filter(
             $activeMethods,
-            function (AbstractMethod $method) use ($quote) {
-                return $method->isAvailable($quote) && $method instanceof MethodInterface;
+            function (MethodInterface $method) use ($quote) {
+                return $method instanceof BillingAgreementMethodInterface && $method->isAvailable($quote);
             }
         );
 
@@ -142,14 +145,14 @@ public function getHtmlTransactionId($methodCode, $txnId)
     /**
      * Get payment method list.
      *
-     * @return \Magento\Payment\Api\PaymentMethodListInterface
+     * @return PaymentMethodListInterface
      * @deprecated
      */
     private function getPaymentMethodList()
     {
         if ($this->paymentMethodList === null) {
             $this->paymentMethodList = ObjectManager::getInstance()->get(
-                \Magento\Payment\Api\PaymentMethodListInterface::class
+                PaymentMethodListInterface::class
             );
         }
         return $this->paymentMethodList;
@@ -158,14 +161,14 @@ private function getPaymentMethodList()
     /**
      * Get payment method instance factory.
      *
-     * @return \Magento\Payment\Model\Method\InstanceFactory
+     * @return InstanceFactory
      * @deprecated
      */
     private function getPaymentMethodInstanceFactory()
     {
         if ($this->paymentMethodInstanceFactory === null) {
             $this->paymentMethodInstanceFactory = ObjectManager::getInstance()->get(
-                \Magento\Payment\Model\Method\InstanceFactory::class
+                InstanceFactory::class
             );
         }
         return $this->paymentMethodInstanceFactory;

app/code/Magento/Paypal/Test/Unit/Helper/DataTest.php

@@ -121,10 +121,14 @@ public function getBillingAgreementMethodsDataProvider()
             ->method('isAvailable')
             ->willReturn(true);
 
-        $methodInstanceMock = $this->getMockBuilder(
+        $abstractMethodInstanceMock = $this->getMockBuilder(
             \Magento\Payment\Model\Method\Cc::class
         )->disableOriginalConstructor()->getMock();
 
+        $adapterMethodInstanceMock = $this->getMockBuilder(
+            \Magento\Payment\Model\Method\Adapter::class
+        )->disableOriginalConstructor()->getMock();
+
         return [
             [
                 '1',
@@ -138,7 +142,15 @@ public function getBillingAgreementMethodsDataProvider()
                 '1',
                 $quoteMock,
                 [
-                    [$methodMock, $methodInstanceMock]
+                    [$methodMock, $abstractMethodInstanceMock]
+                ],
+                []
+            ],
+            [
+                '1',
+                $quoteMock,
+                [
+                    [$methodMock, $adapterMethodInstanceMock]
                 ],
                 []
             ]

dev/tests/integration/testsuite/Magento/Paypal/Helper/DataTest.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Paypal\Helper;
+
+use Magento\TestFramework\Helper\Bootstrap;
+
+class DataTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Tests if method executes without fatal error when some vault payment method is enabled.
+     *
+     * @magentoConfigFixture current_store payment/payflowpro/active 1
+     * @magentoConfigFixture current_store payment/payflowpro_cc_vault/active 1
+     */
+    public function testGetBillingAgreementMethodsWithVaultEnabled()
+    {
+        /** @var Data $model */
+        $model = Bootstrap::getObjectManager()->create(Data::class);
+
+        $this->assertEmpty($model->getBillingAgreementMethods());
+    }
+}