chore: upgrade PHP samples to use namespaces

admin-sdk/directory/composer.json

@@ -1,5 +1,5 @@
 {
  "require": {
- "google/apiclient": "^2.2"
+ "google/apiclient": "^2.10"
  }
 }

admin-sdk/directory/quickstart.php

@@ -21,13 +21,16 @@
  throw new Exception('This application must be run on the command line.');
 }
 
+use Google\Client;
+use Google\Service\Directory;
+
 /**
  * Returns an authorized API client.
- * @return Google_Client the authorized client object
+ * @return Client the authorized client object
  */
 function getClient()
 {
- $client = new Google_Client();
+ $client = new Client();
  $client->setApplicationName('G Suite Directory API PHP Quickstart');
  $client->setScopes('https://www.googleapis.com/auth/admin.directory.user.readonly');
  $client->setAuthConfig('credentials.json');
@@ -77,7 +80,7 @@ function getClient()
 
 // Get the API client and construct the service object.
 $client = getClient();
-$service = new Google_Service_Directory($client);
+$service = new Directory($client);
 
 // Print the first 10 users in the domain.
 try{

admin-sdk/reports/composer.json

@@ -1,5 +1,5 @@
 {
  "require": {
- "google/apiclient": "^2.2"
+ "google/apiclient": "^2.10"
  }
 }

admin-sdk/reports/quickstart.php

@@ -21,13 +21,16 @@
  throw new Exception('This application must be run on the command line.');
 }
 
+use Google\Client;
+use Google\Service\Reports;
+
 /**
  * Returns an authorized API client.
- * @return Google_Client the authorized client object
+ * @return Client the authorized client object
  */
 function getClient()
 {
- $client = new Google_Client();
+ $client = new Client();
  $client->setApplicationName('Reports API PHP Quickstart');
  $client->setScopes('https://www.googleapis.com/auth/admin.reports.audit.readonly');
  $client->setAuthConfig('credentials.json');
@@ -77,7 +80,7 @@ function getClient()
 
 // Get the API client and construct the service object.
 $client = getClient();
-$service = new Google_Service_Reports($client);
+$service = new Reports($client);
 
 // Print the last 10 login events.
 $userKey = 'all';

admin-sdk/reseller/composer.json

@@ -1,5 +1,5 @@
 {
  "require": {
- "google/apiclient": "^2.2"
+ "google/apiclient": "^2.10"
  }
 }

admin-sdk/reseller/quickstart.php

@@ -21,13 +21,16 @@
  throw new Exception('This application must be run on the command line.');
 }
 
+use Google\Client;
+use Google\Service\Reseller;
+
 /**
  * Returns an authorized API client.
- * @return Google_Client the authorized client object
+ * @return Client the authorized client object
  */
 function getClient()
 {
- $client = new Google_Client();
+ $client = new Client();
  $client->setApplicationName('G Suite Reseller API PHP Quickstart');
  $client->setScopes("https://www.googleapis.com/auth/apps.order");
  $client->setAuthConfig('credentials.json');
@@ -77,7 +80,7 @@ function getClient()
 
 // Get the API client and construct the service object.
 $client = getClient();
-$service = new Google_Service_Reseller($client);
+$service = new Reseller($client);
 
 // Print the first 10 subscriptions you manage.
 $optParams = array(

apps-script/execute/execute.php

@@ -18,14 +18,16 @@
 // [START apps_script_api_execute]
 require __DIR__ . '/vendor/autoload.php';
 
+use Google\Service\Script;
+
 // Get the API client and construct the service object.
 $client = getClient();
-$service = new Google_Service_Script($client);
+$service = new Script($client);
 
 $scriptId = 'ENTER_YOUR_SCRIPT_ID_HERE';
 
 // Create an execution request object.
-$request = new Google_Service_Script_ExecutionRequest();
+$request = new Script\ExecutionRequest();
 $request->setFunction('getFoldersUnderRoot');
 
 try {

apps-script/quickstart/composer.json

@@ -1,5 +1,5 @@
 {
  "require": {
- "google/apiclient": "^2.2"
+ "google/apiclient": "^2.10"
  }
 }

apps-script/quickstart/quickstart.php

@@ -21,13 +21,16 @@
  throw new Exception('This application must be run on the command line.');
 }
 
+use Google\Client;
+use Google\Service\Script;
+
 /**
  * Returns an authorized API client.
- * @return Google_Client the authorized client object
+ * @return Client the authorized client object
  */
 function getClient()
 {
- $client = new Google_Client();
+ $client = new Client();
  $client->setApplicationName('Google Apps Script API PHP Quickstart');
  $client->setScopes("https://www.googleapis.com/auth/script.projects");
  $client->setAuthConfig('credentials.json');
@@ -82,12 +85,12 @@ function getClient()
  * project, and log the script's URL to the user.
  */
 $client = getClient();
-$service = new Google_Service_Script($client);
+$service = new Script($client);
 
 // Create a management request object.
 try{
 
- $request = new Google_Service_Script_CreateProjectRequest();
+ $request = new Script\CreateProjectRequest();
  $request->setTitle('My Script');
  $response = $service->projects->create($request);
 
@@ -98,7 +101,7 @@ function helloWorld() {
  console.log('Hello, world!');
 }
 EOT;
- $file1 = new Google_Service_Script_ScriptFile();
+ $file1 = new Script\ScriptFile();
  $file1->setName('hello');
  $file1->setType('SERVER_JS');
  $file1->setSource($code);
@@ -109,12 +112,12 @@ function helloWorld() {
  "exceptionLogging": "CLOUD"
 }
 EOT;
- $file2 = new Google_Service_Script_ScriptFile();
+ $file2 = new Script\ScriptFile();
  $file2->setName('appsscript');
  $file2->setType('JSON');
  $file2->setSource($manifest);
 
- $request = new Google_Service_Script_Content();
+ $request = new Script\Content();
  $request->setScriptId($scriptId);
  $request->setFiles([$file1, $file2]);
 

calendar/quickstart/composer.json

@@ -1,5 +1,5 @@
 {
  "require": {
- "google/apiclient": "^2.2"
+ "google/apiclient": "^2.10"
  }
 }

calendar/quickstart/quickstart.php

@@ -21,13 +21,16 @@
  throw new Exception('This application must be run on the command line.');
 }
 
+use Google\Client;
+use Google\Service\Calendar;
+
 /**
  * Returns an authorized API client.
- * @return Google_Client the authorized client object
+ * @return Client the authorized client object
  */
 function getClient()
 {
- $client = new Google_Client();
+ $client = new Client();
  $client->setApplicationName('Google Calendar API PHP Quickstart');
  $client->setScopes('https://www.googleapis.com/auth/calendar.events.readonly');
  $client->setAuthConfig('credentials.json');
@@ -77,7 +80,7 @@ function getClient()
 
 // Get the API client and construct the service object.
 $client = getClient();
-$service = new Google_Service_Calendar($client);
+$service = new Calendar($client);
 
 // Print the next 10 events on the user's calendar.
 try{

classroom/quickstart/composer.json

@@ -1,5 +1,5 @@
 {
  "require": {
- "google/apiclient": "^2.2"
+ "google/apiclient": "^2.10"
  }
 }

classroom/quickstart/quickstart.php

@@ -21,13 +21,16 @@
  throw new Exception('This application must be run on the command line.');
 }
 
+use Google\Client;
+use Google\Service\Classroom;
+
 /**
  * Returns an authorized API client.
- * @return Google_Client the authorized client object
+ * @return Client the authorized client object
  */
 function getClient()
 {
- $client = new Google_Client();
+ $client = new Client();
  $client->setApplicationName('Google Classroom API PHP Quickstart');
  $client->setScopes('https://www.googleapis.com/auth/classroom.courses.readonly');
  $client->setAuthConfig('credentials.json');
@@ -77,7 +80,7 @@ function getClient()
 
 // Get the API client and construct the service object.
 $client = getClient();
-$service = new Google_Service_Classroom($client);
+$service = new Classroom($client);
 
 // Print the first 10 courses the user has access to.
 try{

docs/quickstart/composer.json

@@ -1,5 +1,5 @@
 {
  "require": {
- "google/apiclient": "^2.2"
+ "google/apiclient": "^2.10"
  }
 }

docs/quickstart/quickstart.php

@@ -17,13 +17,16 @@
 // [START docs_quickstart]
 require __DIR__ . '/vendor/autoload.php';
 
+use Google\Client;
+use Google\Service\Docs;
+
 /**
  * Returns an authorized API client.
- * @return Google_Client the authorized client object
+ * @return Client the authorized client object
  */
 function getClient()
 {
- $client = new Google_Client();
+ $client = new Client();
  $client->setApplicationName('Google Docs API PHP Quickstart');
  $client->setScopes('https://www.googleapis.com/auth/documents.readonly	');
  $client->setAuthConfig('credentials.json');
@@ -76,7 +79,7 @@ function expandHomeDirectory($path)
 
 // Get the API client and construct the service object.
 $client = getClient();
-$service = new Google_Service_Docs($client);
+$service = new Docs($client);
 
 // Prints the title of the requested doc:
 // https://docs.google.com/document/d/195j9eDD3ccgjQRttHhJPymLJUCOUjs-jmwTrekvdjFE/edit

docs/samples/composer.json

@@ -1,6 +1,6 @@
 {
  "require": {
- "google/apiclient": "^2.2",
+ "google/apiclient": "^2.10",
  "duncan3dc/cache": "~0.4"
  },
  "require-dev": {

docs/samples/extract_text.php

@@ -32,13 +32,16 @@
 # [START docs_extract_text]
 // $documentId = 'YOUR_DOCUMENT_ID';
 
+use Google\Client;
+use Google\Service\Docs;
+
 /**
  * Create an authorized API client.
  * Be sure you've set up your OAuth2 consent screen at
  * https://console.cloud.google.com/apis/credentials/consent
  */
-$client = new Google_Client();
-$client->setScopes(Google_Service_Docs::DOCUMENTS_READONLY);
+$client = new Client();
+$client->setScopes(Docs::DOCUMENTS_READONLY);
 $client->setAuthConfig('credentials.json');
 $client->setAccessType('offline');
 
@@ -116,7 +119,7 @@ function read_structural_elements($elements)
 }
 
 // Fetch the document and print all text elements
-$service = new Google_Service_Docs($client);
+$service = new Docs($client);
 $doc = $service->documents->get($documentId);
 echo read_structural_elements($doc->getBody()->getContent());
 # [END docs_extract_text]

docs/samples/output_as_json.php

@@ -29,6 +29,9 @@
 }
 list($_, $documentId) = $argv;
 
+use Google\Client;
+use Google\Service\Docs;
+
 # [START docs_output_as_json]
 // $documentId = 'YOUR_DOCUMENT_ID';
 
@@ -37,8 +40,8 @@
  * Be sure you've set up your OAuth2 consent screen at
  * https://console.cloud.google.com/apis/credentials/consent
  */
-$client = new Google_Client();
-$client->setScopes(Google_Service_Docs::DOCUMENTS_READONLY);
+$client = new Client();
+$client->setScopes(Docs::DOCUMENTS_READONLY);
 $client->setAuthConfig('credentials.json');
 $client->setAccessType('offline');
 
@@ -73,7 +76,7 @@
 }
 
 // Fetch the document and print the results as formatted JSON
-$service = new Google_Service_Docs($client);
+$service = new Docs($client);
 $doc = $service->documents->get($documentId);
 print(json_encode((array) $doc, JSON_PRETTY_PRINT));
 # [END docs_output_as_json]

drive/activity-v2/composer.json

@@ -1,5 +1,5 @@
 {
  "require": {
- "google/apiclient": "^2.2"
+ "google/apiclient": "^2.10"
  }
 }

drive/activity-v2/quickstart.php

@@ -21,13 +21,16 @@
  throw new Exception('This application must be run on the command line.');
 }
 
+use Google\Client;
+use Google\Service\DriveActivity;
+
 /**
  * Returns an authorized API client.
- * @return Google_Client the authorized client object
+ * @return Client the authorized client object
  */
 function getClient()
 {
- $client = new Google_Client();
+ $client = new Client();
  $client->setApplicationName('Google Drive Activity API Quickstart');
  $client->setScopes('https://www.googleapis.com/auth/drive.activity.readonly');
  $client->setAuthConfig('credentials.json');
@@ -76,10 +79,10 @@ function getClient()
 
 // Get the API client and construct the service object.
 $client = getClient();
-$service = new Google_Service_DriveActivity($client);
+$service = new DriveActivity($client);
 
 // Print the recent activity in your Google Drive.
-$request = new Google_Service_DriveActivity_QueryDriveActivityRequest();
+$request = new DriveActivity\QueryDriveActivityRequest();
 $request->setPageSize(10);
 $results = $service->activity->query($request);