[CORE-3678] update dependencies (#6)

Upgrade "google/apiclient": 2.0.* => ^v2.2
pdffiller · Aug 26, 2021 · b4b7b66 · b4b7b66
1 parent 03f670b
commit b4b7b66
Show file tree

Hide file tree

Showing 3 changed files with 351 additions and 58 deletions.
diff --git a/UploadModels/GoogleDriveModel.php b/UploadModels/GoogleDriveModel.php
@@ -26,7 +26,7 @@ public static function uploadFile($access_token, $uploadFile, $fileName, $config
             return array('status' => 'error', 'msg' => 'refreshToken', 'url' => self::auth($userId, $config));
         }
 
-        $service = new \Google_Service_Drive($client);
+        $service = new \Google\Service\Drive($client);
 
         $folderInfo = self::getFolder($access_token, $config);
         $id = 0;
@@ -46,7 +46,7 @@ public static function uploadFile($access_token, $uploadFile, $fileName, $config
         }
 
         //Insert a file
-        $file = new \Google_Service_Drive_DriveFile(array(
+        $file = new \Google\Service\Drive\DriveFile(array(
             'name' => $fileName,
             'parents' => array($id)
         ));
@@ -81,7 +81,7 @@ public static function getToken($config) {
     }
 
     private static function getGoogleClient($config) {
-        $client = new \Google_Client();
+        $client = new \Google\Client();
 
         $config = self::getGoogleConfig($config);
 
@@ -94,14 +94,14 @@ private static function getGoogleClient($config) {
         }
 
         $client->setRedirectUri($config['GOOGLEDRIVE_REDIRECT2']);
-        $client->addScope(\Google_Service_Drive::DRIVE);
+        $client->addScope(\Google\Service\Drive::DRIVE);
         return $client;
     }
 
     private static function getFolder($access_token, $config) {
         $client = self::getGoogleClient($config);
         $client->setAccessToken($access_token);
-        $service = new \Google_Service_Drive($client);
+        $service = new \Google\Service\Drive($client);
 
         $parameters['q'] = "mimeType='application/vnd.google-apps.folder' and 'root' in parents and trashed=false";
         try {
@@ -116,7 +116,7 @@ private static function getFolder($access_token, $config) {
             }
         }
 
-        $fileMetadata = new \Google_Service_Drive_DriveFile(array(
+        $fileMetadata = new \Google\Service\Drive\DriveFile(array(
             'name' => $config['SAVE_FOLDER'],
             'mimeType' => 'application/vnd.google-apps.folder'));
         $file = $service->files->create($fileMetadata, array(

diff --git a/composer.json b/composer.json
@@ -23,9 +23,9 @@
   ],
   "minimum-stability": "stable",
     "require": {
-        "krizalys/onedrive-php-sdk": "1.2.0",
-        "pdffiller/boxphpapi": "^1.0",
-        "google/apiclient": "2.0.*",
-        "kunalvarma05/dropbox-php-sdk": "^0.2.1"
+      "krizalys/onedrive-php-sdk": "1.2.0",
+      "pdffiller/boxphpapi": "^1.0",
+      "google/apiclient": "^v2.2",
+      "kunalvarma05/dropbox-php-sdk": "^0.2.1"
     }
 }