Change net refunded to total refunded for credit

.travis.yml

@@ -1,7 +1,21 @@
 language: php
 php:
-  - 5.4
-  - 5.3
+  - 7.1
+  - 7.3
+
+matrix:
+  include:
+    - php: '7.1'
+      env: deps=low
+
+env:
+  global:
+    - deps=high
 
 before_script:
-  - composer install --dev
+  - if [ "$deps" = "high" ]; then composer install --ignore-platform-reqs; fi;
+  - if [ "$deps" = "low" ]; then sed -i -e 's/>=3.4 <5.0/^3.4/g' composer.json && composer --ignore-platform-reqs update; fi
+
+script:
+  - vendor/bin/phpstan analyse -l 1 .
+  - export SYMFONY_DEPRECATIONS_HELPER=weak && vendor/bin/phpunit

Client/Authentication/KeyedCredentialsAuthenticationStrategyInterface.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace JMS\Payment\PaypalBundle\Client\Authentication;
+
+use JMS\Payment\CoreBundle\BrowserKit\Request;
+
+interface KeyedCredentialsAuthenticationStrategyInterface
+{
+    /**
+     * @param Request $request
+     * @param         $key
+     */
+    public function authenticateWithKeyedCredentials(Request $request, $key);
+}

Client/Client.php

@@ -1,6 +1,7 @@
 <?php
 namespace JMS\Payment\PaypalBundle\Client;
 
+use JMS\Payment\PaypalBundle\Client\Authentication\KeyedCredentialsAuthenticationStrategyInterface;
 use Symfony\Component\BrowserKit\Response as RawResponse;
 
 use JMS\Payment\CoreBundle\BrowserKit\Request;
@@ -40,76 +41,85 @@ public function __construct(AuthenticationStrategyInterface $authenticationStrat
         $this->curlOptions = array();
     }
 
-    public function requestAddressVerify($email, $street, $postalCode)
+    public function requestAddressVerify($email, $street, $postalCode, $key = null)
     {
         return $this->sendApiRequest(array(
             'METHOD' => 'AddressVerify',
             'EMAIL'  => $email,
             'STREET' => $street,
             'ZIP'    => $postalCode,
-        ));
+        ), $key);
     }
 
-    public function requestBillOutstandingAmount($profileId, array $optionalParameters = array())
+    public function requestBillOutstandingAmount($profileId, array $optionalParameters = array(), $key = null)
     {
         return $this->sendApiRequest(array_merge($optionalParameters, array(
             'METHOD' => 'BillOutstandingAmount',
             'PROFILEID' => $profileId,
-        )));
+        )), $key);
     }
 
-    public function requestCreateRecurringPaymentsProfile($token)
+    public function requestCreateRecurringPaymentsProfile($token, $key = null)
     {
         return $this->sendApiRequest(array(
             'METHOD' => 'CreateRecurringPaymentsProfile',
             'TOKEN' => $token,
-        ));
+        ), $key);
     }
 
-    public function requestDoAuthorization($transactionId, $amount, array $optionalParameters = array())
+    public function requestDoAuthorization($transactionId, $amount, array $optionalParameters = array(), $key = null)
     {
         return $this->sendApiRequest(array_merge($optionalParameters, array(
             'METHOD' => 'DoAuthorization',
             'TRANSACTIONID' => $transactionId,
             'AMT' => $this->convertAmountToPaypalFormat($amount),
-        )));
+        )), $key);
     }
 
-    public function requestDoCapture($authorizationId, $amount, $completeType, array $optionalParameters = array())
+    public function requestDoReAuthorization($authorizationId, $amount, array $optionalParameters = array(), $key = null)
+    {
+        return $this->sendApiRequest(array_merge($optionalParameters, array(
+            'METHOD' => 'DoReAuthorization',
+            'AUTHORIZATIONID' => $authorizationId,
+            'AMT' => $this->convertAmountToPaypalFormat($amount),
+        )), $key);
+    }
+
+    public function requestDoCapture($authorizationId, $amount, $completeType, array $optionalParameters = array(), $key = null)
     {
         return $this->sendApiRequest(array_merge($optionalParameters, array(
             'METHOD' => 'DoCapture',
             'AUTHORIZATIONID' => $authorizationId,
             'AMT' => $this->convertAmountToPaypalFormat($amount),
             'COMPLETETYPE' => $completeType,
-        )));
+        )), $key);
     }
 
-    public function requestDoDirectPayment($ipAddress, array $optionalParameters = array())
+    public function requestDoDirectPayment($ipAddress, array $optionalParameters = array(), $key = null)
     {
         return $this->sendApiRequest(array_merge($optionalParameters, array(
             'METHOD' => 'DoDirectPayment',
             'IPADDRESS' => $ipAddress,
-        )));
+        )), $key);
     }
 
