chore: fix tests in preparation of google/apiclient-services:v0.200.0 release (#2086)

Author: bshaffer

README.md

@@ -138,12 +138,12 @@ $client = new Google\Client();
 $client->setApplicationName("Client_Library_Examples");
 $client->setDeveloperKey("YOUR_APP_KEY");
 
-$service = new Google_Service_Books($client);
-$optParams = array(
+$service = new Google\Service\Books($client);
+$query = 'Henry David Thoreau';
+$optParams = [
   'filter' => 'free-ebooks',
-  'q' => 'Henry David Thoreau'
-);
-$results = $service->volumes->listVolumes($optParams);
+];
+$results = $service->volumes->listVolumes($query, $optParams);
 
 foreach ($results->getItems() as $item) {
   echo $item['volumeInfo']['title'], "<br /> \n";
@@ -166,7 +166,7 @@ foreach ($results->getItems() as $item) {
 1. Set the scopes required for the API you are going to call
 
     ```php
-    $client->addScope(Google_Service_Drive::DRIVE);
+    $client->addScope(Google\Service\Drive::DRIVE);
     ```
 
 1. Set your application's redirect URI
@@ -213,7 +213,7 @@ calls return unexpected 401 or 403 errors.
 1. Set the scopes required for the API you are going to call
 
     ```php
-    $client->addScope(Google_Service_Drive::DRIVE);
+    $client->addScope(Google\Service\Drive::DRIVE);
     ```
 
 1. If you have delegated domain-wide access to the service account and you want to impersonate a user account, specify the email address of the user account using the method setSubject:
@@ -264,10 +264,10 @@ Using this library, the same call would look something like this:
 
 ```php
 // create the datastore service class
-$datastore = new Google_Service_Datastore($client);
+$datastore = new Google\Service\Datastore($client);
 
 // build the query - this maps directly to the JSON
-$query = new Google_Service_Datastore_Query([
+$query = new Google\Service\Datastore\Query([
     'kind' => [
         [
             'name' => 'Book',
@@ -283,28 +283,28 @@ $query = new Google_Service_Datastore_Query([
 ]);
 
 // build the request and response
-$request = new Google_Service_Datastore_RunQueryRequest(['query' => $query]);
+$request = new Google\Service\Datastore\RunQueryRequest(['query' => $query]);
 $response = $datastore->projects->runQuery('YOUR_DATASET_ID', $request);
 ```
 
 However, as each property of the JSON API has a corresponding generated class, the above code could also be written like this:
 
 ```php
 // create the datastore service class
-$datastore = new Google_Service_Datastore($client);
+$datastore = new Google\Service\Datastore($client);
 
 // build the query
-$request = new Google_Service_Datastore_RunQueryRequest();
-$query = new Google_Service_Datastore_Query();
+$request = new Google\Service\Datastore_RunQueryRequest();
+$query = new Google\Service\Datastore\Query();
 //   - set the order
-$order = new Google_Service_Datastore_PropertyOrder();
+$order = new Google\Service\Datastore_PropertyOrder();
 $order->setDirection('descending');
-$property = new Google_Service_Datastore_PropertyReference();
+$property = new Google\Service\Datastore\PropertyReference();
 $property->setName('title');
 $order->setProperty($property);
 $query->setOrder([$order]);
 //   - set the kinds
-$kind = new Google_Service_Datastore_KindExpression();
+$kind = new Google\Service\Datastore\KindExpression();
 $kind->setName('Book');
 $query->setKinds([$kind]);
 //   - set the limit
@@ -335,7 +335,7 @@ $client = new Google\Client();
  * Application Default Credentials.
  */
 $client->useApplicationDefaultCredentials();
-$client->addScope(Google_Service_Plus::PLUS_ME);
+$client->addScope(Google\Service\Plus::PLUS_ME);
 
 // returns a Guzzle HTTP Client
 $httpClient = $client->authorize();
@@ -438,9 +438,9 @@ If there is a specific bug with the library, please [file an issue](https://gith
 
 If X is a feature of the library, file away! If X is an example of using a specific service, the best place to go is to the teams for those specific APIs - our preference is to link to their examples rather than add them to the library, as they can then pin to specific versions of the library. If you have any examples for other APIs, let us know and we will happily add a link to the README above!
 
-### Why does Google_..._Service have weird names? ###
+### Why do some Google\Service classes have weird names? ###
 
-The _Service classes are generally automatically generated from the API discovery documents: https://developers.google.com/discovery/. Sometimes new features are added to APIs with unusual names, which can cause some unexpected or non-standard style naming in the PHP classes.
+The _Google\Service_ classes are generally automatically generated from the API discovery documents: https://developers.google.com/discovery/. Sometimes new features are added to APIs with unusual names, which can cause some unexpected or non-standard style naming in the PHP classes.
 
 ### How do I deal with non-JSON response types? ###
 

UPGRADING.md

@@ -1,6 +1,53 @@
 Google API Client Upgrade Guide
 ===============================
 
+2.x to 2.10.0
+-------------
+
+### Namespaces
+
+The Google API Client for PHP now uses namespaces for all classes. Code using
+the legacy classnames will continue to work, but it is advised to upgrade to the
+underspaced names, as the legacy classnames will be deprecated some time in the
+future.
+
+**Before**
+
+```php
+$client = new Google_Client();
+$service = new Google_Service_Books($client);
+```
+
+**After**
+```php
+$client = new Google\Client();
+$service = new Google\Service\Books($client);
+```
+
+### Service class constructors
+
+Service class constructors now accept an optional `Google\Client|array` parameter
+as their first argument, rather than requiring an instance of `Google\Client`.
+
+**Before**
+
+```php
+$client = new Google_Client();
+$client->setApplicationName("Client_Library_Examples");
+$client->setDeveloperKey("YOUR_APP_KEY");
+
+$service = new Google_Service_Books($client);
+```
+
+**After**
+
+```php
+$service = new Google\Service\Books([
+    'application_name' => "Client_Library_Examples",
+    'developer_key'    => "YOUR_APP_KEY",
+]);
+```
+
 1.0 to 2.0
 ----------
 

composer.json

@@ -8,7 +8,7 @@
     "require": {
         "php": "^5.6|^7.0|^8.0",
         "google/auth": "^1.10",
-        "google/apiclient-services": "~0.13",
+        "google/apiclient-services": "^0.200.0",
         "firebase/php-jwt": "~2.0||~3.0||~4.0||~5.0",
         "monolog/monolog": "^1.17|^2.0",
         "phpseclib/phpseclib": "~2.0||^3.0.2",

docs/media.md

@@ -7,7 +7,7 @@ The PHP client library allows for uploading large files for use with APIs such a
 In the simple upload case, the data is passed as the body of the request made to the server. This limits the ability to specify metadata, but is very easy to use.
 
 ```php
-$file = new Google_Service_Drive_DriveFile();
+$file = new Google\Service\Drive\DriveFile();
 $result = $service->files->insert($file, array(
   'data' => file_get_contents("path/to/file"),
   'mimeType' => 'application/octet-stream',
@@ -20,7 +20,7 @@ $result = $service->files->insert($file, array(
 With multipart file uploads, the uploaded file is sent as one part of a multipart form post. This allows metadata about the file object to be sent as part of the post as well. This is triggered by specifying the _multipart_ uploadType.
 
 ```php
-$file = new Google_Service_Drive_DriveFile();
+$file = new Google\Service\Drive\DriveFile();
 $file->setTitle("Hello World!");
 $result = $service->files->insert($file, array(
   'data' => file_get_contents("path/to/file"),
@@ -34,7 +34,7 @@ $result = $service->files->insert($file, array(
 It is also possible to split the upload across multiple requests. This is convenient for larger files, and allows resumption of the upload if there is a problem. Resumable uploads can be sent with separate metadata.
 
 ```php
-$file = new Google_Service_Drive_DriveFile();
+$file = new Google\Service\Drive\DriveFile();
 $file->title = "Big File";
 $chunkSizeBytes = 1 * 1024 * 1024;
 

docs/oauth-server.md

@@ -87,7 +87,7 @@ Use the authorized `Google\Client` object to call Google APIs by completing the
 1.  Build a service object for the API that you want to call, providing the authorized `Google\Client` object. For example, to call the Cloud SQL Administration API:
 
     ```php
-    $sqladmin = new Google_Service_SQLAdmin($client);
+    $sqladmin = new Google\Service\SQLAdmin($client);
     ```
 
 2.  Make requests to the API service using the [interface provided by the service object](https://github.com/googleapis/google-api-php-client/blob/master/docs/start.md#build-the-service-object). For example, to list the instances of Cloud SQL databases in the examinable-example-123 project:
@@ -133,7 +133,7 @@ putenv('GOOGLE_APPLICATION_CREDENTIALS=/path/to/service-account.json');
 $client = new Google\Client();
 $client->useApplicationDefaultCredentials();
 
-$sqladmin = new Google_Service_SQLAdmin($client);
+$sqladmin = new Google\Service\SQLAdmin($client);
 $response = $sqladmin->instances
     ->listInstances('examinable-example-123')->getItems();
 echo json_encode($response) . "\n";

docs/oauth-web.md

@@ -82,7 +82,7 @@ For example, this code requests read-only, offline access to a user's Google Dri
 ```php
 $client = new Google\Client();
 $client->setAuthConfig('client_secret.json');
-$client->addScope(Google_Service_Drive::DRIVE_METADATA_READONLY);
+$client->addScope(Google\Service\Drive::DRIVE_METADATA_READONLY);
 $client->setRedirectUri('http://' . $_SERVER['HTTP_HOST'] . '/oauth2callback.php');
 $client->setAccessType('offline');        // offline access
 $client->setIncludeGrantedScopes(true);   // incremental auth
@@ -118,7 +118,7 @@ $client->setRedirectUri('http://localhost:8080/oauth2callback.php');
 Scopes enable your application to only request access to the resources that it needs while also enabling users to control the amount of access that they grant to your application. Thus, there is an inverse relationship between the number of scopes requested and the likelihood of obtaining user consent. To set this value in PHP, call the `addScope` function:
 
 ```php
-$client->addScope(Google_Service_Drive::DRIVE_METADATA_READONLY);
+$client->addScope(Google\Service\Drive::DRIVE_METADATA_READONLY);
 ```
 
 The [OAuth 2.0 API Scopes](https://developers.google.com/identity/protocols/googlescopes) document provides a full list of scopes that you might use to access Google APIs.
@@ -284,7 +284,7 @@ Use the access token to call Google APIs by completing the following steps:
 2.  Build a service object for the API that you want to call. You build a a service object by providing an authorized `Google\Client` object to the constructor for the API you want to call. For example, to call the Drive API:
 
     ```php
-    $drive = new Google_Service_Drive($client);
+    $drive = new Google\Service\Drive($client);
     ```
 
 3.  Make requests to the API service using the [interface provided by the service object](start.md). For example, to list the files in the authenticated user's Google Drive:
@@ -331,11 +331,11 @@ session_start();
 
 $client = new Google\Client();
 $client->setAuthConfig('client_secrets.json');
-$client->addScope(Google_Service_Drive::DRIVE_METADATA_READONLY);
+$client->addScope(Google\Service\Drive::DRIVE_METADATA_READONLY);
 
 if (isset($_SESSION['access_token']) && $_SESSION['access_token']) {
   $client->setAccessToken($_SESSION['access_token']);
-  $drive = new Google_Service_Drive($client);
+  $drive = new Google\Service\Drive($client);
   $files = $drive->files->listFiles(array())->getItems();
   echo json_encode($files);
 } else {
@@ -355,7 +355,7 @@ session_start();
 $client = new Google\Client();
 $client->setAuthConfigFile('client_secrets.json');
 $client->setRedirectUri('http://' . $_SERVER['HTTP_HOST'] . '/oauth2callback.php');
-$client->addScope(Google_Service_Drive::DRIVE_METADATA_READONLY);
+$client->addScope(Google\Service\Drive::DRIVE_METADATA_READONLY);
 
 if (! isset($_GET['code'])) {
   $auth_url = $client->createAuthUrl();

docs/parameters.md

@@ -1,6 +1,6 @@
 # Standard Parameters
 
-Many API methods include support for certain optional parameters. In addition to these there are several standard parameters that can be applied to any API call. These are defined in the `Google_Service_Resource` class.
+Many API methods include support for certain optional parameters. In addition to these there are several standard parameters that can be applied to any API call. These are defined in the `Google\Service\Resource` class.
 
 ## Parameters
 

docs/start.md

@@ -64,7 +64,7 @@ $client->setDeveloperKey("MY_SIMPLE_API_KEY");
 Services are called through queries to service specific objects. These are created by constructing the service object, and passing an instance of `Google\Client` to it. `Google\Client` contains the IO, authentication and other classes required by the service to function, and the service informs the client which scopes it uses to provide a default when authenticating a user.
 
 ```php
-$service = new Google_Service_Books($client);
+$service = new Google\Service\Books($client);
 ```
 
 ### Calling an API

examples/batch.php

@@ -42,7 +42,7 @@
 }
 $client->setDeveloperKey($apiKey);
 
-$service = new Google_Service_Books($client);
+$service = new Google\Service\Books($client);
 
 /************************************************
   To actually make the batch call we need to

examples/large-file-download.php

@@ -38,7 +38,7 @@
 $client->setAuthConfig($oauth_credentials);
 $client->setRedirectUri($redirect_uri);
 $client->addScope("https://www.googleapis.com/auth/drive");
-$service = new Google_Service_Drive($client);
+$service = new Google\Service\Drive($client);
 
 /************************************************
  * If we have a code back from the OAuth 2.0 flow,