Merge pull request #171 from yankers/master

Add support purchases.subscriptionsv2 for Google API

composer.json

@@ -31,6 +31,7 @@
  "guzzlehttp/guzzle": "^6.3|^7.0",
  "nesbot/carbon": "^1.0|^2.0",
  "google/apiclient": "^2.10",
+ "google/apiclient-services": "~0.249",
  "robrichards/xmlseclibs": "^3.0.4"
  },
  "require-dev": {

src/GooglePlay/AbstractResponse.php

@@ -4,6 +4,7 @@
 
 use Google\Service\AndroidPublisher\ProductPurchase;
 use Google\Service\AndroidPublisher\SubscriptionPurchase;
+use Google\Service\AndroidPublisher\SubscriptionPurchaseV2;
 
 /**
  * Class AbstractResponse.
@@ -18,14 +19,14 @@ abstract class AbstractResponse
  const ACKNOWLEDGEMENT_STATE_DONE = 1;
 
  /**
- * @var ProductPurchase|SubscriptionPurchase
+ * @var ProductPurchase|SubscriptionPurchase|SubscriptionPurchaseV2
  */
  protected $response;
 
  /**
  * Constructor.
  *
- * @param ProductPurchase|SubscriptionPurchase $response
+ * @param ProductPurchase|SubscriptionPurchase|SubscriptionPurchaseV2 $response
  */
  public function __construct($response)
  {
@@ -65,7 +66,7 @@ public function getKind()
  }
 
  /**
- * @return ProductPurchase|SubscriptionPurchase
+ * @return ProductPurchase|SubscriptionPurchase|SubscriptionPurchaseV2
  */
  public function getRawResponse()
  {

src/GooglePlay/SubscriptionV2Response.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace ReceiptValidator\GooglePlay;
+
+use Google\Service\AndroidPublisher\SubscriptionPurchaseV2;
+
+/**
+ * Class SubscriptionResponse.
+ */
+class SubscriptionV2Response extends AbstractResponse
+{
+ /**
+ * @var SubscriptionPurchaseV2
+ */
+ protected $response;
+}

src/GooglePlay/Validator.php

@@ -30,6 +30,11 @@ class Validator
  */
  private $validationModePurchase = true;
 
+ /**
+ * @var bool
+ */
+ private $validationSubscriptionV2 = false;
+
  /**
  * Validator constructor.
  *
@@ -92,12 +97,31 @@ public function setValidationModePurchase($validationModePurchase)
  return $this;
  }
 
+ /**
+ * @param bool
+ *
+ * @return Validator
+ */
+ public function setValidationSubscriptionV2(bool $validationSubscriptionV2)
+ {
+ $this->validationModePurchase = $validationSubscriptionV2;
+
+ return $this;
+ }
+
  /**
  * @return PurchaseResponse|SubscriptionResponse
  */
  public function validate()
  {
- return ($this->validationModePurchase) ? $this->validatePurchase() : $this->validateSubscription();
+ if ($this->validationModePurchase) {
+ $result = $this->validatePurchase();
+ } elseif ($this->validateSubscriptionV2()) {
+ $result = $this->validateSubscriptionV2();
+ } else {
+ $result = $this->validateSubscription();
+ }
+ return $result;
  }
 
  /**
@@ -128,6 +152,16 @@ public function validateSubscription()
  );
  }
 
+ public function validateSubscriptionV2()
+ {
+ return new SubscriptionV2Response(
+ $this->_androidPublisherService->purchases_subscriptionsv2->get(
+ $this->_package_name,
+ $this->_purchase_token
+ )
+ );
+ }
+
  /**
  * @return AndroidPublisher
  */