-    public function requestDoExpressCheckoutPayment($token, $amount, $paymentAction, $payerId, array $optionalParameters = array())
+    public function requestDoExpressCheckoutPayment($token, $amount, $paymentAction, $payerId, array $optionalParameters = array(), $key = null)
     {
         return $this->sendApiRequest(array_merge($optionalParameters, array(
             'METHOD' => 'DoExpressCheckoutPayment',
             'TOKEN'  => $token,
             'PAYMENTREQUEST_0_AMT' => $this->convertAmountToPaypalFormat($amount),
             'PAYMENTREQUEST_0_PAYMENTACTION' => $paymentAction,
             'PAYERID' => $payerId,
-        )));
+        )), $key);
     }
 
-    public function requestDoVoid($authorizationId, array $optionalParameters = array())
+    public function requestDoVoid($authorizationId, array $optionalParameters = array(), $key = null)
     {
         return $this->sendApiRequest(array_merge($optionalParameters, array(
             'METHOD' => 'DoVoid',
             'AUTHORIZATIONID' => $authorizationId,
-        )));
+        )), $key);
     }
 
     /**
@@ -122,43 +132,44 @@ public function requestDoVoid($authorizationId, array $optionalParameters = arra
      * @param string $returnUrl
      * @param string $cancelUrl
      * @param array $optionalParameters
+     * @param string $key
      * @return Response
      */
-    public function requestSetExpressCheckout($amount, $returnUrl, $cancelUrl, array $optionalParameters = array())
+    public function requestSetExpressCheckout($amount, $returnUrl, $cancelUrl, array $optionalParameters = array(), $key = null)
     {
         return $this->sendApiRequest(array_merge($optionalParameters, array(
             'METHOD' => 'SetExpressCheckout',
             'PAYMENTREQUEST_0_AMT' => $this->convertAmountToPaypalFormat($amount),
             'RETURNURL' => $returnUrl,
             'CANCELURL' => $cancelUrl,
-        )));
+        )), $key);
     }
 
-    public function requestGetExpressCheckoutDetails($token)
+    public function requestGetExpressCheckoutDetails($token, $key = null)
     {
         return $this->sendApiRequest(array(
             'METHOD' => 'GetExpressCheckoutDetails',
             'TOKEN'  => $token,
-        ));
+        ), $key);
     }
 
-    public function requestGetTransactionDetails($transactionId)
+    public function requestGetTransactionDetails($transactionId, $key = null)
     {
         return $this->sendApiRequest(array(
             'METHOD' => 'GetTransactionDetails',
             'TRANSACTIONID' => $transactionId,
-        ));
+        ), $key);
     }
 
-    public function requestRefundTransaction($transactionId, array $optionalParameters = array())
+    public function requestRefundTransaction($transactionId, array $optionalParameters = array(), $key = null)
     {
         return $this->sendApiRequest(array_merge($optionalParameters, array(
             'METHOD' => 'RefundTransaction',
             'TRANSACTIONID' => $transactionId
-        )));
+        )), $key);
     }
 
-    public function sendApiRequest(array $parameters)
+    public function sendApiRequest(array $parameters, $key = null)
     {
         // include some default parameters
         $parameters['VERSION'] = self::API_VERSION;
@@ -169,7 +180,11 @@ public function sendApiRequest(array $parameters)
             'POST',
             $parameters
         );
-        $this->authenticationStrategy->authenticate($request);
+        if (null !== $key && $this->authenticationStrategy instanceof KeyedCredentialsAuthenticationStrategyInterface) {
+            $this->authenticationStrategy->authenticateWithKeyedCredentials($request, $key);
+        } else {
+            $this->authenticationStrategy->authenticate($request);
+        }
 
         $response = $this->request($request);
         if (200 !== $response->getStatus()) {
@@ -236,6 +251,7 @@ public function request(Request $request)
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
+        curl_setopt($curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); // Latest TLS(1.x)
         curl_setopt_array($curl, $this->curlOptions);
         curl_setopt($curl, CURLOPT_URL, $request->getUri());
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);

DependencyInjection/Configuration.php

@@ -36,6 +36,7 @@ public function getConfigTree()
                     ->scalarNode('cancel_url')->defaultNull()->end()
                     ->scalarNode('notify_url')->defaultNull()->end()
                     ->booleanNode('debug')->defaultValue('%kernel.debug%')->end()
+                    ->booleanNode('recover_from_funding_failure')->defaultFalse()->end()
                 ->end()
             ->end()
             ->buildTree();

DependencyInjection/JMSPaymentPaypalExtension.php

@@ -42,5 +42,10 @@ public function load(array $configs, ContainerBuilder $container)
         $container->setParameter('payment.paypal.express_checkout.cancel_url', $config['cancel_url']);
         $container->setParameter('payment.paypal.express_checkout.notify_url', $config['notify_url']);
         $container->setParameter('payment.paypal.debug', $config['debug']);
+        if ($config['recover_from_funding_failure']) {
+            $plugin = $container->getDefinition('payment.plugin.paypal_express_checkout');
+            $plugin->addMethodCall('setRedirectDueToFundingError', [$config['recover_from_funding_failure']]);
+        }
+
     }
 }

Form/ExpressCheckoutType.php

@@ -16,8 +16,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     {
     }
 
-    public function getName()
+    public function getBlockPrefix()
     {
         return 'paypal_express_checkout';
     }
-}
+}