Quickstart update

admin-sdk/directory/quickstart.php

@@ -29,7 +29,7 @@ function getClient()
 {
     $client = new Google_Client();
     $client->setApplicationName('G Suite Directory API PHP Quickstart');
-    $client->setScopes(Google_Service_Directory::ADMIN_DIRECTORY_USER_READONLY);
+    $client->setScopes('https://www.googleapis.com/auth/admin.directory.user.readonly');
     $client->setAuthConfig('credentials.json');
     $client->setAccessType('offline');
     $client->setPrompt('select_account consent');
@@ -80,20 +80,27 @@ function getClient()
 $service = new Google_Service_Directory($client);
 
 // Print the first 10 users in the domain.
-$optParams = array(
-  'customer' => 'my_customer',
-  'maxResults' => 10,
-  'orderBy' => 'email',
-);
-$results = $service->users->listUsers($optParams);
+try{
 
-if (count($results->getUsers()) == 0) {
-  print "No users found.\n";
-} else {
-  print "Users:\n";
-  foreach ($results->getUsers() as $user) {
-    printf("%s (%s)\n", $user->getPrimaryEmail(),
-        $user->getName()->getFullName());
-  }
+    $optParams = array(
+        'customer' => 'my_customer',
+        'maxResults' => 10,
+        'orderBy' => 'email',
+    );
+    $results = $service->users->listUsers($optParams);
+
+    if (count($results->getUsers()) == 0) {
+        print "No users found.\n";
+    } else {
+        print "Users:\n";
+        foreach ($results->getUsers() as $user) {
+            printf("%s (%s)\n", $user->getPrimaryEmail(),
+                $user->getName()->getFullName());
+        }
+    }
+}
+catch(Exception $e) {
+// TODO(developer) - handle error appropriately
+    echo 'Message: ' .$e->getMessage();
 }
-// [END admin_sdk_directory_quickstart]
+// [END admin_sdk_directory_quickstart]

admin-sdk/reports/quickstart.php

@@ -29,7 +29,7 @@ function getClient()
 {
     $client = new Google_Client();
     $client->setApplicationName('Reports API PHP Quickstart');
-    $client->setScopes(Google_Service_Reports::ADMIN_REPORTS_AUDIT_READONLY);
+    $client->setScopes('https://www.googleapis.com/auth/admin.reports.audit.readonly');
     $client->setAuthConfig('credentials.json');
     $client->setAccessType('offline');
     $client->setPrompt('select_account consent');
@@ -83,19 +83,19 @@ function getClient()
 $userKey = 'all';
 $applicationName = 'login';
 $optParams = array(
-  'maxResults' => 10,
+    'maxResults' => 10,
 );
 $results = $service->activities->listActivities(
     $userKey, $applicationName, $optParams);
 
 if (count($results->getItems()) == 0) {
-  print "No logins found.\n";
+    print "No logins found.\n";
 } else {
-  print "Logins:\n";
-  foreach ($results->getItems() as $activity) {
-    printf("%s: %s (%s)\n", $activity->getId()->getTime(),
-        $activity->getActor()->getEmail(),
-        $activity->getEvents()[0]->getName());
-  }
+    print "Logins:\n";
+    foreach ($results->getItems() as $activity) {
+        printf("%s: %s (%s)\n", $activity->getId()->getTime(),
+            $activity->getActor()->getEmail(),
+            $activity->getEvents()[0]->getName());
+    }
 }
-// [END admin_sdk_reports_quickstart]
+// [END admin_sdk_reports_quickstart]

admin-sdk/reseller/quickstart.php

@@ -29,7 +29,7 @@ function getClient()
 {
     $client = new Google_Client();
     $client->setApplicationName('G Suite Reseller API PHP Quickstart');
-    $client->setScopes(Google_Service_Reseller::APPS_ORDER);
+    $client->setScopes("https://www.googleapis.com/auth/apps.order");
     $client->setAuthConfig('credentials.json');
     $client->setAccessType('offline');
     $client->setPrompt('select_account consent');
@@ -81,17 +81,17 @@ function getClient()
 
 // Print the first 10 subscriptions you manage.
 $optParams = array(
-  'maxResults' => 10,
+    'maxResults' => 10,
 );
 $results = $service->subscriptions->listSubscriptions($optParams);
 
 if (count($results->getSubscriptions()) == 0) {
-  print "No subscriptions found.\n";
+    print "No subscriptions found.\n";
 } else {
-  print "Subscriptions:\n";
-  foreach ($results->getSubscriptions() as $subscription) {
-    printf("%s (%s, %s)\n", $subscription->getCustomerId(),
-        $subscription->getSkuId(), $subscription->getPlan()->getPlanName());
-  }
+    print "Subscriptions:\n";
+    foreach ($results->getSubscriptions() as $subscription) {
+        printf("%s (%s, %s)\n", $subscription->getCustomerId(),
+            $subscription->getSkuId(), $subscription->getPlan()->getPlanName());
+    }
 }
-// [END admin_sdk_reseller_quickstart]
+// [END admin_sdk_reseller_quickstart]

apps-script/quickstart/quickstart.php

@@ -85,37 +85,44 @@ function getClient()
 $service = new Google_Service_Script($client);
 
 // Create a management request object.
-$request = new Google_Service_Script_CreateProjectRequest();
-$request->setTitle('My Script');
-$response = $service->projects->create($request);
+try{
 
-$scriptId = $response->getScriptId();
+    $request = new Google_Service_Script_CreateProjectRequest();
+    $request->setTitle('My Script');
+    $response = $service->projects->create($request);
 
-$code = <<<EOT
+    $scriptId = $response->getScriptId();
+
+    $code = <<<EOT
 function helloWorld() {
   console.log('Hello, world!');
 }
 EOT;
-$file1 = new Google_Service_Script_ScriptFile();
-$file1->setName('hello');
-$file1->setType('SERVER_JS');
-$file1->setSource($code);
+    $file1 = new Google_Service_Script_ScriptFile();
+    $file1->setName('hello');
+    $file1->setType('SERVER_JS');
+    $file1->setSource($code);
 
-$manifest = <<<EOT
+    $manifest = <<<EOT
 {
   "timeZone": "America/New_York",
   "exceptionLogging": "CLOUD"
 }
 EOT;
-$file2 = new Google_Service_Script_ScriptFile();
-$file2->setName('appsscript');
-$file2->setType('JSON');
-$file2->setSource($manifest);
+    $file2 = new Google_Service_Script_ScriptFile();
+    $file2->setName('appsscript');
+    $file2->setType('JSON');
+    $file2->setSource($manifest);
 
-$request = new Google_Service_Script_Content();
-$request->setScriptId($scriptId);
-$request->setFiles([$file1, $file2]);
+    $request = new Google_Service_Script_Content();
+    $request->setScriptId($scriptId);
+    $request->setFiles([$file1, $file2]);
 
-$response = $service->projects->updateContent($scriptId, $request);
-echo "https://script.google.com/d/" . $response->getScriptId() . "/edit\n";
-// [END apps_script_api_quickstart]
+    $response = $service->projects->updateContent($scriptId, $request);
+    echo "https://script.google.com/d/" . $response->getScriptId() . "/edit\n";
+}
+catch(Exception $e) {
+    // TODO(developer) - handle error appropriately
+    echo 'Message: ' .$e->getMessage();
+}
+// [END apps_script_api_quickstart]

calendar/quickstart/quickstart.php

@@ -29,7 +29,7 @@ function getClient()
 {
     $client = new Google_Client();
     $client->setApplicationName('Google Calendar API PHP Quickstart');
-    $client->setScopes(Google_Service_Calendar::CALENDAR_READONLY);
+    $client->setScopes('https://www.googleapis.com/auth/calendar.events.readonly');
     $client->setAuthConfig('credentials.json');
     $client->setAccessType('offline');
     $client->setPrompt('select_account consent');
@@ -80,26 +80,33 @@ function getClient()
 $service = new Google_Service_Calendar($client);
 
 // Print the next 10 events on the user's calendar.
-$calendarId = 'primary';
-$optParams = array(
-  'maxResults' => 10,
-  'orderBy' => 'startTime',
-  'singleEvents' => true,
-  'timeMin' => date('c'),
-);
-$results = $service->events->listEvents($calendarId, $optParams);
-$events = $results->getItems();
+try{
 
-if (empty($events)) {
-    print "No upcoming events found.\n";
-} else {
-    print "Upcoming events:\n";
-    foreach ($events as $event) {
-        $start = $event->start->dateTime;
-        if (empty($start)) {
-            $start = $event->start->date;
+    $calendarId = 'primary';
+    $optParams = array(
+        'maxResults' => 10,
+        'orderBy' => 'startTime',
+        'singleEvents' => true,
+        'timeMin' => date('c'),
+    );
+    $results = $service->events->listEvents($calendarId, $optParams);
+    $events = $results->getItems();
+
+    if (empty($events)) {
+        print "No upcoming events found.\n";
+    } else {
+        print "Upcoming events:\n";
+        foreach ($events as $event) {
+            $start = $event->start->dateTime;
+            if (empty($start)) {
+                $start = $event->start->date;
+            }
+            printf("%s (%s)\n", $event->getSummary(), $start);
         }
-        printf("%s (%s)\n", $event->getSummary(), $start);
     }
 }
-// [END calendar_quickstart]
+catch(Exception $e) {
+    // TODO(developer) - handle error appropriately
+    echo 'Message: ' .$e->getMessage();
+}
+// [END calendar_quickstart]

classroom/quickstart/quickstart.php

@@ -29,7 +29,7 @@ function getClient()
 {
     $client = new Google_Client();
     $client->setApplicationName('Google Classroom API PHP Quickstart');
-    $client->setScopes(Google_Service_Classroom::CLASSROOM_COURSES_READONLY);
+    $client->setScopes('https://www.googleapis.com/auth/classroom.courses.readonly');
     $client->setAuthConfig('credentials.json');
     $client->setAccessType('offline');
     $client->setPrompt('select_account consent');
@@ -80,17 +80,25 @@ function getClient()
 $service = new Google_Service_Classroom($client);
 
 // Print the first 10 courses the user has access to.
-$optParams = array(
-  'pageSize' => 10
-);
-$results = $service->courses->listCourses($optParams);
+try{
 
-if (count($results->getCourses()) == 0) {
-  print "No courses found.\n";
-} else {
-  print "Courses:\n";
-  foreach ($results->getCourses() as $course) {
-    printf("%s (%s)\n", $course->getName(), $course->getId());
-  }
+    $optParams = array(
+        'pageSize' => 10
+    );
+    $results = $service->courses->listCourses($optParams);
+
+    if (count($results->getCourses()) == 0) {
+        print "No courses found.\n";
+    } else {
+        print "Courses:\n";
+        foreach ($results->getCourses() as $course) {
+            printf("%s (%s)\n", $course->getName(), $course->getId());
+        }
+    }
 }
-// [END classroom_quickstart]
+catch(Exception $e) {
+    // TODO(developer) - handle error appropriately
+    echo 'Message: ' .$e->getMessage();
+}
+
+// [END classroom_quickstart]

docs/quickstart/composer.json

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

docs/quickstart/quickstart.php

@@ -25,7 +25,7 @@ function getClient()
 {
     $client = new Google_Client();
     $client->setApplicationName('Google Docs API PHP Quickstart');
-    $client->setScopes(Google_Service_Docs::DOCUMENTS_READONLY);
+    $client->setScopes('https://www.googleapis.com/auth/documents.readonly	');
     $client->setAuthConfig('credentials.json');
     $client->setAccessType('offline');
 

drive/activity-v2/quickstart.php

@@ -29,7 +29,7 @@ function getClient()
 {
     $client = new Google_Client();
     $client->setApplicationName('Google Drive Activity API Quickstart');
-    $client->setScopes(Google_Service_DriveActivity::DRIVE_ACTIVITY_READONLY);
+    $client->setScopes('https://www.googleapis.com/auth/drive.activity.readonly');
     $client->setAuthConfig('credentials.json');
     $client->setAccessType('offline');
     $client->setPrompt('select_account consent');
@@ -169,4 +169,4 @@ function getTargetInfo($target)
     }
     return getOneOf($target);
 }
-// [END drive_activity_v2_quickstart]
+// [END drive_activity_v2_quickstart]