Use abstract PayPalIPNGatewayBase class insted of trait.

Author: vasike

src/Plugin/Commerce/PaymentGateway/ExpressCheckout.php

@@ -8,7 +8,6 @@
 use Drupal\commerce_payment\Exception\PaymentGatewayException;
 use Drupal\commerce_payment\PaymentMethodTypeManager;
 use Drupal\commerce_payment\PaymentTypeManager;
-use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\OffsitePaymentGatewayBase;
 use Drupal\commerce_price\Price;
 use Drupal\commerce_price\RounderInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
@@ -33,9 +32,7 @@
  *   },
  * )
  */
-class ExpressCheckout extends OffsitePaymentGatewayBase implements ExpressCheckoutInterface {
-
-  use PaypalPaymentGatewayTrait;
+class ExpressCheckout extends PayPalIPNGatewayBase implements ExpressCheckoutInterface {
 
   /**
    * The HTTP client.

src/Plugin/Commerce/PaymentGateway/ExpressCheckoutInterface.php

@@ -11,7 +11,7 @@
 /**
  * Provides the interface for the Express Checkout payment gateway.
  */
-interface ExpressCheckoutInterface extends OffsitePaymentGatewayInterface, SupportsAuthorizationsInterface, SupportsRefundsInterface {
+interface ExpressCheckoutInterface extends PayPalIPNGatewayBaseInterface, SupportsAuthorizationsInterface, SupportsRefundsInterface {
 
   /**
    * Gets the API URL.

src/Plugin/Commerce/PaymentGateway/PaypalPaymentGatewayTrait.php renamed to src/Plugin/Commerce/PaymentGateway/PayPalIPNGatewayBase.php

@@ -2,24 +2,16 @@
 
 namespace Drupal\commerce_paypal\Plugin\Commerce\PaymentGateway;
 
+use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\OffsitePaymentGatewayBase;
 use Symfony\Component\HttpFoundation\Request;
 
 /**
  * Provides common methods to be used by PayPal payment gateways.
  */
-trait PaypalPaymentGatewayTrait {
+abstract class PayPalIPNGatewayBase extends OffsitePaymentGatewayBase implements PayPalIPNGatewayBaseInterface {
 
   /**
-   * Loads the payment for a given remote id.
-   *
-   * @param string $remote_id
-   *   The remote id property for a payment.
-   *
-   * @return \Drupal\commerce_payment\Entity\PaymentInterface
-   *   Payment object.
-   *
-   * @todo: to be replaced by Commerce core payment storage method
-   * @see https://www.drupal.org/node/2856209
+   * {@inheritdoc}
    */
   public function loadPaymentByRemoteId($remote_id) {
     /** @var \Drupal\commerce_payment\PaymentStorage $storage */
@@ -29,13 +21,7 @@ public function loadPaymentByRemoteId($remote_id) {
   }
 
   /**
-   * Processes an incoming IPN request.
-   *
-   * @param \Symfony\Component\HttpFoundation\Request $request
-   *   The request.
-   *
-   * @return mixed
-   *   The request data array or FALSE.
+   * {@inheritdoc}
    */
   public function processIpnRequest(Request $request) {
     // Get IPN request data.
@@ -66,27 +52,15 @@ public function processIpnRequest(Request $request) {
   }
 
   /**
-   * Get data array from a request content.
-   *
-   * @param string $request_content
-   *   The Request content.
-   *
-   * @return array
-   *   The request data array.
+   * {@inheritdoc}
    */
   public function getRequestDataArray($request_content) {
     parse_str(html_entity_decode($request_content), $ipn_data);
     return $ipn_data;
   }
 
   /**
-   * Gets the IPN URL to be used for validation for IPN data.
-   *
-   * @param array $ipn_data
-   *   The IPN request data from PayPal.
-   *
-   * @return string
-   *   The IPN validation URL.
+   * {@inheritdoc}
    */
   public function getIpnValidationUrl(array $ipn_data) {
     if (!empty($ipn_data['test_ipn']) && $ipn_data['test_ipn'] == 1) {

src/Plugin/Commerce/PaymentGateway/PayPalIPNGatewayBaseInterface.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace Drupal\commerce_paypal\Plugin\Commerce\PaymentGateway;
+
+use Drupal\commerce_payment\Plugin\Commerce\PaymentGateway\OffsitePaymentGatewayInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * Provides the interface for the Express Checkout payment gateway.
+ */
+interface PayPalIPNGatewayBaseInterface extends OffsitePaymentGatewayInterface {
+
+  /**
+   * Loads the payment for a given remote id.
+   *
+   * @param string $remote_id
+   *   The remote id property for a payment.
+   *
+   * @return \Drupal\commerce_payment\Entity\PaymentInterface
+   *   Payment object.
+   *
+   * @todo: to be replaced by Commerce core payment storage method
+   * @see https://www.drupal.org/node/2856209
+   */
+  public function loadPaymentByRemoteId($remote_id);
+
+  /**
+   * Processes an incoming IPN request.
+   *
+   * @param \Symfony\Component\HttpFoundation\Request $request
+   *   The request.
+   *
+   * @return mixed
+   *   The request data array or FALSE.
+   */
+  public function processIpnRequest(Request $request);
+
+  /**
+   * Get data array from a request content.
+   *
+   * @param string $request_content
+   *   The Request content.
+   *
+   * @return array
+   *   The request data array.
+   */
+  public function getRequestDataArray($request_content);
+
+  /**
+   * Gets the IPN URL to be used for validation for IPN data.
+   *
+   * @param array $ipn_data
+   *   The IPN request data from PayPal.
+   *
+   * @return string
+   *   The IPN validation URL.
+   */
+  public function getIpnValidationUrl(array $ipn_data);
+
+}