Merge pull request #153 from yyeltsyn/fix-google-classes

aporat · Oct 13, 2021 · d347d8f · d347d8f
2 parents 032a4e1 + 314ca5a
commit d347d8f
Show file tree

Hide file tree

Showing 12 changed files with 80 additions and 68 deletions.
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ $client->setApplicationName('...');
 $client->setAuthConfig('...');
 $client->setScopes('...');
 
-$validator = new PlayValidator(new \Google_Service_AndroidPublisher($client));
+$validator = new PlayValidator(new \Google\Service\AndroidPublisher($client));
 
 try {
   $response = $validator->setPackageName('PACKAGE_NAME')
@@ -89,11 +89,11 @@ Create service account [Service Account flow](https://developers.google.com/iden
 
 ```php
 $googleClient = new \Google_Client();
-$googleClient->setScopes([\Google_Service_AndroidPublisher::ANDROIDPUBLISHER]);
+$googleClient->setScopes([\Google\Service\AndroidPublisher::ANDROIDPUBLISHER]);
 $googleClient->setApplicationName('Your_Purchase_Validator_Name');
 $googleClient->setAuthConfig($pathToServiceAccountJsonFile);
 
-$googleAndroidPublisher = new \Google_Service_AndroidPublisher($googleClient);
+$googleAndroidPublisher = new \Google\Service\AndroidPublisher($googleClient);
 $validator = new \ReceiptValidator\GooglePlay\Validator($googleAndroidPublisher);
 
 try {

diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.3|^7.0",
         "nesbot/carbon": "^1.0|^2.0",
-        "google/apiclient": "^2.0",
+        "google/apiclient": "^2.10",
         "robrichards/xmlseclibs": "^3.0.4"
     },
     "require-dev": {

diff --git a/examples/test_play_receipt.php b/examples/test_play_receipt.php
@@ -28,7 +28,7 @@
 $client->setAuthConfig($configLocation);
 $client->setScopes($scope);
 
-$validator = new PlayValidator(new \Google_Service_AndroidPublisher($client));
+$validator = new PlayValidator(new \Google\Service\AndroidPublisher($client));
 
 try {
     $response = $validator->setPackageName($packageName)->setProductId($productId)->setPurchaseToken($purchaseToken)->validatePurchase();

diff --git a/src/GooglePlay/AbstractResponse.php b/src/GooglePlay/AbstractResponse.php
@@ -2,6 +2,9 @@
 
 namespace ReceiptValidator\GooglePlay;
 
+use Google\Service\AndroidPublisher\ProductPurchase;
+use Google\Service\AndroidPublisher\SubscriptionPurchase;
+
 /**
  * Class AbstractResponse.
  */
@@ -15,14 +18,14 @@ abstract class AbstractResponse
     const ACKNOWLEDGEMENT_STATE_DONE = 1;
 
     /**
-     * @var \Google_Service_AndroidPublisher_ProductPurchase|\Google_Service_AndroidPublisher_SubscriptionPurchase
+     * @var ProductPurchase|SubscriptionPurchase
      */
     protected $response;
 
     /**
      * Constructor.
      *
-     * @param \Google_Service_AndroidPublisher_ProductPurchase|\Google_Service_AndroidPublisher_SubscriptionPurchase $response
+     * @param ProductPurchase|SubscriptionPurchase $response
      */
     public function __construct($response)
     {
@@ -62,7 +65,7 @@ public function getKind()
     }
 
     /**
-     * @return \Google_Service_AndroidPublisher_ProductPurchase|\Google_Service_AndroidPublisher_SubscriptionPurchase
+     * @return ProductPurchase|SubscriptionPurchase
      */
     public function getRawResponse()
     {

diff --git a/src/GooglePlay/Acknowledger.php b/src/GooglePlay/Acknowledger.php
@@ -3,7 +3,9 @@
 namespace ReceiptValidator\GooglePlay;
 
 use Exception;
-use Google_Service_AndroidPublisher;
+use Google\Service\AndroidPublisher;
+use Google\Service\AndroidPublisher\ProductPurchasesAcknowledgeRequest;
+use Google\Service\AndroidPublisher\SubscriptionPurchasesAcknowledgeRequest;
 use ReceiptValidator\RunTimeException;
 
 /**
@@ -20,7 +22,7 @@ class Acknowledger
     const PRODUCT = 'PRODUCT';
 
     /**
-     * @var Google_Service_AndroidPublisher
+     * @var AndroidPublisher
      */
     protected $androidPublisherService;
     /**
@@ -43,16 +45,16 @@ class Acknowledger
     /**
      * Acknowledger constructor.
      *
-     * @param Google_Service_AndroidPublisher $googleServiceAndroidPublisher
-     * @param string                          $packageName
-     * @param string                          $purchaseToken
-     * @param string                          $productId
-     * @param string                          $strategy
+     * @param AndroidPublisher $googleServiceAndroidPublisher
+     * @param string           $packageName
+     * @param string           $purchaseToken
+     * @param string           $productId
+     * @param string           $strategy
      *
      * @throws RunTimeException
      */
     public function __construct(
-        Google_Service_AndroidPublisher $googleServiceAndroidPublisher,
+        AndroidPublisher $googleServiceAndroidPublisher,
         $packageName,
         $productId,
         $purchaseToken,
@@ -86,7 +88,7 @@ public function acknowledge(string $type = self::SUBSCRIPTION, string $developer
                             $this->packageName,
                             $this->productId,
                             $this->purchaseToken,
-                            new \Google_Service_AndroidPublisher_SubscriptionPurchasesAcknowledgeRequest(
+                            new SubscriptionPurchasesAcknowledgeRequest(
                                 ['developerPayload' => $developerPayload]
                             )
                         );
@@ -102,7 +104,7 @@ public function acknowledge(string $type = self::SUBSCRIPTION, string $developer
                                 $this->packageName,
                                 $this->productId,
                                 $this->purchaseToken,
-                                new \Google_Service_AndroidPublisher_SubscriptionPurchasesAcknowledgeRequest(
+                                new SubscriptionPurchasesAcknowledgeRequest(
                                     ['developerPayload' => $developerPayload]
                                 )
                             );
@@ -116,7 +118,7 @@ public function acknowledge(string $type = self::SUBSCRIPTION, string $developer
                             $this->packageName,
                             $this->productId,
                             $this->purchaseToken,
-                            new \Google_Service_AndroidPublisher_ProductPurchasesAcknowledgeRequest(
+                            new ProductPurchasesAcknowledgeRequest(
                                 ['developerPayload' => $developerPayload]
                             )
                         );
@@ -132,7 +134,7 @@ public function acknowledge(string $type = self::SUBSCRIPTION, string $developer
                                 $this->packageName,
                                 $this->productId,
                                 $this->purchaseToken,
-                                new \Google_Service_AndroidPublisher_ProductPurchasesAcknowledgeRequest(
+                                new ProductPurchasesAcknowledgeRequest(
                                     ['developerPayload' => $developerPayload]
                                 )
                             );

diff --git a/src/GooglePlay/PurchaseResponse.php b/src/GooglePlay/PurchaseResponse.php
@@ -2,13 +2,15 @@
 
 namespace ReceiptValidator\GooglePlay;
 
+use Google\Service\AndroidPublisher\ProductPurchase;
+
 /**
  * Class PurchaseResponse.
  */
 class PurchaseResponse extends AbstractResponse
 {
     /**
-     * @var \Google_Service_AndroidPublisher_ProductPurchase
+     * @var ProductPurchase
      */
     protected $response;
 

diff --git a/src/GooglePlay/SubscriptionResponse.php b/src/GooglePlay/SubscriptionResponse.php
@@ -2,13 +2,15 @@
 
 namespace ReceiptValidator\GooglePlay;
 
+use Google\Service\AndroidPublisher\SubscriptionPurchase;
+
 /**
  * Class SubscriptionResponse.
  */
 class SubscriptionResponse extends AbstractResponse
 {
     /**
-     * @var \Google_Service_AndroidPublisher_SubscriptionPurchase
+     * @var SubscriptionPurchase
      */
     protected $response;
 

diff --git a/src/GooglePlay/Validator.php b/src/GooglePlay/Validator.php
@@ -2,13 +2,15 @@
 
 namespace ReceiptValidator\GooglePlay;
 
+use Google\Service\AndroidPublisher;
+
 /**
  * Class Validator.
  */
 class Validator
 {
     /**
-     * @var \Google_Service_AndroidPublisher
+     * @var AndroidPublisher
      */
     protected $_androidPublisherService = null;
     /**
@@ -31,11 +33,11 @@ class Validator
     /**
      * Validator constructor.
      *
-     * @param \Google_Service_AndroidPublisher $googleServiceAndroidPublisher
-     * @param bool                             $validationModePurchase
+     * @param AndroidPublisher $googleServiceAndroidPublisher
+     * @param bool             $validationModePurchase
      */
     public function __construct(
-        \Google_Service_AndroidPublisher $googleServiceAndroidPublisher,
+        AndroidPublisher $googleServiceAndroidPublisher,
         $validationModePurchase = true
     ) {
         $this->_androidPublisherService = $googleServiceAndroidPublisher;
@@ -127,7 +129,7 @@ public function validateSubscription()
     }
 
     /**
-     * @return \Google_Service_AndroidPublisher
+     * @return AndroidPublisher
      */
     public function getPublisherService()
     {