MDL-49519 libraries: Updated google-api-php-client to 1.1.2

lib/google/README.md

@@ -12,6 +12,8 @@ This library is in Beta. We're comfortable enough with the stability and feature
 * [PHP 5.2.1 or higher](http://www.php.net/)
 * [PHP JSON extension](http://php.net/manual/en/book.json.php)
 
+*Note*: some features (service accounts and id token verification) require PHP 5.3.0 and above due to cryptographic algorithm requirements. 
+
 ## Developer Documentation ##
 http://developers.google.com/api-client-library/php
 
@@ -23,11 +25,13 @@ For the latest installation and setup instructions, see [the documentation](http
 See the examples/ directory for examples of the key client features.
 ```PHP
 <?php
-  require_once 'Google/Client.php';
-  require_once 'Google/Service/Books.php';
+
+  require_once 'google-api-php-client/autoload.php'; // or wherever autoload.php is located
+  
   $client = new Google_Client();
   $client->setApplicationName("Client_Library_Examples");
   $client->setDeveloperKey("YOUR_APP_KEY");
+  
   $service = new Google_Service_Books($client);
   $optParams = array('filter' => 'free-ebooks');
   $results = $service->volumes->listVolumes('Henry David Thoreau', $optParams);
@@ -35,6 +39,7 @@ See the examples/ directory for examples of the key client features.
   foreach ($results as $item) {
     echo $item['volumeInfo']['title'], "<br /> \n";
   }
+  
 ```
 
 ## Frequently Asked Questions ##
@@ -57,6 +62,16 @@ When we started working on the 1.0.0 branch we knew there were several fundament
 
 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. 
 
+### How do I deal with non-JSON response types? ###
+
+Some services return XML or similar by default, rather than JSON, which is what the library supports. You can request a JSON response by adding an 'alt' argument to optional params that is normally the last argument to a method call:
+
+```
+$opt_params = array(
+  'alt' => "json"
+);
+```
+
 ## Code Quality ##
 
 Copy the ruleset.xml in style/ into a new directory named GAPI/ in your

lib/google/autoload.php

@@ -0,0 +1,33 @@
+<?php
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+function google_api_php_client_autoload($className) {
+  $classPath = explode('_', $className);
+  if ($classPath[0] != 'Google') {
+    return;
+  }
+  if (count($classPath) > 3) {
+    // Maximum class file path depth in this project is 3.
+    $classPath = array_slice($classPath, 0, 3);
+  }
+  $filePath = dirname(__FILE__) . '/src/' . implode('/', $classPath) . '.php';
+  if (file_exists($filePath)) {
+    require_once($filePath);
+  }
+}
+
+spl_autoload_register('google_api_php_client_autoload');

lib/google/readme_moodle.txt

@@ -1,11 +1,12 @@
 Google APIs Client Library for PHP
 ==================================
 
-Only the source and the README files have been kept in this directory:
+Only the source, README and autoloader files have been kept in this directory:
 
-- Copy /src/Google to /Google
+- Copy /src/Google to /src/Google 
 - Copy /LICENSE to LICENSE
 - Copy /README.md to README.md
+- Copy /autoload.php to autoload.php
 
 Here are the files that we have added.
 
@@ -30,4 +31,4 @@ Repository: https://github.com/google/google-api-php-client
 Documentation: https://developers.google.com/api-client-library/php/
 Global documentation: https://developers.google.com
 
-Downloaded version: 1.0.5-beta
+Downloaded version: 1.1.2

lib/google/src/Google/Auth/Abstract.php

@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require_once "Google/Http/Request.php";
+
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * Abstract class for the Authentication in the API client

lib/google/src/Google/Auth/AppIdentity.php

@@ -22,8 +22,7 @@
  */
 use google\appengine\api\app_identity\AppIdentityService;
 
-require_once "Google/Auth/Abstract.php";
-require_once "Google/Http/Request.php";
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * Authentication via the Google App Engine App Identity service.
@@ -31,7 +30,6 @@ require_once "Google/Http/Request.php";
 class Google_Auth_AppIdentity extends Google_Auth_Abstract
 {
   const CACHE_PREFIX = "Google_Auth_AppIdentity::";
-  const CACHE_LIFETIME = 1500;
   private $key = null;
   private $client;
   private $token = false;
@@ -50,18 +48,22 @@ class Google_Auth_AppIdentity extends Google_Auth_Abstract
     if ($this->token && $this->tokenScopes == $scopes) {
       return $this->token;
     }
-    $memcache = new Memcached();
-    $this->token = $memcache->get(self::CACHE_PREFIX . $scopes);
+
+    $cacheKey = self::CACHE_PREFIX;
+    if (is_string($scopes)) {
+      $cacheKey .= $scopes;
+    } else if (is_array($scopes)) {
+      $cacheKey .= implode(":", $scopes);
+    }
+
+    $this->token = $this->client->getCache()->get($cacheKey);
     if (!$this->token) {
       $this->token = AppIdentityService::getAccessToken($scopes);
       if ($this->token) {
-        $memcache_key = self::CACHE_PREFIX;
-        if (is_string($scopes)) {
-          $memcache_key .= $scopes;
-        } else if (is_array($scopes)) {
-          $memcache_key .= implode(":", $scopes);
-        }
-        $memcache->set($memcache_key, $this->token, self::CACHE_LIFETIME);
+        $this->client->getCache()->set(
+            $cacheKey,
+            $this->token
+        );
       }
     }
     $this->tokenScopes = $scopes;
@@ -81,7 +83,7 @@ class Google_Auth_AppIdentity extends Google_Auth_Abstract
   public function authenticatedRequest(Google_Http_Request $request)
   {
     $request = $this->sign($request);
-    return $this->io->makeRequest($request);
+    return $this->client->getIo()->makeRequest($request);
   }
 
   public function sign(Google_Http_Request $request)
@@ -90,6 +92,9 @@ class Google_Auth_AppIdentity extends Google_Auth_Abstract
       // No token, so nothing to do.
       return $request;
     }
+
+    $this->client->getLogger()->debug('App Identity authentication');
+
     // Add the OAuth2 header to the request
     $request->setRequestHeaders(
         array('Authorization' => 'Bearer ' . $this->token['access_token'])

lib/google/src/Google/Auth/AssertionCredentials.php

@@ -15,9 +15,7 @@
  * limitations under the License.
  */
 
-require_once "Google/Auth/OAuth2.php";
-require_once "Google/Signer/P12.php";
-require_once "Google/Utils.php";
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * Credentials object used for OAuth 2.0 Signed JWT assertion grants.

lib/google/src/Google/Auth/Exception.php

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-require_once "Google/Exception.php";
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 class Google_Auth_Exception extends Google_Exception
 {

lib/google/src/Google/Auth/LoginTicket.php

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-require_once "Google/Auth/Exception.php";
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * Class to hold information about an authenticated login.

lib/google/src/Google/Auth/OAuth2.php

@@ -15,14 +15,7 @@
  * limitations under the License.
  */
 
-require_once "Google/Auth/Abstract.php";
-require_once "Google/Auth/AssertionCredentials.php";
-require_once "Google/Auth/Exception.php";
-require_once "Google/Auth/LoginTicket.php";
-require_once "Google/Client.php";
-require_once "Google/Http/Request.php";
-require_once "Google/Utils.php";
-require_once "Google/Verifier/Pem.php";
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * Authentication class that deals with the OAuth 2 web-server authentication flow
@@ -119,12 +112,15 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
     } else {
       $decodedResponse = json_decode($response->getResponseBody(), true);
       if ($decodedResponse != null && $decodedResponse['error']) {
-        $decodedResponse = $decodedResponse['error'];
+        $errorText = $decodedResponse['error'];
+        if (isset($decodedResponse['error_description'])) {
+          $errorText .= ": " . $decodedResponse['error_description'];
+        }
       }
       throw new Google_Auth_Exception(
           sprintf(
               "Error fetching OAuth2 access token, message: '%s'",
-              $decodedResponse
+              $errorText
           ),
           $response->getResponseHttpCode()
       );
@@ -146,13 +142,18 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
         'client_id' => $this->client->getClassConfig($this, 'client_id'),
         'scope' => $scope,
         'access_type' => $this->client->getClassConfig($this, 'access_type'),
-        'approval_prompt' => $this->client->getClassConfig($this, 'approval_prompt'),
     );
 
-    $login_hint = $this->client->getClassConfig($this, 'login_hint');
-    if ($login_hint != '') {
-      $params['login_hint'] = $login_hint;
+    // Prefer prompt to approval prompt.
+    if ($this->client->getClassConfig($this, 'prompt')) {
+      $params = $this->maybeAddParam($params, 'prompt');
+    } else {
+      $params = $this->maybeAddParam($params, 'approval_prompt');
     }
+    $params = $this->maybeAddParam($params, 'login_hint');
+    $params = $this->maybeAddParam($params, 'hd');
+    $params = $this->maybeAddParam($params, 'openid.realm');
+    $params = $this->maybeAddParam($params, 'include_granted_scopes');
 
     // If the list of scopes contains plus.login, add request_visible_actions
     // to auth URL.
@@ -189,6 +190,15 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
     return json_encode($this->token);
   }
 
+  public function getRefreshToken()
+  {
+    if (array_key_exists('refresh_token', $this->token)) {
+      return $this->token['refresh_token'];
+    } else {
+      return null;
+    }
+  }
+
   public function setState($state)
   {
     $this->state = $state;
@@ -223,17 +233,21 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
       if ($this->assertionCredentials) {
         $this->refreshTokenWithAssertion();
       } else {
+        $this->client->getLogger()->debug('OAuth2 access token expired');
         if (! array_key_exists('refresh_token', $this->token)) {
-            throw new Google_Auth_Exception(
-                "The OAuth 2.0 access token has expired,"
-                ." and a refresh token is not available. Refresh tokens"
-                ." are not returned for responses that were auto-approved."
-            );
+          $error = "The OAuth 2.0 access token has expired,"
+                  ." and a refresh token is not available. Refresh tokens"
+                  ." are not returned for responses that were auto-approved.";
+
+          $this->client->getLogger()->error($error);
+          throw new Google_Auth_Exception($error);
         }
         $this->refreshToken($this->token['refresh_token']);
       }
     }
 
+    $this->client->getLogger()->debug('OAuth2 authentication');
+
     // Add the OAuth2 header to the request
     $request->setRequestHeaders(
         array('Authorization' => 'Bearer ' . $this->token['access_token'])
@@ -285,6 +299,7 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
       }
     }
 
+    $this->client->getLogger()->debug('OAuth2 access token expired');
     $this->refreshTokenRequest(
         array(
           'grant_type' => 'assertion',
@@ -304,6 +319,14 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
 
   private function refreshTokenRequest($params)
   {
+    if (isset($params['assertion'])) {
+      $this->client->getLogger()->info(
+          'OAuth2 access token refresh with Signed JWT assertion grants.'
+      );
+    } else {
+      $this->client->getLogger()->info('OAuth2 access token refresh');
+    }
+
     $http = new Google_Http_Request(
         self::OAUTH2_TOKEN_URI,
         'POST',
@@ -401,7 +424,9 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
 
   /**
    * Retrieve and cache a certificates file.
-   * @param $url location
+   *
+   * @param $url string location
+   * @throws Google_Auth_Exception
    * @return array certificates
    */
   public function retrieveCertsFromLocation($url)
@@ -464,12 +489,13 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
   /**
    * Verifies the id token, returns the verified token contents.
    *
-   * @param $jwt the token
+   * @param $jwt string the token
    * @param $certs array of certificates
-   * @param $required_audience the expected consumer of the token
+   * @param $required_audience string the expected consumer of the token
    * @param [$issuer] the expected issues, defaults to Google
    * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
-   * @return token information if valid, false if not
+   * @throws Google_Auth_Exception
+   * @return mixed token information if valid, false if not
    */
   public function verifySignedJwtWithCerts(
       $jwt,
@@ -592,4 +618,16 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
     // All good.
     return new Google_Auth_LoginTicket($envelope, $payload);
   }
+
+  /**
+   * Add a parameter to the auth params if not empty string.
+   */
+  private function maybeAddParam($params, $name)
+  {
+    $param = $this->client->getClassConfig($this, $name);
+    if ($param != '') {
+      $params[$name] = $param;
+    }
+    return $params;
+  }
 }

lib/google/src/Google/Auth/Simple.php

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-require_once "Google/Auth/Abstract.php";
-require_once "Google/Http/Request.php";
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * Simple API access implementation. Can either be used to make requests
@@ -55,6 +54,9 @@ class Google_Auth_Simple extends Google_Auth_Abstract
   {
     $key = $this->client->getClassConfig($this, 'developer_key');
     if ($key) {
+      $this->client->getLogger()->debug(
+          'Simple API Access developer key authentication'
+      );
       $request->setQueryParam('key', $key);
     }
     return $request;

lib/google/src/Google/Cache/Apc.php

@@ -14,9 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
-require_once "Google/Cache/Abstract.php";
-require_once "Google/Cache/Exception.php";
+
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * A persistent storage class based on the APC cache, which is not
@@ -28,11 +27,21 @@ require_once "Google/Cache/Exception.php";
  */
 class Google_Cache_Apc extends Google_Cache_Abstract
 {
+  /**
+   * @var Google_Client the current client
+   */
+  private $client;
+
   public function __construct(Google_Client $client)
   {
     if (! function_exists('apc_add') ) {
-      throw new Google_Cache_Exception("Apc functions not available");
+      $error = "Apc functions not available";
+
+      $client->getLogger()->error($error);
+      throw new Google_Cache_Exception($error);
     }
+
+    $this->client = $client;
   }
 
    /**
@@ -42,12 +51,26 @@ class Google_Cache_Apc extends Google_Cache_Abstract
   {
     $ret = apc_fetch($key);
     if ($ret === false) {
+      $this->client->getLogger()->debug(
+          'APC cache miss',
+          array('key' => $key)
+      );
       return false;
     }
     if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) {
+      $this->client->getLogger()->debug(
+          'APC cache miss (expired)',
+          array('key' => $key, 'var' => $ret)
+      );
       $this->delete($key);
       return false;
     }
+
+    $this->client->getLogger()->debug(
+        'APC cache hit',
+        array('key' => $key, 'var' => $ret)
+    );
+
     return $ret['data'];
   }
 
@@ -56,10 +79,21 @@ class Google_Cache_Apc extends Google_Cache_Abstract
    */
   public function set($key, $value)
   {
-    $rc = apc_store($key, array('time' => time(), 'data' => $value));
+    $var = array('time' => time(), 'data' => $value);
+    $rc = apc_store($key, $var);
+
     if ($rc == false) {
+      $this->client->getLogger()->error(
+          'APC cache set failed',
+          array('key' => $key, 'var' => $var)
+      );
       throw new Google_Cache_Exception("Couldn't store data");
     }
+
+    $this->client->getLogger()->debug(
+        'APC cache set',
+        array('key' => $key, 'var' => $var)
+    );
   }
 
   /**
@@ -68,6 +102,10 @@ class Google_Cache_Apc extends Google_Cache_Abstract
    */
   public function delete($key)
   {
+    $this->client->getLogger()->debug(
+        'APC cache delete',
+        array('key' => $key)
+    );
     apc_delete($key);
   }
 }

lib/google/src/Google/Cache/Exception.php

@@ -14,7 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-require_once "Google/Exception.php";
+
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 class Google_Cache_Exception extends Google_Exception
 {

lib/google/src/Google/Cache/File.php

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-require_once "Google/Cache/Abstract.php";
-require_once "Google/Cache/Exception.php";
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /*
  * This class implements a basic on disk storage. While that does
@@ -32,23 +31,37 @@ class Google_Cache_File extends Google_Cache_Abstract
   private $path;
   private $fh;
 
+  /**
+   * @var Google_Client the current client
+   */
+  private $client;
+
   public function __construct(Google_Client $client)
   {
-    $this->path = $client->getClassConfig($this, 'directory');
+    $this->client = $client;
+    $this->path = $this->client->getClassConfig($this, 'directory');
   }
-  
+
   public function get($key, $expiration = false)
   {
     $storageFile = $this->getCacheFile($key);
     $data = false;
-    
+
     if (!file_exists($storageFile)) {
+      $this->client->getLogger()->debug(
+          'File cache miss',
+          array('key' => $key, 'file' => $storageFile)
+      );
       return false;
     }
 
     if ($expiration) {
       $mtime = filemtime($storageFile);
       if ((time() - $mtime) >= $expiration) {
+        $this->client->getLogger()->debug(
+            'File cache miss (expired)',
+            array('key' => $key, 'file' => $storageFile)
+        );
         $this->delete($key);
         return false;
       }
@@ -60,6 +73,11 @@ class Google_Cache_File extends Google_Cache_Abstract
       $this->unlock($storageFile);
     }
 
+    $this->client->getLogger()->debug(
+        'File cache hit',
+        array('key' => $key, 'file' => $storageFile, 'var' => $data)
+    );
+
     return $data;
   }
 
@@ -72,6 +90,16 @@ class Google_Cache_File extends Google_Cache_Abstract
       $data = serialize($value);
       $result = fwrite($this->fh, $data);
       $this->unlock($storageFile);
+
+      $this->client->getLogger()->debug(
+          'File cache set',
+          array('key' => $key, 'file' => $storageFile, 'var' => $value)
+      );
+    } else {
+      $this->client->getLogger()->notice(
+          'File cache set failed',
+          array('key' => $key, 'file' => $storageFile)
+      );
     }
   }
 
@@ -79,10 +107,19 @@ class Google_Cache_File extends Google_Cache_Abstract
   {
     $file = $this->getCacheFile($key);
     if (file_exists($file) && !unlink($file)) {
+      $this->client->getLogger()->error(
+          'File cache delete failed',
+          array('key' => $key, 'file' => $file)
+      );
       throw new Google_Cache_Exception("Cache file could not be deleted");
     }
+
+    $this->client->getLogger()->debug(
+        'File cache delete',
+        array('key' => $key, 'file' => $file)
+    );
   }
-  
+
   private function getWriteableCacheFile($file)
   {
     return $this->getCacheFile($file, true);
@@ -92,7 +129,7 @@ class Google_Cache_File extends Google_Cache_Abstract
   {
     return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
   }
-  
+
   private function getCacheDir($file, $forWrite)
   {
     // use the first 2 characters of the hash as a directory prefix
@@ -101,26 +138,34 @@ class Google_Cache_File extends Google_Cache_Abstract
     $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
     if ($forWrite && ! is_dir($storageDir)) {
       if (! mkdir($storageDir, 0755, true)) {
+        $this->client->getLogger()->error(
+            'File cache creation failed',
+            array('dir' => $storageDir)
+        );
         throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
       }
     }
     return $storageDir;
   }
-  
+
   private function acquireReadLock($storageFile)
   {
     return $this->acquireLock(LOCK_SH, $storageFile);
   }
-  
+
   private function acquireWriteLock($storageFile)
   {
     $rc = $this->acquireLock(LOCK_EX, $storageFile);
     if (!$rc) {
+      $this->client->getLogger()->notice(
+          'File cache write lock failed',
+          array('file' => $storageFile)
+      );
       $this->delete($storageFile);
     }
     return $rc;
   }
-  
+
   private function acquireLock($type, $storageFile)
   {
     $mode = $type == LOCK_EX ? "w" : "r";
@@ -135,7 +180,7 @@ class Google_Cache_File extends Google_Cache_Abstract
     }
     return true;
   }
-  
+
   public function unlock($storageFile)
   {
     if ($this->fh) {

lib/google/src/Google/Cache/Memcache.php

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-require_once "Google/Cache/Abstract.php";
-require_once "Google/Cache/Exception.php";
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * A persistent storage class based on the memcache, which is not
@@ -35,11 +34,22 @@ class Google_Cache_Memcache extends Google_Cache_Abstract
   private $host;
   private $port;
 
+  /**
+   * @var Google_Client the current client
+   */
+  private $client;
+
   public function __construct(Google_Client $client)
   {
     if (!function_exists('memcache_connect') && !class_exists("Memcached")) {
-      throw new Google_Cache_Exception("Memcache functions not available");
+      $error = "Memcache functions not available";
+
+      $client->getLogger()->error($error);
+      throw new Google_Cache_Exception($error);
     }
+
+    $this->client = $client;
+
     if ($client->isAppEngine()) {
       // No credentials needed for GAE.
       $this->mc = new Memcached();
@@ -47,12 +57,15 @@ class Google_Cache_Memcache extends Google_Cache_Abstract
     } else {
       $this->host = $client->getClassConfig($this, 'host');
       $this->port = $client->getClassConfig($this, 'port');
-      if (empty($this->host) || empty($this->port)) {
-        throw new Google_Cache_Exception("You need to supply a valid memcache host and port");
+      if (empty($this->host) || (empty($this->port) && (string) $this->port != "0")) {
+        $error = "You need to supply a valid memcache host and port";
+
+        $client->getLogger()->error($error);
+        throw new Google_Cache_Exception($error);
       }
     }
   }
-  
+
   /**
    * @inheritDoc
    */
@@ -66,12 +79,26 @@ class Google_Cache_Memcache extends Google_Cache_Abstract
       $ret = memcache_get($this->connection, $key);
     }
     if ($ret === false) {
+      $this->client->getLogger()->debug(
+          'Memcache cache miss',
+          array('key' => $key)
+      );
       return false;
     }
     if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) {
+      $this->client->getLogger()->debug(
+          'Memcache cache miss (expired)',
+          array('key' => $key, 'var' => $ret)
+      );
       $this->delete($key);
       return false;
     }
+
+    $this->client->getLogger()->debug(
+        'Memcache cache hit',
+        array('key' => $key, 'var' => $ret)
+    );
+
     return $ret['data'];
   }
 
@@ -94,8 +121,18 @@ class Google_Cache_Memcache extends Google_Cache_Abstract
       $rc = memcache_set($this->connection, $key, $data, false);
     }
     if ($rc == false) {
+      $this->client->getLogger()->error(
+          'Memcache cache set failed',
+          array('key' => $key, 'var' => $data)
+      );
+
       throw new Google_Cache_Exception("Couldn't store data in cache");
     }
+
+    $this->client->getLogger()->debug(
+        'Memcache cache set',
+        array('key' => $key, 'var' => $data)
+    );
   }
 
   /**
@@ -110,11 +147,16 @@ class Google_Cache_Memcache extends Google_Cache_Abstract
     } else {
       memcache_delete($this->connection, $key, 0);
     }
+
+    $this->client->getLogger()->debug(
+        'Memcache cache delete',
+        array('key' => $key)
+    );
   }
 
   /**
-   * Lazy initialiser for memcache connection. Uses pconnect for to take 
-   * advantage of the persistence pool where possible. 
+   * Lazy initialiser for memcache connection. Uses pconnect for to take
+   * advantage of the persistence pool where possible.
    */
   private function connect()
   {
@@ -129,9 +171,12 @@ class Google_Cache_Memcache extends Google_Cache_Abstract
     } else {
       $this->connection = memcache_pconnect($this->host, $this->port);
     }
-    
+
     if (! $this->connection) {
-      throw new Google_Cache_Exception("Couldn't connect to memcache server");
+      $error = "Couldn't connect to memcache server";
+
+      $this->client->getLogger()->error($error);
+      throw new Google_Cache_Exception($error);
     }
   }
 }

lib/google/src/Google/Cache/Null.php

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-require_once "Google/Cache/Abstract.php";
-require_once "Google/Cache/Exception.php";
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * A blank storage class, for cases where caching is not

lib/google/src/Google/Client.php

@@ -15,17 +15,7 @@
  * limitations under the License.
  */
 
-require_once 'Google/Auth/AssertionCredentials.php';
-require_once 'Google/Cache/File.php';
-require_once 'Google/Cache/Memcache.php';
-require_once 'Google/Config.php';
-require_once 'Google/Collection.php';
-require_once 'Google/Exception.php';
-require_once 'Google/IO/Curl.php';
-require_once 'Google/IO/Stream.php';
-require_once 'Google/Model.php';
-require_once 'Google/Service.php';
-require_once 'Google/Service/Resource.php';
+require_once realpath(dirname(__FILE__) . '/../../autoload.php');
 
 /**
  * The Google API Client
@@ -36,7 +26,7 @@ require_once 'Google/Service/Resource.php';
  */
 class Google_Client
 {
-  const LIBVER = "1.0.5-beta";
+  const LIBVER = "1.1.2";
   const USER_AGENT_SUFFIX = "google-api-php-client/";
   /**
    * @var Google_Auth_Abstract $auth
@@ -58,6 +48,11 @@ class Google_Client
    */
   private $config;
 
+  /**
+   * @var Google_Logger_Abstract $logger
+   */
+  private $logger;
+
   /**
    * @var boolean $deferExecution
    */
@@ -97,7 +92,8 @@ class Google_Client
     }
 
     if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
-      if (function_exists('curl_version') && function_exists('curl_exec')) {
+      if (function_exists('curl_version') && function_exists('curl_exec')
+          && !$this->isAppEngine()) {
         $config->setIoClass("Google_IO_Curl");
       } else {
         $config->setIoClass("Google_IO_Stream");
@@ -136,6 +132,7 @@ class Google_Client
    * the "Download JSON" button on in the Google Developer
    * Console.
    * @param string $json the configuration json
+   * @throws Google_Exception
    */
   public function setAuthConfig($json)
   {
@@ -164,6 +161,7 @@ class Google_Client
   }
 
   /**
+   * @throws Google_Auth_Exception
    * @return array
    * @visible For Testing
    */
@@ -205,9 +203,9 @@ class Google_Client
 
   /**
    * Set the IO object
-   * @param Google_Io_Abstract $auth
+   * @param Google_IO_Abstract $io
    */
-  public function setIo(Google_Io_Abstract $io)
+  public function setIo(Google_IO_Abstract $io)
   {
     $this->config->setIoClass(get_class($io));
     $this->io = $io;
@@ -215,7 +213,7 @@ class Google_Client
 
   /**
    * Set the Cache object
-   * @param Google_Cache_Abstract $auth
+   * @param Google_Cache_Abstract $cache
    */
   public function setCache(Google_Cache_Abstract $cache)
   {
@@ -223,6 +221,16 @@ class Google_Client
     $this->cache = $cache;
   }
 
+  /**
+   * Set the Logger object
+   * @param Google_Logger_Abstract $logger
+   */
+  public function setLogger(Google_Logger_Abstract $logger)
+  {
+    $this->config->setLoggerClass(get_class($logger));
+    $this->logger = $logger;
+  }
+
   /**
    * Construct the OAuth 2.0 authorization request URI.
    * @return string
@@ -248,6 +256,15 @@ class Google_Client
     return (null == $token || 'null' == $token || '[]' == $token) ? null : $token;
   }
 
+  /**
+   * Get the OAuth 2.0 refresh token.
+   * @return string $refreshToken refresh token or null if not available
+   */
+  public function getRefreshToken()
+  {
+    return $this->getAuth()->getRefreshToken();
+  }
+
   /**
    * Returns if the access_token is expired.
    * @return bool Returns True if the access_token is expired.
@@ -358,14 +375,57 @@ class Google_Client
     $this->config->setDeveloperKey($developerKey);
   }
 
+  /**
+   * Set the hd (hosted domain) parameter streamlines the login process for
+   * Google Apps hosted accounts. By including the domain of the user, you
+   * restrict sign-in to accounts at that domain.
+   * @param $hd string - the domain to use.
+   */
+  public function setHostedDomain($hd)
+  {
+    $this->config->setHostedDomain($hd);
+  }
+
+  /**
+   * Set the prompt hint. Valid values are none, consent and select_account.
+   * If no value is specified and the user has not previously authorized
+   * access, then the user is shown a consent screen.
+   * @param $prompt string
+   */
+  public function setPrompt($prompt)
+  {
+    $this->config->setPrompt($prompt);
+  }
+
+  /**
+   * openid.realm is a parameter from the OpenID 2.0 protocol, not from OAuth
+   * 2.0. It is used in OpenID 2.0 requests to signify the URL-space for which
+   * an authentication request is valid.
+   * @param $realm string - the URL-space to use.
+   */
+  public function setOpenidRealm($realm)
+  {
+    $this->config->setOpenidRealm($realm);
+  }
+
+  /**
+   * If this is provided with the value true, and the authorization request is
+   * granted, the authorization will include any previous authorizations
+   * granted to this user/application combination for other scopes.
+   * @param $include boolean - the URL-space to use.
+   */
+  public function setIncludeGrantedScopes($include)
+  {
+    $this->config->setIncludeGrantedScopes($include);
+  }
+
   /**
    * Fetches a fresh OAuth 2.0 access token with the given refresh token.
    * @param string $refreshToken
-   * @return void
    */
   public function refreshToken($refreshToken)
   {
-    return $this->getAuth()->refreshToken($refreshToken);
+    $this->getAuth()->refreshToken($refreshToken);
   }
 
   /**
@@ -396,12 +456,12 @@ class Google_Client
   /**
    * Verify a JWT that was signed with your own certificates.
    *
-   * @param $jwt the token
-   * @param $certs array of certificates
-   * @param $required_audience the expected consumer of the token
-   * @param [$issuer] the expected issues, defaults to Google
+   * @param $id_token string The JWT token
+   * @param $cert_location array of certificates
+   * @param $audience string the expected consumer of the token
+   * @param $issuer string the expected issuer, defaults to Google
    * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
-   * @return token information if valid, false if not
+   * @return mixed token information if valid, false if not
    */
   public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
   {
@@ -411,8 +471,7 @@ class Google_Client
   }
 
   /**
-   * @param Google_Auth_AssertionCredentials $creds
-   * @return void
+   * @param $creds Google_Auth_AssertionCredentials
    */
   public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
   {
@@ -486,7 +545,9 @@ class Google_Client
   /**
    * Helper method to execute deferred HTTP requests.
    *
-   * @returns object of the type of the expected class or array.
+   * @param $request Google_Http_Request|Google_Http_Batch
+   * @throws Google_Exception
+   * @return object of the type of the expected class or array.
    */
   public function execute($request)
   {
@@ -553,10 +614,23 @@ class Google_Client
     return $this->cache;
   }
 
+  /**
+   * @return Google_Logger_Abstract Logger implementation
+   */
+  public function getLogger()
+  {
+    if (!isset($this->logger)) {
+      $class = $this->config->getLoggerClass();
+      $this->logger = new $class($this);
+    }
+    return $this->logger;
+  }
+
   /**
    * Retrieve custom configuration for a specific class.
    * @param $class string|object - class or instance of class to retrieve
    * @param $key string optional - key to retrieve
+   * @return array
    */
   public function getClassConfig($class, $key = null)
   {
@@ -570,9 +644,9 @@ class Google_Client
    * Set configuration specific to a given class.
    * $config->setClassConfig('Google_Cache_File',
    *   array('directory' => '/tmp/cache'));
-   * @param $class The class name for the configuration
+   * @param $class string|object - The class name for the configuration
    * @param $config string key or an array of configuration values
-   * @param $value optional - if $config is a key, the value
+   * @param $value string optional - if $config is a key, the value
    *
    */
   public function setClassConfig($class, $config, $value = null)
@@ -580,7 +654,7 @@ class Google_Client
     if (!is_string($class)) {
       $class = get_class($class);
     }
-    return $this->config->setClassConfig($class, $config, $value);
+    $this->config->setClassConfig($class, $config, $value);
 
   }
 

lib/google/src/Google/Collection.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once "Google/Model.php";
+require_once realpath(dirname(__FILE__) . '/../../autoload.php');
 
 /**
  * Extension to the regular Google_Model that automatically

lib/google/src/Google/Config.php

@@ -25,12 +25,12 @@ class Google_Config
   const GZIP_UPLOADS_ENABLED = true;
   const GZIP_UPLOADS_DISABLED = false;
   const USE_AUTO_IO_SELECTION = "auto";
-  private $configuration;
+  protected $configuration;
 
   /**
    * Create a new Google_Config. Can accept an ini file location with the
    * local configuration. For example:
-   *     application_name: "My App";
+   *     application_name="My App"
    *
    * @param [$ini_file_location] - optional - The location of the ini file to load
    */
@@ -44,6 +44,7 @@ class Google_Config
       'auth_class'    => 'Google_Auth_OAuth2',
       'io_class'      => self::USE_AUTO_IO_SELECTION,
       'cache_class'   => 'Google_Cache_File',
+      'logger_class'  => 'Google_Logger_Null',
 
       // Don't change these unless you're working against a special development
       // or testing environment.
@@ -54,6 +55,17 @@ class Google_Config
         'Google_IO_Abstract' => array(
           'request_timeout_seconds' => 100,
         ),
+        'Google_Logger_Abstract' => array(
+          'level' => 'debug',
+          'log_format' => "[%datetime%] %level%: %message% %context%\n",
+          'date_format' => 'd/M/Y:H:i:s O',
+          'allow_newlines' => true
+        ),
+        'Google_Logger_File' => array(
+          'file' => 'php://stdout',
+          'mode' => 0640,
+          'lock' => false,
+        ),
         'Google_Http_Request' => array(
           // Disable the use of gzip on calls if set to true. Defaults to false.
           'disable_gzip' => self::GZIP_ENABLED,
@@ -78,10 +90,14 @@ class Google_Config
           'developer_key' => '',
 
           // Other parameters.
-          'access_type' => 'online',
-          'approval_prompt' => 'auto',
+          'hd' => '',
+          'prompt' => '',
+          'openid.realm' => '',
+          'include_granted_scopes' => '',
           'login_hint' => '',
           'request_visible_actions' => '',
+          'access_type' => 'online',
+          'approval_prompt' => 'auto',
           'federated_signon_certs_url' =>
               'https://www.googleapis.com/oauth2/v1/certs',
         ),
@@ -90,16 +106,15 @@ class Google_Config
           'directory' => sys_get_temp_dir() . '/Google_Client'
         )
       ),
-
-      // Definition of service specific values like scopes, oauth token URLs,
-      // etc. Example:
-      'services' => array(
-      ),
     );
     if ($ini_file_location) {
       $ini = parse_ini_file($ini_file_location, true);
       if (is_array($ini) && count($ini)) {
-        $this->configuration = array_merge($this->configuration, $ini);
+        $merged_configuration = $ini + $this->configuration;
+        if (isset($ini['classes']) && isset($this->configuration['classes'])) {
+          $merged_configuration['classes'] = $ini['classes'] + $this->configuration['classes'];
+        }
+        $this->configuration = $merged_configuration;
       }
     }
   }
@@ -108,9 +123,9 @@ class Google_Config
    * Set configuration specific to a given class.
    * $config->setClassConfig('Google_Cache_File',
    *   array('directory' => '/tmp/cache'));
-   * @param $class The class name for the configuration
+   * @param $class string The class name for the configuration
    * @param $config string key or an array of configuration values
-   * @param $value optional - if $config is a key, the value
+   * @param $value string optional - if $config is a key, the value
    */
   public function setClassConfig($class, $config, $value = null)
   {
@@ -145,6 +160,15 @@ class Google_Config
     return $this->configuration['cache_class'];
   }
 
+  /**
+   * Return the configured logger class.
+   * @return string
+   */
+  public function getLoggerClass()
+  {
+    return $this->configuration['logger_class'];
+  }
+
   /**
    * Return the configured Auth class.
    * @return string
@@ -157,7 +181,7 @@ class Google_Config
   /**
    * Set the auth class.
    *
-   * @param $class the class name to set
+   * @param $class string the class name to set
    */
   public function setAuthClass($class)
   {
@@ -173,7 +197,7 @@ class Google_Config
   /**
    * Set the IO class.
    *
-   * @param $class the class name to set
+   * @param $class string the class name to set
    */
   public function setIoClass($class)
   {
@@ -189,7 +213,7 @@ class Google_Config
   /**
    * Set the cache class.
    *
-   * @param $class the class name to set
+   * @param $class string the class name to set
    */
   public function setCacheClass($class)
   {
@@ -202,8 +226,25 @@ class Google_Config
     $this->configuration['cache_class'] = $class;
   }
 
+  /**
+   * Set the logger class.
+   *
+   * @param $class string the class name to set
+   */
+  public function setLoggerClass($class)
+  {
+    $prev = $this->configuration['logger_class'];
+    if (!isset($this->configuration['classes'][$class]) &&
+        isset($this->configuration['classes'][$prev])) {
+      $this->configuration['classes'][$class] =
+          $this->configuration['classes'][$prev];
+    }
+    $this->configuration['logger_class'] = $class;
+  }
+
   /**
    * Return the configured IO class.
+   *
    * @return string
    */
   public function getIoClass()
@@ -230,7 +271,7 @@ class Google_Config
 
   /**
    * Set the client ID for the auth class.
-   * @param $key string - the API console client ID
+   * @param $clientId string - the API console client ID
    */
   public function setClientId($clientId)
   {
@@ -239,7 +280,7 @@ class Google_Config
 
   /**
    * Set the client secret for the auth class.
-   * @param $key string - the API console client secret
+   * @param $secret string - the API console client secret
    */
   public function setClientSecret($secret)
   {
@@ -249,7 +290,8 @@ class Google_Config
   /**
    * Set the redirect uri for the auth class. Note that if using the
    * Javascript based sign in flow, this should be the string 'postmessage'.
-   * @param $key string - the URI that users should be redirected to
+   *
+   * @param $uri string - the URI that users should be redirected to
    */
   public function setRedirectUri($uri)
   {
@@ -302,6 +344,53 @@ class Google_Config
     $this->setAuthConfig('developer_key', $key);
   }
 
+  /**
+   * Set the hd (hosted domain) parameter streamlines the login process for
+   * Google Apps hosted accounts. By including the domain of the user, you
+   * restrict sign-in to accounts at that domain.
+   * @param $hd string - the domain to use.
+   */
+  public function setHostedDomain($hd)
+  {
+    $this->setAuthConfig('hd', $hd);
+  }
+
+  /**
+   * Set the prompt hint. Valid values are none, consent and select_account.
+   * If no value is specified and the user has not previously authorized
+   * access, then the user is shown a consent screen.
+   * @param $prompt string
+   */
+  public function setPrompt($prompt)
+  {
+    $this->setAuthConfig('prompt', $prompt);
+  }
+
+  /**
+   * openid.realm is a parameter from the OpenID 2.0 protocol, not from OAuth
+   * 2.0. It is used in OpenID 2.0 requests to signify the URL-space for which
+   * an authentication request is valid.
+   * @param $realm string - the URL-space to use.
+   */
+  public function setOpenidRealm($realm)
+  {
+    $this->setAuthConfig('openid.realm', $realm);
+  }
+
+  /**
+   * If this is provided with the value true, and the authorization request is
+   * granted, the authorization will include any previous authorizations
+   * granted to this user/application combination for other scopes.
+   * @param $include boolean - the URL-space to use.
+   */
+  public function setIncludeGrantedScopes($include)
+  {
+    $this->setAuthConfig(
+        'include_granted_scopes',
+        $include ? "true" : "false"
+    );
+  }
+
   /**
    * @return string the base URL to use for API calls
    */

lib/google/src/Google/Http/Batch.php

@@ -15,9 +15,7 @@
  * limitations under the License.
  */
 
-require_once 'Google/Client.php';
-require_once 'Google/Http/Request.php';
-require_once 'Google/Http/REST.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * @author Chirag Shah <chirags@google.com>
@@ -125,10 +123,10 @@ class Google_Http_Batch
           }
 
           try {
-            $response = Google_Http_REST::decodeHttpResponse($response);
+            $response = Google_Http_REST::decodeHttpResponse($response, $this->client);
             $responses[$key] = $response;
           } catch (Google_Service_Exception $e) {
-            // Store the exception as the response, so succesful responses
+            // Store the exception as the response, so successful responses
             // can be processed.
             $responses[$key] = $e;
           }

lib/google/src/Google/Http/CacheParser.php

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-require_once 'Google/Http/Request.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * Implement the caching directives specified in rfc2616. This

lib/google/src/Google/Http/MediaFileUpload.php

@@ -15,11 +15,7 @@
  * limitations under the License.
  */
 
-require_once 'Google/Client.php';
-require_once 'Google/Exception.php';
-require_once 'Google/Http/Request.php';
-require_once 'Google/Http/REST.php';
-require_once 'Google/Utils.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * @author Chirag Shah <chirags@google.com>
@@ -182,7 +178,7 @@ class Google_Http_MediaFileUpload
       // No problems, but upload not complete.
       return false;
     } else {
-      return Google_Http_REST::decodeHttpResponse($response);
+      return Google_Http_REST::decodeHttpResponse($response, $this->client);
     }
   }
 
@@ -287,6 +283,18 @@ class Google_Http_MediaFileUpload
     if (200 == $code && true == $location) {
       return $location;
     }
-    throw new Google_Exception("Failed to start the resumable upload");
+    $message = $code;
+    $body = @json_decode($response->getResponseBody());
+    if (!empty( $body->error->errors ) ) {
+      $message .= ': ';
+      foreach ($body->error->errors as $error) {
+        $message .= "{$error->domain}, {$error->message};";
+      }
+      $message = rtrim($message, ';');
+    }
+
+    $error = "Failed to start the resumable upload (HTTP {$message})";
+    $this->client->getLogger()->error($error);
+    throw new Google_Exception($error);
   }
 }

lib/google/src/Google/Http/REST.php

@@ -15,10 +15,7 @@
  * limitations under the License.
  */
 
-require_once 'Google/Client.php';
-require_once 'Google/Http/Request.php';
-require_once 'Google/Service/Exception.php';
-require_once 'Google/Utils/URITemplate.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * This class implements the RESTful transport of apiServiceRequest()'s
@@ -41,7 +38,7 @@ class Google_Http_REST
   {
     $httpRequest = $client->getIo()->makeRequest($req);
     $httpRequest->setExpectedClass($req->getExpectedClass());
-    return self::decodeHttpResponse($httpRequest);
+    return self::decodeHttpResponse($httpRequest, $client);
   }
 
   /**
@@ -49,9 +46,10 @@ class Google_Http_REST
    * @static
    * @throws Google_Service_Exception
    * @param Google_Http_Request $response The http response to be decoded.
+   * @param Google_Client $client
    * @return mixed|null
    */
-  public static function decodeHttpResponse($response)
+  public static function decodeHttpResponse($response, Google_Client $client = null)
   {
     $code = $response->getResponseHttpCode();
     $body = $response->getResponseBody();
@@ -76,6 +74,12 @@ class Google_Http_REST
         $errors = $decoded['error']['errors'];
       }
 
+      if ($client) {
+        $client->getLogger()->error(
+            $err,
+            array('code' => $code, 'errors' => $errors)
+        );
+      }
       throw new Google_Service_Exception($err, $code, null, $errors);
     }
 
@@ -83,7 +87,11 @@ class Google_Http_REST
     if ($code != '204') {
       $decoded = json_decode($body, true);
       if ($decoded === null || $decoded === "") {
-        throw new Google_Service_Exception("Invalid json in service response: $body");
+        $error = "Invalid json in service response: $body";
+        if ($client) {
+          $client->getLogger()->error($error);
+        }
+        throw new Google_Service_Exception($error);
       }
 
       if ($response->getExpectedClass()) {

lib/google/src/Google/Http/Request.php

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-require_once 'Google/Utils.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * HTTP Request to be executed by IO classes. Upon execution, the

lib/google/src/Google/IO/Abstract.php

@@ -19,10 +19,7 @@
  * Abstract IO base class
  */
 
-require_once 'Google/Client.php';
-require_once 'Google/IO/Exception.php';
-require_once 'Google/Http/CacheParser.php';
-require_once 'Google/Http/Request.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 abstract class Google_IO_Abstract
 {
@@ -271,7 +268,10 @@ abstract class Google_IO_Abstract
       $responseBody = substr($respData, $headerSize);
       $responseHeaders = substr($respData, 0, $headerSize);
     } else {
-      list($responseHeaders, $responseBody) = explode("\r\n\r\n", $respData, 2);
+      $responseSegments = explode("\r\n\r\n", $respData, 2);
+      $responseHeaders = $responseSegments[0];
+      $responseBody = isset($responseSegments[1]) ? $responseSegments[1] :
+                                                    null;
     }
 
     $responseHeaders = $this->getHttpResponseHeaders($responseHeaders);

lib/google/src/Google/IO/Curl.php

@@ -21,7 +21,7 @@
  * @author Stuart Langley <slangley@google.com>
  */
 
-require_once 'Google/IO/Abstract.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 class Google_IO_Curl extends Google_IO_Abstract
 {
@@ -53,14 +53,15 @@ class Google_IO_Curl extends Google_IO_Abstract
       }
       curl_setopt($curl, CURLOPT_HTTPHEADER, $curlHeaders);
     }
-
     curl_setopt($curl, CURLOPT_URL, $request->getUrl());
-    
+
     curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $request->getRequestMethod());
     curl_setopt($curl, CURLOPT_USERAGENT, $request->getUserAgent());
 
     curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
     curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
+    // 1 is CURL_SSLVERSION_TLSv1, which is not always defined in PHP.
+    curl_setopt($curl, CURLOPT_SSLVERSION, 1);
     curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
     curl_setopt($curl, CURLOPT_HEADER, true);
 
@@ -76,16 +77,37 @@ class Google_IO_Curl extends Google_IO_Abstract
       curl_setopt($curl, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
     }
 
+    $this->client->getLogger()->debug(
+        'cURL request',
+        array(
+            'url' => $request->getUrl(),
+            'method' => $request->getRequestMethod(),
+            'headers' => $requestHeaders,
+            'body' => $request->getPostBody()
+        )
+    );
+
     $response = curl_exec($curl);
     if ($response === false) {
-      throw new Google_IO_Exception(curl_error($curl));
+      $error = curl_error($curl);
+
+      $this->client->getLogger()->error('cURL ' . $error);
+      throw new Google_IO_Exception($error);
     }
     $headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
 
     list($responseHeaders, $responseBody) = $this->parseHttpResponse($response, $headerSize);
-
     $responseCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
 
+    $this->client->getLogger()->debug(
+        'cURL response',
+        array(
+            'code' => $responseCode,
+            'headers' => $responseHeaders,
+            'body' => $responseBody,
+        )
+    );
+
     return array($responseBody, $responseHeaders, $responseCode);
   }
 

lib/google/src/Google/IO/Exception.php

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-require_once 'Google/Exception.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 class Google_IO_Exception extends Google_Exception
 {

lib/google/src/Google/IO/Stream.php

@@ -21,7 +21,7 @@
  * @author Stuart Langley <slangley@google.com>
  */
 
-require_once 'Google/IO/Abstract.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 class Google_IO_Stream extends Google_IO_Abstract
 {
@@ -97,6 +97,16 @@ class Google_IO_Stream extends Google_IO_Abstract
       $url = self::ZLIB . $url;
     }
 
+    $this->client->getLogger()->debug(
+        'Stream request',
+        array(
+            'url' => $url,
+            'method' => $request->getRequestMethod(),
+            'headers' => $requestHeaders,
+            'body' => $request->getPostBody()
+        )
+    );
+
     // We are trapping any thrown errors in this method only and
     // throwing an exception.
     $this->trappedErrorNumber = null;
@@ -109,13 +119,13 @@ class Google_IO_Stream extends Google_IO_Abstract
     // END - error trap.
 
     if ($this->trappedErrorNumber) {
-      throw new Google_IO_Exception(
-          sprintf(
-              "HTTP Error: Unable to connect: '%s'",
-              $this->trappedErrorString
-          ),
-          $this->trappedErrorNumber
+      $error = sprintf(
+          "HTTP Error: Unable to connect: '%s'",
+          $this->trappedErrorString
       );
+
+      $this->client->getLogger()->error('Stream ' . $error);
+      throw new Google_IO_Exception($error, $this->trappedErrorNumber);
     }
 
     $response_data = false;
@@ -132,17 +142,26 @@ class Google_IO_Stream extends Google_IO_Abstract
     }
 
     if (false === $response_data) {
-      throw new Google_IO_Exception(
-          sprintf(
-              "HTTP Error: Unable to connect: '%s'",
-              $respHttpCode
-          ),
+      $error = sprintf(
+          "HTTP Error: Unable to connect: '%s'",
           $respHttpCode
       );
+
+      $this->client->getLogger()->error('Stream ' . $error);
+      throw new Google_IO_Exception($error, $respHttpCode);
     }
 
     $responseHeaders = $this->getHttpResponseHeaders($http_response_header);
 
+    $this->client->getLogger()->debug(
+        'Stream response',
+        array(
+            'code' => $respHttpCode,
+            'headers' => $responseHeaders,
+            'body' => $response_data,
+        )
+    );
+
     return array($response_data, $responseHeaders, $respHttpCode);
   }
 

lib/google/src/Google/Logger/Abstract.php

@@ -0,0 +1,406 @@
+<?php
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+
+/**
+ * Abstract logging class based on the PSR-3 standard.
+ *
+ * NOTE: We don't implement `Psr\Log\LoggerInterface` because we need to
+ * maintain PHP 5.2 support.
+ *
+ * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md
+ */
+abstract class Google_Logger_Abstract
+{
+  /**
+   * Default log format
+   */
+  const DEFAULT_LOG_FORMAT = "[%datetime%] %level%: %message% %context%\n";
+  /**
+   * Default date format
+   *
+   * Example: 16/Nov/2014:03:26:16 -0500
+   */
+  const DEFAULT_DATE_FORMAT = 'd/M/Y:H:i:s O';
+
+  /**
+   * System is unusable
+   */
+  const EMERGENCY = 'emergency';
+  /**
+   * Action must be taken immediately
+   *
+   * Example: Entire website down, database unavailable, etc. This should
+   * trigger the SMS alerts and wake you up.
+   */
+  const ALERT = 'alert';
+  /**
+   * Critical conditions
+   *
+   * Example: Application component unavailable, unexpected exception.
+   */
+  const CRITICAL = 'critical';
+  /**
+   * Runtime errors that do not require immediate action but should typically
+   * be logged and monitored.
+   */
+  const ERROR = 'error';
+  /**
+   * Exceptional occurrences that are not errors.
+   *
+   * Example: Use of deprecated APIs, poor use of an API, undesirable things
+   * that are not necessarily wrong.
+   */
+  const WARNING = 'warning';
+  /**
+   * Normal but significant events.
+   */
+  const NOTICE = 'notice';
+  /**
+   * Interesting events.
+   *
+   * Example: User logs in, SQL logs.
+   */
+  const INFO = 'info';
+  /**
+   * Detailed debug information.
+   */
+  const DEBUG = 'debug';
+
+  /**
+   * @var array $levels Logging levels
+   */
+  protected static $levels = array(
+      self::EMERGENCY  => 600,
+      self::ALERT => 550,
+      self::CRITICAL => 500,
+      self::ERROR => 400,
+      self::WARNING => 300,
+      self::NOTICE => 250,
+      self::INFO => 200,
+      self::DEBUG => 100,
+  );
+
+  /**
+   * @var integer $level The minimum logging level
+   */
+  protected $level = self::DEBUG;
+
+  /**
+   * @var string $logFormat The current log format
+   */
+  protected $logFormat = self::DEFAULT_LOG_FORMAT;
+  /**
+   * @var string $dateFormat The current date format
+   */
+  protected $dateFormat = self::DEFAULT_DATE_FORMAT;
+
+  /**
+   * @var boolean $allowNewLines If newlines are allowed
+   */
+  protected $allowNewLines = false;
+
+  /**
+   * @param Google_Client $client  The current Google client
+   */
+  public function __construct(Google_Client $client)
+  {
+    $this->setLevel(
+        $client->getClassConfig('Google_Logger_Abstract', 'level')
+    );
+
+    $format = $client->getClassConfig('Google_Logger_Abstract', 'log_format');
+    $this->logFormat = $format ? $format : self::DEFAULT_LOG_FORMAT;
+
+    $format = $client->getClassConfig('Google_Logger_Abstract', 'date_format');
+    $this->dateFormat = $format ? $format : self::DEFAULT_DATE_FORMAT;
+
+    $this->allowNewLines = (bool) $client->getClassConfig(
+        'Google_Logger_Abstract',
+        'allow_newlines'
+    );
+  }
+
+  /**
+   * Sets the minimum logging level that this logger handles.
+   *
+   * @param integer $level
+   */
+  public function setLevel($level)
+  {
+    $this->level = $this->normalizeLevel($level);
+  }
+
+  /**
+   * Checks if the logger should handle messages at the provided level.
+   *
+   * @param  integer $level
+   * @return boolean
+   */
+  public function shouldHandle($level)
+  {
+    return $this->normalizeLevel($level) >= $this->level;
+  }
+
+  /**
+   * System is unusable.
+   *
+   * @param string $message The log message
+   * @param array $context  The log context
+   */
+  public function emergency($message, array $context = array())
+  {
+    $this->log(self::EMERGENCY, $message, $context);
+  }
+
+  /**
+   * Action must be taken immediately.
+   *
+   * Example: Entire website down, database unavailable, etc. This should
+   * trigger the SMS alerts and wake you up.
+   *
+   * @param string $message The log message
+   * @param array $context  The log context
+   */
+  public function alert($message, array $context = array())
+  {
+    $this->log(self::ALERT, $message, $context);
+  }
+
+  /**
+   * Critical conditions.
+   *
+   * Example: Application component unavailable, unexpected exception.
+   *
+   * @param string $message The log message
+   * @param array $context  The log context
+   */
+  public function critical($message, array $context = array())
+  {
+    $this->log(self::CRITICAL, $message, $context);
+  }
+
+  /**
+   * Runtime errors that do not require immediate action but should typically
+   * be logged and monitored.
+   *
+   * @param string $message The log message
+   * @param array $context  The log context
+   */
+  public function error($message, array $context = array())
+  {
+    $this->log(self::ERROR, $message, $context);
+  }
+
+  /**
+   * Exceptional occurrences that are not errors.
+   *
+   * Example: Use of deprecated APIs, poor use of an API, undesirable things
+   * that are not necessarily wrong.
+   *
+   * @param string $message The log message
+   * @param array $context  The log context
+   */
+  public function warning($message, array $context = array())
+  {
+    $this->log(self::WARNING, $message, $context);
+  }
+
+  /**
+   * Normal but significant events.
+   *
+   * @param string $message The log message
+   * @param array $context  The log context
+   */
+  public function notice($message, array $context = array())
+  {
+    $this->log(self::NOTICE, $message, $context);
+  }
+
+  /**
+   * Interesting events.
+   *
+   * Example: User logs in, SQL logs.
+   *
+   * @param string $message The log message
+   * @param array $context  The log context
+   */
+  public function info($message, array $context = array())
+  {
+    $this->log(self::INFO, $message, $context);
+  }
+
+  /**
+   * Detailed debug information.
+   *
+   * @param string $message The log message
+   * @param array $context  The log context
+   */
+  public function debug($message, array $context = array())
+  {
+    $this->log(self::DEBUG, $message, $context);
+  }
+
+  /**
+   * Logs with an arbitrary level.
+   *
+   * @param mixed $level    The log level
+   * @param string $message The log message
+   * @param array $context  The log context
+   */
+  public function log($level, $message, array $context = array())
+  {
+    if (!$this->shouldHandle($level)) {
+      return false;
+    }
+
+    $levelName = is_int($level) ? array_search($level, self::$levels) : $level;
+    $message = $this->interpolate(
+        array(
+            'message' => $message,
+            'context' => $context,
+            'level' => strtoupper($levelName),
+            'datetime' => new DateTime(),
+        )
+    );
+
+    $this->write($message);
+  }
+
+  /**
+   * Interpolates log variables into the defined log format.
+   *
+   * @param  array $variables The log variables.
+   * @return string
+   */
+  protected function interpolate(array $variables = array())
+  {
+    $template = $this->logFormat;
+
+    if (!$variables['context']) {
+      $template = str_replace('%context%', '', $template);
+      unset($variables['context']);
+    } else {
+      $this->reverseJsonInContext($variables['context']);
+    }
+
+    foreach ($variables as $key => $value) {
+      if (strpos($template, '%'. $key .'%') !== false) {
+        $template = str_replace(
+            '%' . $key . '%',
+            $this->export($value),
+            $template
+        );
+      }
+    }
+
+    return $template;
+  }
+
+  /**
+   * Reverses JSON encoded PHP arrays and objects so that they log better.
+   *
+   * @param array $context The log context
+   */
+  protected function reverseJsonInContext(array &$context)
+  {
+    if (!$context) {
+      return;
+    }
+
+    foreach ($context as $key => $val) {
+      if (!$val || !is_string($val) || !($val[0] == '{' || $val[0] == '[')) {
+        continue;
+      }
+
+      $json = @json_decode($val);
+      if (is_object($json) || is_array($json)) {
+        $context[$key] = $json;
+      }
+    }
+  }
+
+  /**
+   * Exports a PHP value for logging to a string.
+   *
+   * @param mixed $value The value to
+   */
+  protected function export($value)
+  {
+    if (is_string($value)) {
+      if ($this->allowNewLines) {
+        return $value;
+      }
+
+      return preg_replace('/[\r\n]+/', ' ', $value);
+    }
+
+    if (is_resource($value)) {
+      return sprintf(
+          'resource(%d) of type (%s)',
+          $value,
+          get_resource_type($value)
+      );
+    }
+
+    if ($value instanceof DateTime) {
+      return $value->format($this->dateFormat);
+    }
+
+    if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
+      $options = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE;
+
+      if ($this->allowNewLines) {
+        $options |= JSON_PRETTY_PRINT;
+      }
+
+      return @json_encode($value, $options);
+    }
+
+    return str_replace('\\/', '/', @json_encode($value));
+  }
+
+  /**
+   * Converts a given log level to the integer form.
+   *
+   * @param  mixed $level   The logging level
+   * @return integer $level The normalized level
+   * @throws Google_Logger_Exception If $level is invalid
+   */
+  protected function normalizeLevel($level)
+  {
+    if (is_int($level) && array_search($level, self::$levels) !== false) {
+      return $level;
+    }
+
+    if (is_string($level) && isset(self::$levels[$level])) {
+      return self::$levels[$level];
+    }
+
+    throw new Google_Logger_Exception(
+        sprintf("Unknown LogLevel: '%s'", $level)
+    );
+  }
+
+  /**
+   * Writes a message to the current log implementation.
+   *
+   * @param string $message The message
+   */
+  abstract protected function write($message);
+}

lib/google/src/Google/Logger/Exception.php

@@ -0,0 +1,22 @@
+<?php
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+
+class Google_Logger_Exception extends Google_Exception
+{
+}

lib/google/src/Google/Logger/File.php

@@ -0,0 +1,156 @@
+<?php
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+
+/**
+ * File logging class based on the PSR-3 standard.
+ *
+ * This logger writes to a PHP stream resource.
+ */
+class Google_Logger_File extends Google_Logger_Abstract
+{
+  /**
+   * @var string|resource $file Where logs are written
+   */
+  private $file;
+  /**
+   * @var integer $mode The mode to use if the log file needs to be created
+   */
+  private $mode = 0640;
+  /**
+   * @var boolean $lock If a lock should be attempted before writing to the log
+   */
+  private $lock = false;
+
+  /**
+   * @var integer $trappedErrorNumber Trapped error number
+   */
+  private $trappedErrorNumber;
+  /**
+   * @var string $trappedErrorString Trapped error string
+   */
+  private $trappedErrorString;
+
+  /**
+   * {@inheritdoc}
+   */
+  public function __construct(Google_Client $client)
+  {
+    parent::__construct($client);
+
+    $file = $client->getClassConfig('Google_Logger_File', 'file');
+    if (!is_string($file) && !is_resource($file)) {
+      throw new Google_Logger_Exception(
+          'File logger requires a filename or a valid file pointer'
+      );
+    }
+
+    $mode = $client->getClassConfig('Google_Logger_File', 'mode');
+    if (!$mode) {
+      $this->mode = $mode;
+    }
+
+    $this->lock = (bool) $client->getClassConfig('Google_Logger_File', 'lock');
+    $this->file = $file;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function write($message)
+  {
+    if (is_string($this->file)) {
+      $this->open();
+    } elseif (!is_resource($this->file)) {
+      throw new Google_Logger_Exception('File pointer is no longer available');
+    }
+
+    if ($this->lock) {
+      flock($this->file, LOCK_EX);
+    }
+
+    fwrite($this->file, (string) $message);
+
+    if ($this->lock) {
+      flock($this->file, LOCK_UN);
+    }
+  }
+
+  /**
+   * Opens the log for writing.
+   *
+   * @return resource
+   */
+  private function open()
+  {
+    // Used for trapping `fopen()` errors.
+    $this->trappedErrorNumber = null;
+    $this->trappedErrorString = null;
+
+    $old = set_error_handler(array($this, 'trapError'));
+
+    $needsChmod = !file_exists($this->file);
+    $fh = fopen($this->file, 'a');
+
+    restore_error_handler();
+
+    // Handles trapped `fopen()` errors.
+    if ($this->trappedErrorNumber) {
+      throw new Google_Logger_Exception(
+          sprintf(
+              "Logger Error: '%s'",
+              $this->trappedErrorString
+          ),
+          $this->trappedErrorNumber
+      );
+    }
+
+    if ($needsChmod) {
+      @chmod($this->file, $this->mode & ~umask());
+    }
+
+    return $this->file = $fh;
+  }
+
+  /**
+   * Closes the log stream resource.
+   */
+  private function close()
+  {
+    if (is_resource($this->file)) {
+      fclose($this->file);
+    }
+  }
+
+  /**
+   * Traps `fopen()` errors.
+   *
+   * @param integer $errno The error number
+   * @param string $errstr The error string
+   */
+  private function trapError($errno, $errstr)
+  {
+    $this->trappedErrorNumber = $errno;
+    $this->trappedErrorString = $errstr;
+  }
+
+  public function __destruct()
+  {
+    $this->close();
+  }
+}

lib/google/src/Google/Logger/Null.php

@@ -0,0 +1,41 @@
+<?php
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+
+/**
+ * Null logger based on the PSR-3 standard.
+ *
+ * This logger simply discards all messages.
+ */
+class Google_Logger_Null extends Google_Logger_Abstract
+{
+  /**
+   * {@inheritdoc}
+   */
+  public function shouldHandle($level)
+  {
+    return false;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function write($message, array $context = array())
+  {
+  }
+}

lib/google/src/Google/Logger/Psr.php

@@ -0,0 +1,91 @@
+<?php
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
+
+/**
+ * Psr logging class based on the PSR-3 standard.
+ *
+ * This logger will delegate all logging to a PSR-3 compatible logger specified
+ * with the `Google_Logger_Psr::setLogger()` method.
+ */
+class Google_Logger_Psr extends Google_Logger_Abstract
+{
+  /**
+   * @param Psr\Log\LoggerInterface $logger The PSR-3 logger
+   */
+  private $logger;
+
+  /**
+   * @param Google_Client $client           The current Google client
+   * @param Psr\Log\LoggerInterface $logger PSR-3 logger where logging will be delegated.
+   */
+  public function __construct(Google_Client $client, /*Psr\Log\LoggerInterface*/ $logger = null)
+  {
+    parent::__construct($client);
+
+    if ($logger) {
+      $this->setLogger($logger);
+    }
+  }
+
+  /**
+   * Sets the PSR-3 logger where logging will be delegated.
+   *
+   * NOTE: The `$logger` should technically implement
+   * `Psr\Log\LoggerInterface`, but we don't explicitly require this so that
+   * we can be compatible with PHP 5.2.
+   *
+   * @param Psr\Log\LoggerInterface $logger The PSR-3 logger
+   */
+  public function setLogger(/*Psr\Log\LoggerInterface*/ $logger)
+  {
+    $this->logger = $logger;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function shouldHandle($level)
+  {
+    return isset($this->logger) && parent::shouldHandle($level);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function log($level, $message, array $context = array())
+  {
+    if (!$this->shouldHandle($level)) {
+      return false;
+    }
+
+    if ($context) {
+      $this->reverseJsonInContext($context);
+    }
+
+    $levelName = is_int($level) ? array_search($level, self::$levels) : $level;
+    $this->logger->log($levelName, $message, $context);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function write($message, array $context = array())
+  {
+  }
+}

lib/google/src/Google/Model.php

@@ -25,6 +25,7 @@
  */
 class Google_Model implements ArrayAccess
 {
+  protected $internal_gapi_mappings = array();
   protected $modelData = array();
   protected $processed = array();
 
@@ -32,15 +33,21 @@ class Google_Model implements ArrayAccess
    * Polymorphic - accepts a variable number of arguments dependent
    * on the type of the model subclass.
    */
-  public function __construct()
+  final public function __construct()
   {
     if (func_num_args() == 1 && is_array(func_get_arg(0))) {
       // Initialize the model with the array's contents.
       $array = func_get_arg(0);
       $this->mapTypes($array);
     }
+    $this->gapiInit();
   }
 
+  /**
+   * Getter that handles passthrough access to the data array, and lazy object creation.
+   * @param string $key Property name.
+   * @return mixed The value if any, or null.
+   */
   public function __get($key)
   {
     $keyTypeName = $this->keyType($key);
@@ -75,7 +82,7 @@ class Google_Model implements ArrayAccess
       $this->processed[$key] = true;
     }
 
-    return $this->modelData[$key];
+    return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
   }
 
   /**
@@ -101,6 +108,16 @@ class Google_Model implements ArrayAccess
     $this->modelData = $array;
   }
 
+  /**
+   * Blank initialiser to be used in subclasses to do  post-construction initialisation - this
+   * avoids the need for subclasses to have to implement the variadics handling in their
+   * constructors.
+   */
+  protected function gapiInit()
+  {
+    return;
+  }
+
   /**
    * Create a simplified object suitable for straightforward
    * conversion to JSON. This is relatively expensive
@@ -126,6 +143,7 @@ class Google_Model implements ArrayAccess
       $name = $member->getName();
       $result = $this->getSimpleValue($this->$name);
       if ($result !== null) {
+        $name = $this->getMappedName($name);
         $object->$name = $result;
       }
     }
@@ -146,6 +164,7 @@ class Google_Model implements ArrayAccess
       foreach ($value as $key => $a_value) {
         $a_value = $this->getSimpleValue($a_value);
         if ($a_value !== null) {
+          $key = $this->getMappedName($key);
           $return[$key] = $a_value;
         }
       }
@@ -154,6 +173,18 @@ class Google_Model implements ArrayAccess
     return $value;
   }
 
+  /**
+   * If there is an internal name mapping, use that.
+   */
+  private function getMappedName($key)
+  {
+    if (isset($this->internal_gapi_mappings) &&
+        isset($this->internal_gapi_mappings[$key])) {
+      $key = $this->internal_gapi_mappings[$key];
+    }
+    return $key;
+  }
+
   /**
    * Returns true only if the array is associative.
    * @param array $array

lib/google/src/Google/Service/Admin.php

@@ -19,8 +19,7 @@
  * Service definition for Admin (email_migration_v2).
  *
  * <p>
- * Email Migration API lets you migrate emails of users to Google backends.
- * </p>
+ * Email Migration API lets you migrate emails of users to Google backends.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -32,7 +31,8 @@
 class Google_Service_Admin extends Google_Service
 {
   /** Manage email messages of users on your domain. */
-  const EMAIL_MIGRATION = "https://www.googleapis.com/auth/email.migration";
+  const EMAIL_MIGRATION =
+      "https://www.googleapis.com/auth/email.migration";
 
   public $mail;
   
@@ -87,8 +87,7 @@ class Google_Service_Admin_Mail_Resource extends Google_Service_Resource
   /**
    * Insert Mail into Google's Gmail backends (mail.insert)
    *
-   * @param string $userKey
-   * The email or immutable id of the user
+   * @param string $userKey The email or immutable id of the user
    * @param Google_MailItem $postBody
    * @param array $optParams Optional parameters.
    */
@@ -106,6 +105,8 @@ class Google_Service_Admin_Mail_Resource extends Google_Service_Resource
 class Google_Service_Admin_MailItem extends Google_Collection
 {
   protected $collection_key = 'labels';
+  protected $internal_gapi_mappings = array(
+  );
   public $isDeleted;
   public $isDraft;
   public $isInbox;
@@ -116,91 +117,75 @@ class Google_Service_Admin_MailItem extends Google_Collection
   public $kind;
   public $labels;
 
+
   public function setIsDeleted($isDeleted)
   {
     $this->isDeleted = $isDeleted;
   }
-
   public function getIsDeleted()
   {
     return $this->isDeleted;
   }
-
   public function setIsDraft($isDraft)
   {
     $this->isDraft = $isDraft;
   }
-
   public function getIsDraft()
   {
     return $this->isDraft;
   }
-
   public function setIsInbox($isInbox)
   {
     $this->isInbox = $isInbox;
   }
-
   public function getIsInbox()
   {
     return $this->isInbox;
   }
-
   public function setIsSent($isSent)
   {
     $this->isSent = $isSent;
   }
-
   public function getIsSent()
   {
     return $this->isSent;
   }
-
   public function setIsStarred($isStarred)
   {
     $this->isStarred = $isStarred;
   }
-
   public function getIsStarred()
   {
     return $this->isStarred;
   }
-
   public function setIsTrash($isTrash)
   {
     $this->isTrash = $isTrash;
   }
-
   public function getIsTrash()
   {
     return $this->isTrash;
   }
-
   public function setIsUnread($isUnread)
   {
     $this->isUnread = $isUnread;
   }
-
   public function getIsUnread()
   {
     return $this->isUnread;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setLabels($labels)
   {
     $this->labels = $labels;
   }
-
   public function getLabels()
   {
     return $this->labels;

lib/google/src/Google/Service/AppState.php

@@ -19,8 +19,7 @@
  * Service definition for AppState (v1).
  *
  * <p>
- * The Google App State API.
- * </p>
+ * The Google App State API.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -32,7 +31,8 @@
 class Google_Service_AppState extends Google_Service
 {
   /** View and manage your data for this application. */
-  const APPSTATE = "https://www.googleapis.com/auth/appstate";
+  const APPSTATE =
+      "https://www.googleapis.com/auth/appstate";
 
   public $states;
   
@@ -136,12 +136,11 @@ class Google_Service_AppState_States_Resource extends Google_Service_Resource
    * version matches the currently stored version. This method results in a
    * conflict error on version mismatch. (states.clear)
    *
-   * @param int $stateKey
-   * The key for the data to be retrieved.
+   * @param int $stateKey The key for the data to be retrieved.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string currentDataVersion
-   * The version of the data to be cleared. Version strings are returned by the server.
+   * @opt_param string currentDataVersion The version of the data to be cleared.
+   * Version strings are returned by the server.
    * @return Google_Service_AppState_WriteResult
    */
   public function clear($stateKey, $optParams = array())
@@ -150,6 +149,7 @@ class Google_Service_AppState_States_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('clear', array($params), "Google_Service_AppState_WriteResult");
   }
+
   /**
    * Deletes a key and the data associated with it. The key is removed and no
    * longer counts against the key quota. Note that since this method is not safe
@@ -157,8 +157,7 @@ class Google_Service_AppState_States_Resource extends Google_Service_Resource
    * development and testing purposes. Invoking this method in shipping code can
    * result in data loss and data corruption. (states.delete)
    *
-   * @param int $stateKey
-   * The key for the data to be retrieved.
+   * @param int $stateKey The key for the data to be retrieved.
    * @param array $optParams Optional parameters.
    */
   public function delete($stateKey, $optParams = array())
@@ -167,12 +166,12 @@ class Google_Service_AppState_States_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('delete', array($params));
   }
+
   /**
    * Retrieves the data corresponding to the passed key. If the key does not exist
    * on the server, an HTTP 404 will be returned. (states.get)
    *
-   * @param int $stateKey
-   * The key for the data to be retrieved.
+   * @param int $stateKey The key for the data to be retrieved.
    * @param array $optParams Optional parameters.
    * @return Google_Service_AppState_GetResponse
    */
@@ -182,13 +181,14 @@ class Google_Service_AppState_States_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_AppState_GetResponse");
   }
+
   /**
    * Lists all the states keys, and optionally the state data. (states.listStates)
    *
    * @param array $optParams Optional parameters.
    *
-   * @opt_param bool includeData
-   * Whether to include the full data in addition to the version number
+   * @opt_param bool includeData Whether to include the full data in addition to
+   * the version number
    * @return Google_Service_AppState_ListResponse
    */
   public function listStates($optParams = array())
@@ -197,20 +197,21 @@ class Google_Service_AppState_States_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('list', array($params), "Google_Service_AppState_ListResponse");
   }
+
   /**
    * Update the data associated with the input key if and only if the passed
    * version matches the currently stored version. This method is safe in the face
    * of concurrent writes. Maximum per-key size is 128KB. (states.update)
    *
-   * @param int $stateKey
-   * The key for the data to be retrieved.
+   * @param int $stateKey The key for the data to be retrieved.
    * @param Google_UpdateRequest $postBody
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string currentStateVersion
-   * The version of the app state your application is attempting to update. If this does not match
-    * the current version, this method will return a conflict error. If there is no data stored on the
-    * server for this key, the update will succeed irrespective of the value of this parameter.
+   * @opt_param string currentStateVersion The version of the app state your
+   * application is attempting to update. If this does not match the current
+   * version, this method will return a conflict error. If there is no data stored
+   * on the server for this key, the update will succeed irrespective of the value
+   * of this parameter.
    * @return Google_Service_AppState_WriteResult
    */
   public function update($stateKey, Google_Service_AppState_UpdateRequest $postBody, $optParams = array())
@@ -226,46 +227,42 @@ class Google_Service_AppState_States_Resource extends Google_Service_Resource
 
 class Google_Service_AppState_GetResponse extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $currentStateVersion;
   public $data;
   public $kind;
   public $stateKey;
 
+
   public function setCurrentStateVersion($currentStateVersion)
   {
     $this->currentStateVersion = $currentStateVersion;
   }
-
   public function getCurrentStateVersion()
   {
     return $this->currentStateVersion;
   }
-
   public function setData($data)
   {
     $this->data = $data;
   }
-
   public function getData()
   {
     return $this->data;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setStateKey($stateKey)
   {
     $this->stateKey = $stateKey;
   }
-
   public function getStateKey()
   {
     return $this->stateKey;
@@ -275,36 +272,34 @@ class Google_Service_AppState_GetResponse extends Google_Model
 class Google_Service_AppState_ListResponse extends Google_Collection
 {
   protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   protected $itemsType = 'Google_Service_AppState_GetResponse';
   protected $itemsDataType = 'array';
   public $kind;
   public $maximumKeyCount;
 
+
   public function setItems($items)
   {
     $this->items = $items;
   }
-
   public function getItems()
   {
     return $this->items;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setMaximumKeyCount($maximumKeyCount)
   {
     $this->maximumKeyCount = $maximumKeyCount;
   }
-
   public function getMaximumKeyCount()
   {
     return $this->maximumKeyCount;
@@ -313,24 +308,24 @@ class Google_Service_AppState_ListResponse extends Google_Collection
 
 class Google_Service_AppState_UpdateRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $data;
   public $kind;
 
+
   public function setData($data)
   {
     $this->data = $data;
   }
-
   public function getData()
   {
     return $this->data;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
@@ -339,35 +334,33 @@ class Google_Service_AppState_UpdateRequest extends Google_Model
 
 class Google_Service_AppState_WriteResult extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $currentStateVersion;
   public $kind;
   public $stateKey;
 
+
   public function setCurrentStateVersion($currentStateVersion)
   {
     $this->currentStateVersion = $currentStateVersion;
   }
-
   public function getCurrentStateVersion()
   {
     return $this->currentStateVersion;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setStateKey($stateKey)
   {
     $this->stateKey = $stateKey;
   }
-
   public function getStateKey()
   {
     return $this->stateKey;

lib/google/src/Google/Service/Appsactivity.php

@@ -19,8 +19,7 @@
  * Service definition for Appsactivity (v1).
  *
  * <p>
- * Provides a historical view of activity.
- * </p>
+ * Provides a historical view of activity.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -31,14 +30,18 @@
  */
 class Google_Service_Appsactivity extends Google_Service
 {
-  /** View historical activity for Google services. */
-  const ACTIVITY = "https://www.googleapis.com/auth/activity";
+  /** View the activity history of your Google Apps. */
+  const ACTIVITY =
+      "https://www.googleapis.com/auth/activity";
   /** View and manage the files and documents in your Google Drive. */
-  const DRIVE = "https://www.googleapis.com/auth/drive";
+  const DRIVE =
+      "https://www.googleapis.com/auth/drive";
   /** View metadata for files and documents in your Google Drive. */
-  const DRIVE_METADATA_READONLY = "https://www.googleapis.com/auth/drive.metadata.readonly";
+  const DRIVE_METADATA_READONLY =
+      "https://www.googleapis.com/auth/drive.metadata.readonly";
   /** View the files and documents in your Google Drive. */
-  const DRIVE_READONLY = "https://www.googleapis.com/auth/drive.readonly";
+  const DRIVE_READONLY =
+      "https://www.googleapis.com/auth/drive.readonly";
 
   public $activities;
   
@@ -123,25 +126,19 @@ class Google_Service_Appsactivity_Activities_Resource extends Google_Service_Res
    *
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string drive.ancestorId
-   * Identifies the Drive folder containing the items for which to return activities.
-   * @opt_param int pageSize
-   * The maximum number of events to return on a page. The response includes a continuation token if
-    * there are more events.
-   * @opt_param string pageToken
-   * A token to retrieve a specific page of results.
-   * @opt_param string userId
-   * Indicates the user to return activity for. Use the special value me to indicate the currently
-    * authenticated user.
-   * @opt_param string groupingStrategy
-   * Indicates the strategy to use when grouping singleEvents items in the associated combinedEvent
-    * object.
-   * @opt_param string drive.fileId
-   * Identifies the Drive item to return activities for.
-   * @opt_param string source
-   * The Google service from which to return activities. Possible values of source are:
-  -
-    * drive.google.com
+   * @opt_param string drive.ancestorId Identifies the Drive folder containing the
+   * items for which to return activities.
+   * @opt_param int pageSize The maximum number of events to return on a page. The
+   * response includes a continuation token if there are more events.
+   * @opt_param string pageToken A token to retrieve a specific page of results.
+   * @opt_param string userId Indicates the user to return activity for. Use the
+   * special value me to indicate the currently authenticated user.
+   * @opt_param string groupingStrategy Indicates the strategy to use when
+   * grouping singleEvents items in the associated combinedEvent object.
+   * @opt_param string drive.fileId Identifies the Drive item to return activities
+   * for.
+   * @opt_param string source The Google service from which to return activities.
+   * Possible values of source are: - drive.google.com
    * @return Google_Service_Appsactivity_ListActivitiesResponse
    */
   public function listActivities($optParams = array())
@@ -158,26 +155,26 @@ class Google_Service_Appsactivity_Activities_Resource extends Google_Service_Res
 class Google_Service_Appsactivity_Activity extends Google_Collection
 {
   protected $collection_key = 'singleEvents';
+  protected $internal_gapi_mappings = array(
+  );
   protected $combinedEventType = 'Google_Service_Appsactivity_Event';
   protected $combinedEventDataType = '';
   protected $singleEventsType = 'Google_Service_Appsactivity_Event';
   protected $singleEventsDataType = 'array';
 
+
   public function setCombinedEvent(Google_Service_Appsactivity_Event $combinedEvent)
   {
     $this->combinedEvent = $combinedEvent;
   }
-
   public function getCombinedEvent()
   {
     return $this->combinedEvent;
   }
-
   public function setSingleEvents($singleEvents)
   {
     $this->singleEvents = $singleEvents;
   }
-
   public function getSingleEvents()
   {
     return $this->singleEvents;
@@ -187,6 +184,8 @@ class Google_Service_Appsactivity_Activity extends Google_Collection
 class Google_Service_Appsactivity_Event extends Google_Collection
 {
   protected $collection_key = 'permissionChanges';
+  protected $internal_gapi_mappings = array(
+  );
   public $additionalEventTypes;
   public $eventTimeMillis;
   public $fromUserDeletion;
@@ -202,91 +201,75 @@ class Google_Service_Appsactivity_Event extends Google_Collection
   protected $userType = 'Google_Service_Appsactivity_User';
   protected $userDataType = '';
 
+
   public function setAdditionalEventTypes($additionalEventTypes)
   {
     $this->additionalEventTypes = $additionalEventTypes;
   }
-
   public function getAdditionalEventTypes()
   {
     return $this->additionalEventTypes;
   }
-
   public function setEventTimeMillis($eventTimeMillis)
   {
     $this->eventTimeMillis = $eventTimeMillis;
   }
-
   public function getEventTimeMillis()
   {
     return $this->eventTimeMillis;
   }
-
   public function setFromUserDeletion($fromUserDeletion)
   {
     $this->fromUserDeletion = $fromUserDeletion;
   }
-
   public function getFromUserDeletion()
   {
     return $this->fromUserDeletion;
   }
-
   public function setMove(Google_Service_Appsactivity_Move $move)
   {
     $this->move = $move;
   }
-
   public function getMove()
   {
     return $this->move;
   }
-
   public function setPermissionChanges($permissionChanges)
   {
     $this->permissionChanges = $permissionChanges;
   }
-
   public function getPermissionChanges()
   {
     return $this->permissionChanges;
   }
-
   public function setPrimaryEventType($primaryEventType)
   {
     $this->primaryEventType = $primaryEventType;
   }
-
   public function getPrimaryEventType()
   {
     return $this->primaryEventType;
   }
-
   public function setRename(Google_Service_Appsactivity_Rename $rename)
   {
     $this->rename = $rename;
   }
-
   public function getRename()
   {
     return $this->rename;
   }
-
   public function setTarget(Google_Service_Appsactivity_Target $target)
   {
     $this->target = $target;
   }
-
   public function getTarget()
   {
     return $this->target;
   }
-
   public function setUser(Google_Service_Appsactivity_User $user)
   {
     $this->user = $user;
   }
-
   public function getUser()
   {
     return $this->user;
@@ -296,25 +279,25 @@ class Google_Service_Appsactivity_Event extends Google_Collection
 class Google_Service_Appsactivity_ListActivitiesResponse extends Google_Collection
 {
   protected $collection_key = 'activities';
+  protected $internal_gapi_mappings = array(
+  );
   protected $activitiesType = 'Google_Service_Appsactivity_Activity';
   protected $activitiesDataType = 'array';
   public $nextPageToken;
 
+
   public function setActivities($activities)
   {
     $this->activities = $activities;
   }
-
   public function getActivities()
   {
     return $this->activities;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
@@ -324,26 +307,26 @@ class Google_Service_Appsactivity_ListActivitiesResponse extends Google_Collecti
 class Google_Service_Appsactivity_Move extends Google_Collection
 {
   protected $collection_key = 'removedParents';
+  protected $internal_gapi_mappings = array(
+  );
   protected $addedParentsType = 'Google_Service_Appsactivity_Parent';
   protected $addedParentsDataType = 'array';
   protected $removedParentsType = 'Google_Service_Appsactivity_Parent';
   protected $removedParentsDataType = 'array';
 
+
   public function setAddedParents($addedParents)
   {
     $this->addedParents = $addedParents;
   }
-
   public function getAddedParents()
   {
     return $this->addedParents;
   }
-
   public function setRemovedParents($removedParents)
   {
     $this->removedParents = $removedParents;
   }
-
   public function getRemovedParents()
   {
     return $this->removedParents;
@@ -352,35 +335,33 @@ class Google_Service_Appsactivity_Move extends Google_Collection
 
 class Google_Service_Appsactivity_Parent extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $id;
   public $isRoot;
   public $title;
 
+
   public function setId($id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setIsRoot($isRoot)
   {
     $this->isRoot = $isRoot;
   }
-
   public function getIsRoot()
   {
     return $this->isRoot;
   }
-
   public function setTitle($title)
   {
     $this->title = $title;
   }
-
   public function getTitle()
   {
     return $this->title;
@@ -389,6 +370,8 @@ class Google_Service_Appsactivity_Parent extends Google_Model
 
 class Google_Service_Appsactivity_Permission extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $name;
   public $permissionId;
   public $role;
@@ -397,61 +380,51 @@ class Google_Service_Appsactivity_Permission extends Google_Model
   protected $userDataType = '';
   public $withLink;
 
+
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setPermissionId($permissionId)
   {
     $this->permissionId = $permissionId;
   }
-
   public function getPermissionId()
   {
     return $this->permissionId;
   }
-
   public function setRole($role)
   {
     $this->role = $role;
   }
-
   public function getRole()
   {
     return $this->role;
   }
-
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
   }
-
   public function setUser(Google_Service_Appsactivity_User $user)
   {
     $this->user = $user;
   }
-
   public function getUser()
   {
     return $this->user;
   }
-
   public function setWithLink($withLink)
   {
     $this->withLink = $withLink;
   }
-
   public function getWithLink()
   {
     return $this->withLink;
@@ -461,26 +434,26 @@ class Google_Service_Appsactivity_Permission extends Google_Model
 class Google_Service_Appsactivity_PermissionChange extends Google_Collection
 {
   protected $collection_key = 'removedPermissions';
+  protected $internal_gapi_mappings = array(
+  );
   protected $addedPermissionsType = 'Google_Service_Appsactivity_Permission';
   protected $addedPermissionsDataType = 'array';
   protected $removedPermissionsType = 'Google_Service_Appsactivity_Permission';
   protected $removedPermissionsDataType = 'array';
 
+
   public function setAddedPermissions($addedPermissions)
   {
     $this->addedPermissions = $addedPermissions;
   }
-
   public function getAddedPermissions()
   {
     return $this->addedPermissions;
   }
-
   public function setRemovedPermissions($removedPermissions)
   {
     $this->removedPermissions = $removedPermissions;
   }
-
   public function getRemovedPermissions()
   {
     return $this->removedPermissions;
@@ -489,13 +462,15 @@ class Google_Service_Appsactivity_PermissionChange extends Google_Collection
 
 class Google_Service_Appsactivity_Photo extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $url;
 
+
   public function setUrl($url)
   {
     $this->url = $url;
   }
-
   public function getUrl()
   {
     return $this->url;
@@ -504,24 +479,24 @@ class Google_Service_Appsactivity_Photo extends Google_Model
 
 class Google_Service_Appsactivity_Rename extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $newTitle;
   public $oldTitle;
 
+
   public function setNewTitle($newTitle)
   {
     $this->newTitle = $newTitle;
   }
-
   public function getNewTitle()
   {
     return $this->newTitle;
   }
-
   public function setOldTitle($oldTitle)
   {
     $this->oldTitle = $oldTitle;
   }
-
   public function getOldTitle()
   {
     return $this->oldTitle;
@@ -530,35 +505,33 @@ class Google_Service_Appsactivity_Rename extends Google_Model
 
 class Google_Service_Appsactivity_Target extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $id;
   public $mimeType;
   public $name;
 
+
   public function setId($id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setMimeType($mimeType)
   {
     $this->mimeType = $mimeType;
   }
-
   public function getMimeType()
   {
     return $this->mimeType;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
@@ -567,25 +540,25 @@ class Google_Service_Appsactivity_Target extends Google_Model
 
 class Google_Service_Appsactivity_User extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $name;
   protected $photoType = 'Google_Service_Appsactivity_Photo';
   protected $photoDataType = '';
 
+
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setPhoto(Google_Service_Appsactivity_Photo $photo)
   {
     $this->photo = $photo;
   }
-
   public function getPhoto()
   {
     return $this->photo;

lib/google/src/Google/Service/Audit.php

@@ -19,8 +19,8 @@
  * Service definition for Audit (v1).
  *
  * <p>
- * Lets you access user activities in your enterprise made through various applications.
- * </p>
+ * Lets you access user activities in your enterprise made through various
+ * applications.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -128,31 +128,26 @@ class Google_Service_Audit_Activities_Resource extends Google_Service_Resource
    * Retrieves a list of activities for a specific customer and application.
    * (activities.listActivities)
    *
-   * @param string $customerId
-   * Represents the customer who is the owner of target object on which action was performed.
-   * @param string $applicationId
-   * Application ID of the application on which the event was performed.
+   * @param string $customerId Represents the customer who is the owner of target
+   * object on which action was performed.
+   * @param string $applicationId Application ID of the application on which the
+   * event was performed.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string actorEmail
-   * Email address of the user who performed the action.
-   * @opt_param string actorApplicationId
-   * Application ID of the application which interacted on behalf of the user while performing the
-    * event.
-   * @opt_param string actorIpAddress
-   * IP Address of host where the event was performed. Supports both IPv4 and IPv6 addresses.
-   * @opt_param string caller
-   * Type of the caller.
-   * @opt_param int maxResults
-   * Number of activity records to be shown in each page.
-   * @opt_param string eventName
-   * Name of the event being queried.
-   * @opt_param string startTime
-   * Return events which occured at or after this time.
-   * @opt_param string endTime
-   * Return events which occured at or before this time.
-   * @opt_param string continuationToken
-   * Next page URL.
+   * @opt_param string actorEmail Email address of the user who performed the
+   * action.
+   * @opt_param string actorApplicationId Application ID of the application which
+   * interacted on behalf of the user while performing the event.
+   * @opt_param string actorIpAddress IP Address of host where the event was
+   * performed. Supports both IPv4 and IPv6 addresses.
+   * @opt_param string caller Type of the caller.
+   * @opt_param int maxResults Number of activity records to be shown in each
+   * page.
+   * @opt_param string eventName Name of the event being queried.
+   * @opt_param string startTime Return events which occured at or after this
+   * time.
+   * @opt_param string endTime Return events which occured at or before this time.
+   * @opt_param string continuationToken Next page URL.
    * @return Google_Service_Audit_Activities
    */
   public function listActivities($customerId, $applicationId, $optParams = array())
@@ -169,36 +164,34 @@ class Google_Service_Audit_Activities_Resource extends Google_Service_Resource
 class Google_Service_Audit_Activities extends Google_Collection
 {
   protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   protected $itemsType = 'Google_Service_Audit_Activity';
   protected $itemsDataType = 'array';
   public $kind;
   public $next;
 
+
   public function setItems($items)
   {
     $this->items = $items;
   }
-
   public function getItems()
   {
     return $this->items;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setNext($next)
   {
     $this->next = $next;
   }
-
   public function getNext()
   {
     return $this->next;
@@ -208,6 +201,8 @@ class Google_Service_Audit_Activities extends Google_Collection
 class Google_Service_Audit_Activity extends Google_Collection
 {
   protected $collection_key = 'events';
+  protected $internal_gapi_mappings = array(
+  );
   protected $actorType = 'Google_Service_Audit_ActivityActor';
   protected $actorDataType = '';
   protected $eventsType = 'Google_Service_Audit_ActivityEvents';
@@ -218,61 +213,51 @@ class Google_Service_Audit_Activity extends Google_Collection
   public $kind;
   public $ownerDomain;
 
+
   public function setActor(Google_Service_Audit_ActivityActor $actor)
   {
     $this->actor = $actor;
   }
-
   public function getActor()
   {
     return $this->actor;
   }
-
   public function setEvents($events)
   {
     $this->events = $events;
   }
-
   public function getEvents()
   {
     return $this->events;
   }
-
   public function setId(Google_Service_Audit_ActivityId $id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setIpAddress($ipAddress)
   {
     $this->ipAddress = $ipAddress;
   }
-
   public function getIpAddress()
   {
     return $this->ipAddress;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setOwnerDomain($ownerDomain)
   {
     $this->ownerDomain = $ownerDomain;
   }
-
   public function getOwnerDomain()
   {
     return $this->ownerDomain;
@@ -281,46 +266,42 @@ class Google_Service_Audit_Activity extends Google_Collection
 
 class Google_Service_Audit_ActivityActor extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $applicationId;
   public $callerType;
   public $email;
   public $key;
 
+
   public function setApplicationId($applicationId)
   {
     $this->applicationId = $applicationId;
   }
-
   public function getApplicationId()
   {
     return $this->applicationId;
   }
-
   public function setCallerType($callerType)
   {
     $this->callerType = $callerType;
   }
-
   public function getCallerType()
   {
     return $this->callerType;
   }
-
   public function setEmail($email)
   {
     $this->email = $email;
   }
-
   public function getEmail()
   {
     return $this->email;
   }
-
   public function setKey($key)
   {
     $this->key = $key;
   }
-
   public function getKey()
   {
     return $this->key;
@@ -330,36 +311,34 @@ class Google_Service_Audit_ActivityActor extends Google_Model
 class Google_Service_Audit_ActivityEvents extends Google_Collection
 {
   protected $collection_key = 'parameters';
+  protected $internal_gapi_mappings = array(
+  );
   public $eventType;
   public $name;
   protected $parametersType = 'Google_Service_Audit_ActivityEventsParameters';
   protected $parametersDataType = 'array';
 
+
   public function setEventType($eventType)
   {
     $this->eventType = $eventType;
   }
-
   public function getEventType()
   {
     return $this->eventType;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setParameters($parameters)
   {
     $this->parameters = $parameters;
   }
-
   public function getParameters()
   {
     return $this->parameters;
@@ -368,24 +347,24 @@ class Google_Service_Audit_ActivityEvents extends Google_Collection
 
 class Google_Service_Audit_ActivityEventsParameters extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $name;
   public $value;
 
+
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setValue($value)
   {
     $this->value = $value;
   }
-
   public function getValue()
   {
     return $this->value;
@@ -394,46 +373,42 @@ class Google_Service_Audit_ActivityEventsParameters extends Google_Model
 
 class Google_Service_Audit_ActivityId extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $applicationId;
   public $customerId;
   public $time;
   public $uniqQualifier;
 
+
   public function setApplicationId($applicationId)
   {
     $this->applicationId = $applicationId;
   }
-
   public function getApplicationId()
   {
     return $this->applicationId;
   }
-
   public function setCustomerId($customerId)
   {
     $this->customerId = $customerId;
   }
-
   public function getCustomerId()
   {
     return $this->customerId;
   }
-
   public function setTime($time)
   {
     $this->time = $time;
   }
-
   public function getTime()
   {
     return $this->time;
   }
-
   public function setUniqQualifier($uniqQualifier)
   {
     $this->uniqQualifier = $uniqQualifier;
   }
-
   public function getUniqQualifier()
   {
     return $this->uniqQualifier;

lib/google/src/Google/Service/CloudMonitoring.php

@@ -19,8 +19,7 @@
  * Service definition for CloudMonitoring (v2beta1).
  *
  * <p>
- * API for accessing Google Cloud and API monitoring data.
- * </p>
+ * API for accessing Google Cloud and API monitoring data.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -32,7 +31,8 @@
 class Google_Service_CloudMonitoring extends Google_Service
 {
   /** View monitoring data for all of your Google Cloud and API projects. */
-  const MONITORING_READONLY = "https://www.googleapis.com/auth/monitoring.readonly";
+  const MONITORING_READONLY =
+      "https://www.googleapis.com/auth/monitoring.readonly";
 
   public $metricDescriptors;
   public $timeseries;
@@ -207,21 +207,20 @@ class Google_Service_CloudMonitoring_MetricDescriptors_Resource extends Google_S
    * subsequent pages of results by setting the pageToken query parameter to the
    * value of the nextPageToken. (metricDescriptors.listMetricDescriptors)
    *
-   * @param string $project
-   * The project id. The value can be the numeric project ID or string-based project name.
+   * @param string $project The project id. The value can be the numeric project
+   * ID or string-based project name.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param int count
-   * Maximum number of metric descriptors per page. Used for pagination. If not specified, count =
-    * 100.
-   * @opt_param string pageToken
-   * The pagination token, which is used to page through large result sets. Set this value to the
-    * value of the nextPageToken to retrieve the next page of results.
-   * @opt_param string query
-   * The query used to search against existing metrics. Separate keywords with a space; the service
-    * joins all keywords with AND, meaning that all keywords must match for a metric to be returned.
-    * If this field is omitted, all metrics are returned. If an empty string is passed with this
-    * field, no metrics are returned.
+   * @opt_param int count Maximum number of metric descriptors per page. Used for
+   * pagination. If not specified, count = 100.
+   * @opt_param string pageToken The pagination token, which is used to page
+   * through large result sets. Set this value to the value of the nextPageToken
+   * to retrieve the next page of results.
+   * @opt_param string query The query used to search against existing metrics.
+   * Separate keywords with a space; the service joins all keywords with AND,
+   * meaning that all keywords must match for a metric to be returned. If this
+   * field is omitted, all metrics are returned. If an empty string is passed with
+   * this field, no metrics are returned.
    * @return Google_Service_CloudMonitoring_ListMetricDescriptorsResponse
    */
   public function listMetricDescriptors($project, $optParams = array())
@@ -250,48 +249,38 @@ class Google_Service_CloudMonitoring_Timeseries_Resource extends Google_Service_
    * subsequent pages of results by setting the pageToken query parameter to the
    * value of the nextPageToken. (timeseries.listTimeseries)
    *
-   * @param string $project
-   * The project ID to which this time series belongs. The value can be the numeric project ID or
-    * string-based project name.
-   * @param string $metric
-   * Metric names are protocol-free URLs as listed in the Supported Metrics page. For example,
-    * compute.googleapis.com/instance/disk/read_ops_count.
-   * @param string $youngest
-   * End of the time interval (inclusive), which is expressed as an RFC 3339 timestamp.
+   * @param string $project The project ID to which this time series belongs. The
+   * value can be the numeric project ID or string-based project name.
+   * @param string $metric Metric names are protocol-free URLs as listed in the
+   * Supported Metrics page. For example,
+   * compute.googleapis.com/instance/disk/read_ops_count.
+   * @param string $youngest End of the time interval (inclusive), which is
+   * expressed as an RFC 3339 timestamp.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param int count
-   * Maximum number of data points per page, which is used for pagination of results.
-   * @opt_param string timespan
-   * Length of the time interval to query, which is an alternative way to declare the interval:
-    * (youngest - timespan, youngest]. The timespan and oldest parameters should not be used together.
-    * Units:
-  - s: second
-  - m: minute
-  - h: hour
-  - d: day
-  - w: week  Examples: 2s, 3m, 4w. Only
-    * one unit is allowed, for example: 2w3d is not allowed; you should use 17d instead.
-  If neither
-    * oldest nor timespan is specified, the default time interval will be (youngest - 4 hours,
-    * youngest].
-   * @opt_param string labels
-   * A collection of labels for the matching time series, which are represented as:
-  - key==value:
-    * key equals the value
-  - key=~value: key regex matches the value
-  - key!=value: key does not
-    * equal the value
-  - key!~value: key regex does not match the value  For example, to list all of
-    * the time series descriptors for the region us-central1, you could specify:
-    * label=cloud.googleapis.com%2Flocation=~us-central1.*
-   * @opt_param string pageToken
-   * The pagination token, which is used to page through large result sets. Set this value to the
-    * value of the nextPageToken to retrieve the next page of results.
-   * @opt_param string oldest
-   * Start of the time interval (exclusive), which is expressed as an RFC 3339 timestamp. If neither
-    * oldest nor timespan is specified, the default time interval will be (youngest - 4 hours,
-    * youngest]
+   * @opt_param int count Maximum number of data points per page, which is used
+   * for pagination of results.
+   * @opt_param string timespan Length of the time interval to query, which is an
+   * alternative way to declare the interval: (youngest - timespan, youngest]. The
+   * timespan and oldest parameters should not be used together. Units: - s:
+   * second  - m: minute  - h: hour  - d: day  - w: week  Examples: 2s, 3m, 4w.
+   * Only one unit is allowed, for example: 2w3d is not allowed; you should use
+   * 17d instead.
+   *
+   * If neither oldest nor timespan is specified, the default time interval will
+   * be (youngest - 4 hours, youngest].
+   * @opt_param string labels A collection of labels for the matching time series,
+   * which are represented as: - key==value: key equals the value  - key=~value:
+   * key regex matches the value  - key!=value: key does not equal the value  -
+   * key!~value: key regex does not match the value  For example, to list all of
+   * the time series descriptors for the region us-central1, you could specify:
+   * label=cloud.googleapis.com%2Flocation=~us-central1.*
+   * @opt_param string pageToken The pagination token, which is used to page
+   * through large result sets. Set this value to the value of the nextPageToken
+   * to retrieve the next page of results.
+   * @opt_param string oldest Start of the time interval (exclusive), which is
+   * expressed as an RFC 3339 timestamp. If neither oldest nor timespan is
+   * specified, the default time interval will be (youngest - 4 hours, youngest]
    * @return Google_Service_CloudMonitoring_ListTimeseriesResponse
    */
   public function listTimeseries($project, $metric, $youngest, $optParams = array())
@@ -320,49 +309,38 @@ class Google_Service_CloudMonitoring_TimeseriesDescriptors_Resource extends Goog
    * subsequent pages of results by setting the pageToken query parameter to the
    * value of the nextPageToken. (timeseriesDescriptors.listTimeseriesDescriptors)
    *
-   * @param string $project
-   * The project ID to which this time series belongs. The value can be the numeric project ID or
-    * string-based project name.
-   * @param string $metric
-   * Metric names are protocol-free URLs as listed in the Supported Metrics page. For example,
-    * compute.googleapis.com/instance/disk/read_ops_count.
-   * @param string $youngest
-   * End of the time interval (inclusive), which is expressed as an RFC 3339 timestamp.
+   * @param string $project The project ID to which this time series belongs. The
+   * value can be the numeric project ID or string-based project name.
+   * @param string $metric Metric names are protocol-free URLs as listed in the
+   * Supported Metrics page. For example,
+   * compute.googleapis.com/instance/disk/read_ops_count.
+   * @param string $youngest End of the time interval (inclusive), which is
+   * expressed as an RFC 3339 timestamp.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param int count
-   * Maximum number of time series descriptors per page. Used for pagination. If not specified, count
-    * = 100.
-   * @opt_param string timespan
-   * Length of the time interval to query, which is an alternative way to declare the interval:
-    * (youngest - timespan, youngest]. The timespan and oldest parameters should not be used together.
-    * Units:
-  - s: second
-  - m: minute
-  - h: hour
-  - d: day
-  - w: week  Examples: 2s, 3m, 4w. Only
-    * one unit is allowed, for example: 2w3d is not allowed; you should use 17d instead.
-  If neither
-    * oldest nor timespan is specified, the default time interval will be (youngest - 4 hours,
-    * youngest].
-   * @opt_param string labels
-   * A collection of labels for the matching time series, which are represented as:
-  - key==value:
-    * key equals the value
-  - key=~value: key regex matches the value
-  - key!=value: key does not
-    * equal the value
-  - key!~value: key regex does not match the value  For example, to list all of
-    * the time series descriptors for the region us-central1, you could specify:
-    * label=cloud.googleapis.com%2Flocation=~us-central1.*
-   * @opt_param string pageToken
-   * The pagination token, which is used to page through large result sets. Set this value to the
-    * value of the nextPageToken to retrieve the next page of results.
-   * @opt_param string oldest
-   * Start of the time interval (exclusive), which is expressed as an RFC 3339 timestamp. If neither
-    * oldest nor timespan is specified, the default time interval will be (youngest - 4 hours,
-    * youngest]
+   * @opt_param int count Maximum number of time series descriptors per page. Used
+   * for pagination. If not specified, count = 100.
+   * @opt_param string timespan Length of the time interval to query, which is an
+   * alternative way to declare the interval: (youngest - timespan, youngest]. The
+   * timespan and oldest parameters should not be used together. Units: - s:
+   * second  - m: minute  - h: hour  - d: day  - w: week  Examples: 2s, 3m, 4w.
+   * Only one unit is allowed, for example: 2w3d is not allowed; you should use
+   * 17d instead.
+   *
+   * If neither oldest nor timespan is specified, the default time interval will
+   * be (youngest - 4 hours, youngest].
+   * @opt_param string labels A collection of labels for the matching time series,
+   * which are represented as: - key==value: key equals the value  - key=~value:
+   * key regex matches the value  - key!=value: key does not equal the value  -
+   * key!~value: key regex does not match the value  For example, to list all of
+   * the time series descriptors for the region us-central1, you could specify:
+   * label=cloud.googleapis.com%2Flocation=~us-central1.*
+   * @opt_param string pageToken The pagination token, which is used to page
+   * through large result sets. Set this value to the value of the nextPageToken
+   * to retrieve the next page of results.
+   * @opt_param string oldest Start of the time interval (exclusive), which is
+   * expressed as an RFC 3339 timestamp. If neither oldest nor timespan is
+   * specified, the default time interval will be (youngest - 4 hours, youngest]
    * @return Google_Service_CloudMonitoring_ListTimeseriesDescriptorsResponse
    */
   public function listTimeseriesDescriptors($project, $metric, $youngest, $optParams = array())
@@ -378,13 +356,15 @@ class Google_Service_CloudMonitoring_TimeseriesDescriptors_Resource extends Goog
 
 class Google_Service_CloudMonitoring_ListMetricDescriptorsRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
@@ -394,36 +374,34 @@ class Google_Service_CloudMonitoring_ListMetricDescriptorsRequest extends Google
 class Google_Service_CloudMonitoring_ListMetricDescriptorsResponse extends Google_Collection
 {
   protected $collection_key = 'metrics';
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   protected $metricsType = 'Google_Service_CloudMonitoring_MetricDescriptor';
   protected $metricsDataType = 'array';
   public $nextPageToken;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setMetrics($metrics)
   {
     $this->metrics = $metrics;
   }
-
   public function getMetrics()
   {
     return $this->metrics;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
@@ -432,13 +410,15 @@ class Google_Service_CloudMonitoring_ListMetricDescriptorsResponse extends Googl
 
 class Google_Service_CloudMonitoring_ListTimeseriesDescriptorsRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
@@ -448,6 +428,8 @@ class Google_Service_CloudMonitoring_ListTimeseriesDescriptorsRequest extends Go
 class Google_Service_CloudMonitoring_ListTimeseriesDescriptorsResponse extends Google_Collection
 {
   protected $collection_key = 'timeseries';
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   public $nextPageToken;
   public $oldest;
@@ -455,51 +437,43 @@ class Google_Service_CloudMonitoring_ListTimeseriesDescriptorsResponse extends G
   protected $timeseriesDataType = 'array';
   public $youngest;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
   }
-
   public function setOldest($oldest)
   {
     $this->oldest = $oldest;
   }
-
   public function getOldest()
   {
     return $this->oldest;
   }
-
   public function setTimeseries($timeseries)
   {
     $this->timeseries = $timeseries;
   }
-
   public function getTimeseries()
   {
     return $this->timeseries;
   }
-
   public function setYoungest($youngest)
   {
     $this->youngest = $youngest;
   }
-
   public function getYoungest()
   {
     return $this->youngest;
@@ -508,13 +482,15 @@ class Google_Service_CloudMonitoring_ListTimeseriesDescriptorsResponse extends G
 
 class Google_Service_CloudMonitoring_ListTimeseriesRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
@@ -524,6 +500,8 @@ class Google_Service_CloudMonitoring_ListTimeseriesRequest extends Google_Model
 class Google_Service_CloudMonitoring_ListTimeseriesResponse extends Google_Collection
 {
   protected $collection_key = 'timeseries';
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   public $nextPageToken;
   public $oldest;
@@ -531,51 +509,43 @@ class Google_Service_CloudMonitoring_ListTimeseriesResponse extends Google_Colle
   protected $timeseriesDataType = 'array';
   public $youngest;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
   }
-
   public function setOldest($oldest)
   {
     $this->oldest = $oldest;
   }
-
   public function getOldest()
   {
     return $this->oldest;
   }
-
   public function setTimeseries($timeseries)
   {
     $this->timeseries = $timeseries;
   }
-
   public function getTimeseries()
   {
     return $this->timeseries;
   }
-
   public function setYoungest($youngest)
   {
     $this->youngest = $youngest;
   }
-
   public function getYoungest()
   {
     return $this->youngest;
@@ -585,6 +555,8 @@ class Google_Service_CloudMonitoring_ListTimeseriesResponse extends Google_Colle
 class Google_Service_CloudMonitoring_MetricDescriptor extends Google_Collection
 {
   protected $collection_key = 'labels';
+  protected $internal_gapi_mappings = array(
+  );
   public $description;
   protected $labelsType = 'Google_Service_CloudMonitoring_MetricDescriptorLabelDescriptor';
   protected $labelsDataType = 'array';
@@ -593,51 +565,43 @@ class Google_Service_CloudMonitoring_MetricDescriptor extends Google_Collection
   protected $typeDescriptorType = 'Google_Service_CloudMonitoring_MetricDescriptorTypeDescriptor';
   protected $typeDescriptorDataType = '';
 
+
   public function setDescription($description)
   {
     $this->description = $description;
   }
-
   public function getDescription()
   {
     return $this->description;
   }
-
   public function setLabels($labels)
   {
     $this->labels = $labels;
   }
-
   public function getLabels()
   {
     return $this->labels;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setProject($project)
   {
     $this->project = $project;
   }
-
   public function getProject()
   {
     return $this->project;
   }
-
   public function setTypeDescriptor(Google_Service_CloudMonitoring_MetricDescriptorTypeDescriptor $typeDescriptor)
   {
     $this->typeDescriptor = $typeDescriptor;
   }
-
   public function getTypeDescriptor()
   {
     return $this->typeDescriptor;
@@ -646,24 +610,24 @@ class Google_Service_CloudMonitoring_MetricDescriptor extends Google_Collection
 
 class Google_Service_CloudMonitoring_MetricDescriptorLabelDescriptor extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $description;
   public $key;
 
+
   public function setDescription($description)
   {
     $this->description = $description;
   }
-
   public function getDescription()
   {
     return $this->description;
   }
-
   public function setKey($key)
   {
     $this->key = $key;
   }
-
   public function getKey()
   {
     return $this->key;
@@ -672,24 +636,24 @@ class Google_Service_CloudMonitoring_MetricDescriptorLabelDescriptor extends Goo
 
 class Google_Service_CloudMonitoring_MetricDescriptorTypeDescriptor extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $metricType;
   public $valueType;
 
+
   public function setMetricType($metricType)
   {
     $this->metricType = $metricType;
   }
-
   public function getMetricType()
   {
     return $this->metricType;
   }
-
   public function setValueType($valueType)
   {
     $this->valueType = $valueType;
   }
-
   public function getValueType()
   {
     return $this->valueType;
@@ -698,6 +662,8 @@ class Google_Service_CloudMonitoring_MetricDescriptorTypeDescriptor extends Goog
 
 class Google_Service_CloudMonitoring_Point extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $boolValue;
   protected $distributionValueType = 'Google_Service_CloudMonitoring_PointDistribution';
   protected $distributionValueDataType = '';
@@ -707,71 +673,59 @@ class Google_Service_CloudMonitoring_Point extends Google_Model
   public $start;
   public $stringValue;
 
+
   public function setBoolValue($boolValue)
   {
     $this->boolValue = $boolValue;
   }
-
   public function getBoolValue()
   {
     return $this->boolValue;
   }
-
   public function setDistributionValue(Google_Service_CloudMonitoring_PointDistribution $distributionValue)
   {
     $this->distributionValue = $distributionValue;
   }
-
   public function getDistributionValue()
   {
     return $this->distributionValue;
   }
-
   public function setDoubleValue($doubleValue)
   {
     $this->doubleValue = $doubleValue;
   }
-
   public function getDoubleValue()
   {
     return $this->doubleValue;
   }
-
   public function setEnd($end)
   {
     $this->end = $end;
   }
-
   public function getEnd()
   {
     return $this->end;
   }
-
   public function setInt64Value($int64Value)
   {
     $this->int64Value = $int64Value;
   }
-
   public function getInt64Value()
   {
     return $this->int64Value;
   }
-
   public function setStart($start)
   {
     $this->start = $start;
   }
-
   public function getStart()
   {
     return $this->start;
   }
-
   public function setStringValue($stringValue)
   {
     $this->stringValue = $stringValue;
   }
-
   public function getStringValue()
   {
     return $this->stringValue;
@@ -781,6 +735,8 @@ class Google_Service_CloudMonitoring_Point extends Google_Model
 class Google_Service_CloudMonitoring_PointDistribution extends Google_Collection
 {
   protected $collection_key = 'buckets';
+  protected $internal_gapi_mappings = array(
+  );
   protected $bucketsType = 'Google_Service_CloudMonitoring_PointDistributionBucket';
   protected $bucketsDataType = 'array';
   protected $overflowBucketType = 'Google_Service_CloudMonitoring_PointDistributionOverflowBucket';
@@ -788,31 +744,27 @@ class Google_Service_CloudMonitoring_PointDistribution extends Google_Collection
   protected $underflowBucketType = 'Google_Service_CloudMonitoring_PointDistributionUnderflowBucket';
   protected $underflowBucketDataType = '';
 
+
   public function setBuckets($buckets)
   {
     $this->buckets = $buckets;
   }
-
   public function getBuckets()
   {
     return $this->buckets;
   }
-
   public function setOverflowBucket(Google_Service_CloudMonitoring_PointDistributionOverflowBucket $overflowBucket)
   {
     $this->overflowBucket = $overflowBucket;
   }
-
   public function getOverflowBucket()
   {
     return $this->overflowBucket;
   }
-
   public function setUnderflowBucket(Google_Service_CloudMonitoring_PointDistributionUnderflowBucket $underflowBucket)
   {
     $this->underflowBucket = $underflowBucket;
   }
-
   public function getUnderflowBucket()
   {
     return $this->underflowBucket;
@@ -821,35 +773,33 @@ class Google_Service_CloudMonitoring_PointDistribution extends Google_Collection
 
 class Google_Service_CloudMonitoring_PointDistributionBucket extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $count;
   public $lowerBound;
   public $upperBound;
 
+
   public function setCount($count)
   {
     $this->count = $count;
   }
-
   public function getCount()
   {
     return $this->count;
   }
-
   public function setLowerBound($lowerBound)
   {
     $this->lowerBound = $lowerBound;
   }
-
   public function getLowerBound()
   {
     return $this->lowerBound;
   }
-
   public function setUpperBound($upperBound)
   {
     $this->upperBound = $upperBound;
   }
-
   public function getUpperBound()
   {
     return $this->upperBound;
@@ -858,24 +808,24 @@ class Google_Service_CloudMonitoring_PointDistributionBucket extends Google_Mode
 
 class Google_Service_CloudMonitoring_PointDistributionOverflowBucket extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $count;
   public $lowerBound;
 
+
   public function setCount($count)
   {
     $this->count = $count;
   }
-
   public function getCount()
   {
     return $this->count;
   }
-
   public function setLowerBound($lowerBound)
   {
     $this->lowerBound = $lowerBound;
   }
-
   public function getLowerBound()
   {
     return $this->lowerBound;
@@ -884,24 +834,24 @@ class Google_Service_CloudMonitoring_PointDistributionOverflowBucket extends Goo
 
 class Google_Service_CloudMonitoring_PointDistributionUnderflowBucket extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $count;
   public $upperBound;
 
+
   public function setCount($count)
   {
     $this->count = $count;
   }
-
   public function getCount()
   {
     return $this->count;
   }
-
   public function setUpperBound($upperBound)
   {
     $this->upperBound = $upperBound;
   }
-
   public function getUpperBound()
   {
     return $this->upperBound;
@@ -911,26 +861,26 @@ class Google_Service_CloudMonitoring_PointDistributionUnderflowBucket extends Go
 class Google_Service_CloudMonitoring_Timeseries extends Google_Collection
 {
   protected $collection_key = 'points';
+  protected $internal_gapi_mappings = array(
+  );
   protected $pointsType = 'Google_Service_CloudMonitoring_Point';
   protected $pointsDataType = 'array';
   protected $timeseriesDescType = 'Google_Service_CloudMonitoring_TimeseriesDescriptor';
   protected $timeseriesDescDataType = '';
 
+
   public function setPoints($points)
   {
     $this->points = $points;
   }
-
   public function getPoints()
   {
     return $this->points;
   }
-
   public function setTimeseriesDesc(Google_Service_CloudMonitoring_TimeseriesDescriptor $timeseriesDesc)
   {
     $this->timeseriesDesc = $timeseriesDesc;
   }
-
   public function getTimeseriesDesc()
   {
     return $this->timeseriesDesc;
@@ -939,42 +889,65 @@ class Google_Service_CloudMonitoring_Timeseries extends Google_Collection
 
 class Google_Service_CloudMonitoring_TimeseriesDescriptor extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $labels;
   public $metric;
   public $project;
 
+
   public function setLabels($labels)
   {
     $this->labels = $labels;
   }
-
   public function getLabels()
   {
     return $this->labels;
   }
-
   public function setMetric($metric)
   {
     $this->metric = $metric;
   }
-
   public function getMetric()
   {
     return $this->metric;
   }
-
   public function setProject($project)
   {
     $this->project = $project;
   }
-
   public function getProject()
   {
     return $this->project;
   }
 }
 
+class Google_Service_CloudMonitoring_TimeseriesDescriptorLabel extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $key;
+  public $value;
+
+
+  public function setKey($key)
+  {
+    $this->key = $key;
+  }
+  public function getKey()
+  {
+    return $this->key;
+  }
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+  public function getValue()
+  {
+    return $this->value;
+  }
+}
+
 class Google_Service_CloudMonitoring_TimeseriesDescriptorLabels extends Google_Model
 {
-
 }

lib/google/src/Google/Service/Container.php

@@ -0,0 +1,794 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * Service definition for Container (v1beta1).
+ *
+ * <p>
+ * The Google Container Engine API is used for building and managing container
+ * based applications, powered by the open source Kubernetes technology.</p>
+ *
+ * <p>
+ * For more information about this service, see the API
+ * <a href="" target="_blank">Documentation</a>
+ * </p>
+ *
+ * @author Google, Inc.
+ */
+class Google_Service_Container extends Google_Service
+{
+  /** View and manage your data across Google Cloud Platform services. */
+  const CLOUD_PLATFORM =
+      "https://www.googleapis.com/auth/cloud-platform";
+
+  public $projects_clusters;
+  public $projects_operations;
+  public $projects_zones_clusters;
+  public $projects_zones_operations;
+  
+
+  /**
+   * Constructs the internal representation of the Container service.
+   *
+   * @param Google_Client $client
+   */
+  public function __construct(Google_Client $client)
+  {
+    parent::__construct($client);
+    $this->servicePath = 'container/v1beta1/projects/';
+    $this->version = 'v1beta1';
+    $this->serviceName = 'container';
+
+    $this->projects_clusters = new Google_Service_Container_ProjectsClusters_Resource(
+        $this,
+        $this->serviceName,
+        'clusters',
+        array(
+          'methods' => array(
+            'list' => array(
+              'path' => '{projectId}/clusters',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->projects_operations = new Google_Service_Container_ProjectsOperations_Resource(
+        $this,
+        $this->serviceName,
+        'operations',
+        array(
+          'methods' => array(
+            'list' => array(
+              'path' => '{projectId}/operations',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->projects_zones_clusters = new Google_Service_Container_ProjectsZonesClusters_Resource(
+        $this,
+        $this->serviceName,
+        'clusters',
+        array(
+          'methods' => array(
+            'create' => array(
+              'path' => '{projectId}/zones/{zoneId}/clusters',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zoneId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'delete' => array(
+              'path' => '{projectId}/zones/{zoneId}/clusters/{clusterId}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zoneId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'clusterId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
+              'path' => '{projectId}/zones/{zoneId}/clusters/{clusterId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zoneId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'clusterId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => '{projectId}/zones/{zoneId}/clusters',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zoneId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->projects_zones_operations = new Google_Service_Container_ProjectsZonesOperations_Resource(
+        $this,
+        $this->serviceName,
+        'operations',
+        array(
+          'methods' => array(
+            'get' => array(
+              'path' => '{projectId}/zones/{zoneId}/operations/{operationId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zoneId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'operationId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => '{projectId}/zones/{zoneId}/operations',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'projectId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zoneId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
+  }
+}
+
+
+/**
+ * The "projects" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $containerService = new Google_Service_Container(...);
+ *   $projects = $containerService->projects;
+ *  </code>
+ */
+class Google_Service_Container_Projects_Resource extends Google_Service_Resource
+{
+}
+
+/**
+ * The "clusters" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $containerService = new Google_Service_Container(...);
+ *   $clusters = $containerService->clusters;
+ *  </code>
+ */
+class Google_Service_Container_ProjectsClusters_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Lists all clusters owned by a project across all zones.
+   * (clusters.listProjectsClusters)
+   *
+   * @param string $projectId The Google Developers Console project ID or  project
+   * number.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Container_ListAggregatedClustersResponse
+   */
+  public function listProjectsClusters($projectId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Container_ListAggregatedClustersResponse");
+  }
+}
+/**
+ * The "operations" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $containerService = new Google_Service_Container(...);
+ *   $operations = $containerService->operations;
+ *  </code>
+ */
+class Google_Service_Container_ProjectsOperations_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Lists all operations in a project, across all zones.
+   * (operations.listProjectsOperations)
+   *
+   * @param string $projectId The Google Developers Console project ID or  project
+   * number.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Container_ListAggregatedOperationsResponse
+   */
+  public function listProjectsOperations($projectId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Container_ListAggregatedOperationsResponse");
+  }
+}
+/**
+ * The "zones" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $containerService = new Google_Service_Container(...);
+ *   $zones = $containerService->zones;
+ *  </code>
+ */
+class Google_Service_Container_ProjectsZones_Resource extends Google_Service_Resource
+{
+}
+
+/**
+ * The "clusters" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $containerService = new Google_Service_Container(...);
+ *   $clusters = $containerService->clusters;
+ *  </code>
+ */
+class Google_Service_Container_ProjectsZonesClusters_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Creates a cluster, consisting of the specified number and type of Google
+   * Compute Engine instances, plus a Kubernetes master instance.
+   *
+   * The cluster is created in the project's default network.
+   *
+   * A firewall is added that allows traffic into port 443 on the master, which
+   * enables HTTPS. A firewall and a route is added for each node to allow the
+   * containers on that node to communicate with all other instances in the
+   * cluster.
+   *
+   * Finally, a route named k8s-iproute-10-xx-0-0 is created to track that the
+   * cluster's 10.xx.0.0/16 CIDR has been assigned. (clusters.create)
+   *
+   * @param string $projectId The Google Developers Console project ID or  project
+   * number.
+   * @param string $zoneId The name of the Google Compute Engine zone in which the
+   * cluster resides.
+   * @param Google_CreateClusterRequest $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Container_Operation
+   */
+  public function create($projectId, $zoneId, Google_Service_Container_CreateClusterRequest $postBody, $optParams = array())
+  {
+    $params = array('projectId' => $projectId, 'zoneId' => $zoneId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('create', array($params), "Google_Service_Container_Operation");
+  }
+
+  /**
+   * Deletes the cluster, including the Kubernetes master and all worker nodes.
+   *
+   * Firewalls and routes that were configured at cluster creation are also
+   * deleted. (clusters.delete)
+   *
+   * @param string $projectId The Google Developers Console project ID or  project
+   * number.
+   * @param string $zoneId The name of the Google Compute Engine zone in which the
+   * cluster resides.
+   * @param string $clusterId The name of the cluster to delete.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Container_Operation
+   */
+  public function delete($projectId, $zoneId, $clusterId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId, 'zoneId' => $zoneId, 'clusterId' => $clusterId);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params), "Google_Service_Container_Operation");
+  }
+
+  /**
+   * Gets a specific cluster. (clusters.get)
+   *
+   * @param string $projectId The Google Developers Console project ID or  project
+   * number.
+   * @param string $zoneId The name of the Google Compute Engine zone in which the
+   * cluster resides.
+   * @param string $clusterId The name of the cluster to retrieve.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Container_Cluster
+   */
+  public function get($projectId, $zoneId, $clusterId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId, 'zoneId' => $zoneId, 'clusterId' => $clusterId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Container_Cluster");
+  }
+
+  /**
+   * Lists all clusters owned by a project in the specified zone.
+   * (clusters.listProjectsZonesClusters)
+   *
+   * @param string $projectId The Google Developers Console project ID or  project
+   * number.
+   * @param string $zoneId The name of the Google Compute Engine zone in which the
+   * cluster resides.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Container_ListClustersResponse
+   */
+  public function listProjectsZonesClusters($projectId, $zoneId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId, 'zoneId' => $zoneId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Container_ListClustersResponse");
+  }
+}
+/**
+ * The "operations" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $containerService = new Google_Service_Container(...);
+ *   $operations = $containerService->operations;
+ *  </code>
+ */
+class Google_Service_Container_ProjectsZonesOperations_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Gets the specified operation. (operations.get)
+   *
+   * @param string $projectId The Google Developers Console project ID or  project
+   * number.
+   * @param string $zoneId The name of the Google Compute Engine zone in which the
+   * operation resides. This is always the same zone as the cluster with which the
+   * operation is associated.
+   * @param string $operationId The server-assigned name of the operation.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Container_Operation
+   */
+  public function get($projectId, $zoneId, $operationId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId, 'zoneId' => $zoneId, 'operationId' => $operationId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Container_Operation");
+  }
+
+  /**
+   * Lists all operations in a project in a specific zone.
+   * (operations.listProjectsZonesOperations)
+   *
+   * @param string $projectId The Google Developers Console project ID or  project
+   * number.
+   * @param string $zoneId The name of the Google Compute Engine zone to return
+   * operations for.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Container_ListOperationsResponse
+   */
+  public function listProjectsZonesOperations($projectId, $zoneId, $optParams = array())
+  {
+    $params = array('projectId' => $projectId, 'zoneId' => $zoneId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Container_ListOperationsResponse");
+  }
+}
+
+
+
+
+class Google_Service_Container_Cluster extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $clusterApiVersion;
+  public $containerIpv4Cidr;
+  public $creationTimestamp;
+  public $description;
+  public $endpoint;
+  protected $masterAuthType = 'Google_Service_Container_MasterAuth';
+  protected $masterAuthDataType = '';
+  public $name;
+  protected $nodeConfigType = 'Google_Service_Container_NodeConfig';
+  protected $nodeConfigDataType = '';
+  public $nodeRoutingPrefixSize;
+  public $numNodes;
+  public $servicesIpv4Cidr;
+  public $status;
+  public $statusMessage;
+  public $zone;
+
+
+  public function setClusterApiVersion($clusterApiVersion)
+  {
+    $this->clusterApiVersion = $clusterApiVersion;
+  }
+  public function getClusterApiVersion()
+  {
+    return $this->clusterApiVersion;
+  }
+  public function setContainerIpv4Cidr($containerIpv4Cidr)
+  {
+    $this->containerIpv4Cidr = $containerIpv4Cidr;
+  }
+  public function getContainerIpv4Cidr()
+  {
+    return $this->containerIpv4Cidr;
+  }
+  public function setCreationTimestamp($creationTimestamp)
+  {
+    $this->creationTimestamp = $creationTimestamp;
+  }
+  public function getCreationTimestamp()
+  {
+    return $this->creationTimestamp;
+  }
+  public function setDescription($description)
+  {
+    $this->description = $description;
+  }
+  public function getDescription()
+  {
+    return $this->description;
+  }
+  public function setEndpoint($endpoint)
+  {
+    $this->endpoint = $endpoint;
+  }
+  public function getEndpoint()
+  {
+    return $this->endpoint;
+  }
+  public function setMasterAuth(Google_Service_Container_MasterAuth $masterAuth)
+  {
+    $this->masterAuth = $masterAuth;
+  }
+  public function getMasterAuth()
+  {
+    return $this->masterAuth;
+  }
+  public function setName($name)
+  {
+    $this->name = $name;
+  }
+  public function getName()
+  {
+    return $this->name;
+  }
+  public function setNodeConfig(Google_Service_Container_NodeConfig $nodeConfig)
+  {
+    $this->nodeConfig = $nodeConfig;
+  }
+  public function getNodeConfig()
+  {
+    return $this->nodeConfig;
+  }
+  public function setNodeRoutingPrefixSize($nodeRoutingPrefixSize)
+  {
+    $this->nodeRoutingPrefixSize = $nodeRoutingPrefixSize;
+  }
+  public function getNodeRoutingPrefixSize()
+  {
+    return $this->nodeRoutingPrefixSize;
+  }
+  public function setNumNodes($numNodes)
+  {
+    $this->numNodes = $numNodes;
+  }
+  public function getNumNodes()
+  {
+    return $this->numNodes;
+  }
+  public function setServicesIpv4Cidr($servicesIpv4Cidr)
+  {
+    $this->servicesIpv4Cidr = $servicesIpv4Cidr;
+  }
+  public function getServicesIpv4Cidr()
+  {
+    return $this->servicesIpv4Cidr;
+  }
+  public function setStatus($status)
+  {
+    $this->status = $status;
+  }
+  public function getStatus()
+  {
+    return $this->status;
+  }
+  public function setStatusMessage($statusMessage)
+  {
+    $this->statusMessage = $statusMessage;
+  }
+  public function getStatusMessage()
+  {
+    return $this->statusMessage;
+  }
+  public function setZone($zone)
+  {
+    $this->zone = $zone;
+  }
+  public function getZone()
+  {
+    return $this->zone;
+  }
+}
+
+class Google_Service_Container_CreateClusterRequest extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  protected $clusterType = 'Google_Service_Container_Cluster';
+  protected $clusterDataType = '';
+
+
+  public function setCluster(Google_Service_Container_Cluster $cluster)
+  {
+    $this->cluster = $cluster;
+  }
+  public function getCluster()
+  {
+    return $this->cluster;
+  }
+}
+
+class Google_Service_Container_ListAggregatedClustersResponse extends Google_Collection
+{
+  protected $collection_key = 'clusters';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $clustersType = 'Google_Service_Container_Cluster';
+  protected $clustersDataType = 'array';
+
+
+  public function setClusters($clusters)
+  {
+    $this->clusters = $clusters;
+  }
+  public function getClusters()
+  {
+    return $this->clusters;
+  }
+}
+
+class Google_Service_Container_ListAggregatedOperationsResponse extends Google_Collection
+{
+  protected $collection_key = 'operations';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $operationsType = 'Google_Service_Container_Operation';
+  protected $operationsDataType = 'array';
+
+
+  public function setOperations($operations)
+  {
+    $this->operations = $operations;
+  }
+  public function getOperations()
+  {
+    return $this->operations;
+  }
+}
+
+class Google_Service_Container_ListClustersResponse extends Google_Collection
+{
+  protected $collection_key = 'clusters';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $clustersType = 'Google_Service_Container_Cluster';
+  protected $clustersDataType = 'array';
+
+
+  public function setClusters($clusters)
+  {
+    $this->clusters = $clusters;
+  }
+  public function getClusters()
+  {
+    return $this->clusters;
+  }
+}
+
+class Google_Service_Container_ListOperationsResponse extends Google_Collection
+{
+  protected $collection_key = 'operations';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $operationsType = 'Google_Service_Container_Operation';
+  protected $operationsDataType = 'array';
+
+
+  public function setOperations($operations)
+  {
+    $this->operations = $operations;
+  }
+  public function getOperations()
+  {
+    return $this->operations;
+  }
+}
+
+class Google_Service_Container_MasterAuth extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $password;
+  public $user;
+
+
+  public function setPassword($password)
+  {
+    $this->password = $password;
+  }
+  public function getPassword()
+  {
+    return $this->password;
+  }
+  public function setUser($user)
+  {
+    $this->user = $user;
+  }
+  public function getUser()
+  {
+    return $this->user;
+  }
+}
+
+class Google_Service_Container_NodeConfig extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $machineType;
+  public $sourceImage;
+
+
+  public function setMachineType($machineType)
+  {
+    $this->machineType = $machineType;
+  }
+  public function getMachineType()
+  {
+    return $this->machineType;
+  }
+  public function setSourceImage($sourceImage)
+  {
+    $this->sourceImage = $sourceImage;
+  }
+  public function getSourceImage()
+  {
+    return $this->sourceImage;
+  }
+}
+
+class Google_Service_Container_Operation extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $errorMessage;
+  public $name;
+  public $operationType;
+  public $status;
+  public $target;
+  public $zone;
+
+
+  public function setErrorMessage($errorMessage)
+  {
+    $this->errorMessage = $errorMessage;
+  }
+  public function getErrorMessage()
+  {
+    return $this->errorMessage;
+  }
+  public function setName($name)
+  {
+    $this->name = $name;
+  }
+  public function getName()
+  {
+    return $this->name;
+  }
+  public function setOperationType($operationType)
+  {
+    $this->operationType = $operationType;
+  }
+  public function getOperationType()
+  {
+    return $this->operationType;
+  }
+  public function setStatus($status)
+  {
+    $this->status = $status;
+  }
+  public function getStatus()
+  {
+    return $this->status;
+  }
+  public function setTarget($target)
+  {
+    $this->target = $target;
+  }
+  public function getTarget()
+  {
+    return $this->target;
+  }
+  public function setZone($zone)
+  {
+    $this->zone = $zone;
+  }
+  public function getZone()
+  {
+    return $this->zone;
+  }
+}

lib/google/src/Google/Service/Dns.php

@@ -19,8 +19,8 @@
  * Service definition for Dns (v1beta1).
  *
  * <p>
- * The Google Cloud DNS API provides services for configuring and serving authoritative DNS records.
- * </p>
+ * The Google Cloud DNS API provides services for configuring and serving
+ * authoritative DNS records.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -32,11 +32,14 @@
 class Google_Service_Dns extends Google_Service
 {
   /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM = "https://www.googleapis.com/auth/cloud-platform";
+  const CLOUD_PLATFORM =
+      "https://www.googleapis.com/auth/cloud-platform";
   /** View your DNS records hosted by Google Cloud DNS. */
-  const NDEV_CLOUDDNS_READONLY = "https://www.googleapis.com/auth/ndev.clouddns.readonly";
+  const NDEV_CLOUDDNS_READONLY =
+      "https://www.googleapis.com/auth/ndev.clouddns.readonly";
   /** View and manage your DNS records hosted by Google Cloud DNS. */
-  const NDEV_CLOUDDNS_READWRITE = "https://www.googleapis.com/auth/ndev.clouddns.readwrite";
+  const NDEV_CLOUDDNS_READWRITE =
+      "https://www.googleapis.com/auth/ndev.clouddns.readwrite";
 
   public $changes;
   public $managedZones;
@@ -279,10 +282,9 @@ class Google_Service_Dns_Changes_Resource extends Google_Service_Resource
   /**
    * Atomically update the ResourceRecordSet collection. (changes.create)
    *
-   * @param string $project
-   * Identifies the project addressed by this request.
-   * @param string $managedZone
-   * Identifies the managed zone addressed by this request. Can be the managed zone name or id.
+   * @param string $project Identifies the project addressed by this request.
+   * @param string $managedZone Identifies the managed zone addressed by this
+   * request. Can be the managed zone name or id.
    * @param Google_Change $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Dns_Change
@@ -293,15 +295,15 @@ class Google_Service_Dns_Changes_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('create', array($params), "Google_Service_Dns_Change");
   }
+
   /**
    * Fetch the representation of an existing Change. (changes.get)
    *
-   * @param string $project
-   * Identifies the project addressed by this request.
-   * @param string $managedZone
-   * Identifies the managed zone addressed by this request. Can be the managed zone name or id.
-   * @param string $changeId
-   * The identifier of the requested change, from a previous ResourceRecordSetsChangeResponse.
+   * @param string $project Identifies the project addressed by this request.
+   * @param string $managedZone Identifies the managed zone addressed by this
+   * request. Can be the managed zone name or id.
+   * @param string $changeId The identifier of the requested change, from a
+   * previous ResourceRecordSetsChangeResponse.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Dns_Change
    */
@@ -311,25 +313,24 @@ class Google_Service_Dns_Changes_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_Dns_Change");
   }
+
   /**
    * Enumerate Changes to a ResourceRecordSet collection. (changes.listChanges)
    *
-   * @param string $project
-   * Identifies the project addressed by this request.
-   * @param string $managedZone
-   * Identifies the managed zone addressed by this request. Can be the managed zone name or id.
+   * @param string $project Identifies the project addressed by this request.
+   * @param string $managedZone Identifies the managed zone addressed by this
+   * request. Can be the managed zone name or id.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param int maxResults
-   * Optional. Maximum number of results to be returned. If unspecified, the server will decide how
-    * many results to return.
-   * @opt_param string pageToken
-   * Optional. A tag returned by a previous list request that was truncated. Use this parameter to
-    * continue a previous list request.
-   * @opt_param string sortBy
-   * Sorting criterion. The only supported value is change sequence.
-   * @opt_param string sortOrder
-   * Sorting order direction: 'ascending' or 'descending'.
+   * @opt_param int maxResults Optional. Maximum number of results to be returned.
+   * If unspecified, the server will decide how many results to return.
+   * @opt_param string pageToken Optional. A tag returned by a previous list
+   * request that was truncated. Use this parameter to continue a previous list
+   * request.
+   * @opt_param string sortBy Sorting criterion. The only supported value is
+   * change sequence.
+   * @opt_param string sortOrder Sorting order direction: 'ascending' or
+   * 'descending'.
    * @return Google_Service_Dns_ChangesListResponse
    */
   public function listChanges($project, $managedZone, $optParams = array())
@@ -354,8 +355,7 @@ class Google_Service_Dns_ManagedZones_Resource extends Google_Service_Resource
   /**
    * Create a new ManagedZone. (managedZones.create)
    *
-   * @param string $project
-   * Identifies the project addressed by this request.
+   * @param string $project Identifies the project addressed by this request.
    * @param Google_ManagedZone $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Dns_ManagedZone
@@ -366,13 +366,13 @@ class Google_Service_Dns_ManagedZones_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('create', array($params), "Google_Service_Dns_ManagedZone");
   }
+
   /**
    * Delete a previously created ManagedZone. (managedZones.delete)
    *
-   * @param string $project
-   * Identifies the project addressed by this request.
-   * @param string $managedZone
-   * Identifies the managed zone addressed by this request. Can be the managed zone name or id.
+   * @param string $project Identifies the project addressed by this request.
+   * @param string $managedZone Identifies the managed zone addressed by this
+   * request. Can be the managed zone name or id.
    * @param array $optParams Optional parameters.
    */
   public function delete($project, $managedZone, $optParams = array())
@@ -381,13 +381,13 @@ class Google_Service_Dns_ManagedZones_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('delete', array($params));
   }
+
   /**
    * Fetch the representation of an existing ManagedZone. (managedZones.get)
    *
-   * @param string $project
-   * Identifies the project addressed by this request.
-   * @param string $managedZone
-   * Identifies the managed zone addressed by this request. Can be the managed zone name or id.
+   * @param string $project Identifies the project addressed by this request.
+   * @param string $managedZone Identifies the managed zone addressed by this
+   * request. Can be the managed zone name or id.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Dns_ManagedZone
    */
@@ -397,20 +397,19 @@ class Google_Service_Dns_ManagedZones_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_Dns_ManagedZone");
   }
+
   /**
    * Enumerate ManagedZones that have been created but not yet deleted.
    * (managedZones.listManagedZones)
    *
-   * @param string $project
-   * Identifies the project addressed by this request.
+   * @param string $project Identifies the project addressed by this request.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string pageToken
-   * Optional. A tag returned by a previous list request that was truncated. Use this parameter to
-    * continue a previous list request.
-   * @opt_param int maxResults
-   * Optional. Maximum number of results to be returned. If unspecified, the server will decide how
-    * many results to return.
+   * @opt_param string pageToken Optional. A tag returned by a previous list
+   * request that was truncated. Use this parameter to continue a previous list
+   * request.
+   * @opt_param int maxResults Optional. Maximum number of results to be returned.
+   * If unspecified, the server will decide how many results to return.
    * @return Google_Service_Dns_ManagedZonesListResponse
    */
   public function listManagedZones($project, $optParams = array())
@@ -435,8 +434,7 @@ class Google_Service_Dns_Projects_Resource extends Google_Service_Resource
   /**
    * Fetch the representation of an existing Project. (projects.get)
    *
-   * @param string $project
-   * Identifies the project addressed by this request.
+   * @param string $project Identifies the project addressed by this request.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Dns_Project
    */
@@ -463,23 +461,20 @@ class Google_Service_Dns_ResourceRecordSets_Resource extends Google_Service_Reso
    * Enumerate ResourceRecordSets that have been created but not yet deleted.
    * (resourceRecordSets.listResourceRecordSets)
    *
-   * @param string $project
-   * Identifies the project addressed by this request.
-   * @param string $managedZone
-   * Identifies the managed zone addressed by this request. Can be the managed zone name or id.
+   * @param string $project Identifies the project addressed by this request.
+   * @param string $managedZone Identifies the managed zone addressed by this
+   * request. Can be the managed zone name or id.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string name
-   * Restricts the list to return only records with this fully qualified domain name.
-   * @opt_param int maxResults
-   * Optional. Maximum number of results to be returned. If unspecified, the server will decide how
-    * many results to return.
-   * @opt_param string pageToken
-   * Optional. A tag returned by a previous list request that was truncated. Use this parameter to
-    * continue a previous list request.
-   * @opt_param string type
-   * Restricts the list to return only records of this type. If present, the "name" parameter must
-    * also be present.
+   * @opt_param string name Restricts the list to return only records with this
+   * fully qualified domain name.
+   * @opt_param int maxResults Optional. Maximum number of results to be returned.
+   * If unspecified, the server will decide how many results to return.
+   * @opt_param string pageToken Optional. A tag returned by a previous list
+   * request that was truncated. Use this parameter to continue a previous list
+   * request.
+   * @opt_param string type Restricts the list to return only records of this
+   * type. If present, the "name" parameter must also be present.
    * @return Google_Service_Dns_ResourceRecordSetsListResponse
    */
   public function listResourceRecordSets($project, $managedZone, $optParams = array())
@@ -496,6 +491,8 @@ class Google_Service_Dns_ResourceRecordSets_Resource extends Google_Service_Reso
 class Google_Service_Dns_Change extends Google_Collection
 {
   protected $collection_key = 'deletions';
+  protected $internal_gapi_mappings = array(
+  );
   protected $additionsType = 'Google_Service_Dns_ResourceRecordSet';
   protected $additionsDataType = 'array';
   protected $deletionsType = 'Google_Service_Dns_ResourceRecordSet';
@@ -505,61 +502,51 @@ class Google_Service_Dns_Change extends Google_Collection
   public $startTime;
   public $status;
 
+
   public function setAdditions($additions)
   {
     $this->additions = $additions;
   }
-
   public function getAdditions()
   {
     return $this->additions;
   }
-
   public function setDeletions($deletions)
   {
     $this->deletions = $deletions;
   }
-
   public function getDeletions()
   {
     return $this->deletions;
   }
-
   public function setId($id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setStartTime($startTime)
   {
     $this->startTime = $startTime;
   }
-
   public function getStartTime()
   {
     return $this->startTime;
   }
-
   public function setStatus($status)
   {
     $this->status = $status;
   }
-
   public function getStatus()
   {
     return $this->status;
@@ -569,36 +556,34 @@ class Google_Service_Dns_Change extends Google_Collection
 class Google_Service_Dns_ChangesListResponse extends Google_Collection
 {
   protected $collection_key = 'changes';
+  protected $internal_gapi_mappings = array(
+  );
   protected $changesType = 'Google_Service_Dns_Change';
   protected $changesDataType = 'array';
   public $kind;
   public $nextPageToken;
 
+
   public function setChanges($changes)
   {
     $this->changes = $changes;
   }
-
   public function getChanges()
   {
     return $this->changes;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
@@ -608,6 +593,8 @@ class Google_Service_Dns_ChangesListResponse extends Google_Collection
 class Google_Service_Dns_ManagedZone extends Google_Collection
 {
   protected $collection_key = 'nameServers';
+  protected $internal_gapi_mappings = array(
+  );
   public $creationTime;
   public $description;
   public $dnsName;
@@ -616,71 +603,59 @@ class Google_Service_Dns_ManagedZone extends Google_Collection
   public $name;
   public $nameServers;
 
+
   public function setCreationTime($creationTime)
   {
     $this->creationTime = $creationTime;
   }
-
   public function getCreationTime()
   {
     return $this->creationTime;
   }
-
   public function setDescription($description)
   {
     $this->description = $description;
   }
-
   public function getDescription()
   {
     return $this->description;
   }
-
   public function setDnsName($dnsName)
   {
     $this->dnsName = $dnsName;
   }
-
   public function getDnsName()
   {
     return $this->dnsName;
   }
-
   public function setId($id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setNameServers($nameServers)
   {
     $this->nameServers = $nameServers;
   }
-
   public function getNameServers()
   {
     return $this->nameServers;
@@ -690,36 +665,34 @@ class Google_Service_Dns_ManagedZone extends Google_Collection
 class Google_Service_Dns_ManagedZonesListResponse extends Google_Collection
 {
   protected $collection_key = 'managedZones';
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   protected $managedZonesType = 'Google_Service_Dns_ManagedZone';
   protected $managedZonesDataType = 'array';
   public $nextPageToken;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setManagedZones($managedZones)
   {
     $this->managedZones = $managedZones;
   }
-
   public function getManagedZones()
   {
     return $this->managedZones;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
@@ -728,47 +701,43 @@ class Google_Service_Dns_ManagedZonesListResponse extends Google_Collection
 
 class Google_Service_Dns_Project extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $id;
   public $kind;
   public $number;
   protected $quotaType = 'Google_Service_Dns_Quota';
   protected $quotaDataType = '';
 
+
   public function setId($id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setNumber($number)
   {
     $this->number = $number;
   }
-
   public function getNumber()
   {
     return $this->number;
   }
-
   public function setQuota(Google_Service_Dns_Quota $quota)
   {
     $this->quota = $quota;
   }
-
   public function getQuota()
   {
     return $this->quota;
@@ -777,6 +746,8 @@ class Google_Service_Dns_Project extends Google_Model
 
 class Google_Service_Dns_Quota extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   public $managedZones;
   public $resourceRecordsPerRrset;
@@ -785,71 +756,59 @@ class Google_Service_Dns_Quota extends Google_Model
   public $rrsetsPerManagedZone;
   public $totalRrdataSizePerChange;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setManagedZones($managedZones)
   {
     $this->managedZones = $managedZones;
   }
-
   public function getManagedZones()
   {
     return $this->managedZones;
   }
-
   public function setResourceRecordsPerRrset($resourceRecordsPerRrset)
   {
     $this->resourceRecordsPerRrset = $resourceRecordsPerRrset;
   }
-
   public function getResourceRecordsPerRrset()
   {
     return $this->resourceRecordsPerRrset;
   }
-
   public function setRrsetAdditionsPerChange($rrsetAdditionsPerChange)
   {
     $this->rrsetAdditionsPerChange = $rrsetAdditionsPerChange;
   }
-
   public function getRrsetAdditionsPerChange()
   {
     return $this->rrsetAdditionsPerChange;
   }
-
   public function setRrsetDeletionsPerChange($rrsetDeletionsPerChange)
   {
     $this->rrsetDeletionsPerChange = $rrsetDeletionsPerChange;
   }
-
   public function getRrsetDeletionsPerChange()
   {
     return $this->rrsetDeletionsPerChange;
   }
-
   public function setRrsetsPerManagedZone($rrsetsPerManagedZone)
   {
     $this->rrsetsPerManagedZone = $rrsetsPerManagedZone;
   }
-
   public function getRrsetsPerManagedZone()
   {
     return $this->rrsetsPerManagedZone;
   }
-
   public function setTotalRrdataSizePerChange($totalRrdataSizePerChange)
   {
     $this->totalRrdataSizePerChange = $totalRrdataSizePerChange;
   }
-
   public function getTotalRrdataSizePerChange()
   {
     return $this->totalRrdataSizePerChange;
@@ -859,57 +818,51 @@ class Google_Service_Dns_Quota extends Google_Model
 class Google_Service_Dns_ResourceRecordSet extends Google_Collection
 {
   protected $collection_key = 'rrdatas';
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   public $name;
   public $rrdatas;
   public $ttl;
   public $type;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setRrdatas($rrdatas)
   {
     $this->rrdatas = $rrdatas;
   }
-
   public function getRrdatas()
   {
     return $this->rrdatas;
   }
-
   public function setTtl($ttl)
   {
     $this->ttl = $ttl;
   }
-
   public function getTtl()
   {
     return $this->ttl;
   }
-
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
@@ -919,36 +872,34 @@ class Google_Service_Dns_ResourceRecordSet extends Google_Collection
 class Google_Service_Dns_ResourceRecordSetsListResponse extends Google_Collection
 {
   protected $collection_key = 'rrsets';
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   public $nextPageToken;
   protected $rrsetsType = 'Google_Service_Dns_ResourceRecordSet';
   protected $rrsetsDataType = 'array';
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
   }
-
   public function setRrsets($rrsets)
   {
     $this->rrsets = $rrsets;
   }
-
   public function getRrsets()
   {
     return $this->rrsets;

lib/google/src/Google/Service/DoubleClickBidManager.php

@@ -19,8 +19,7 @@
  * Service definition for DoubleClickBidManager (v1).
  *
  * <p>
- * API for viewing and managing your reports in DoubleClick Bid Manager.
- * </p>
+ * API for viewing and managing your reports in DoubleClick Bid Manager.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -165,6 +164,7 @@ class Google_Service_DoubleClickBidManager_Lineitems_Resource extends Google_Ser
     $params = array_merge($params, $optParams);
     return $this->call('downloadlineitems', array($params), "Google_Service_DoubleClickBidManager_DownloadLineItemsResponse");
   }
+
   /**
    * Uploads line items in CSV format. (lineitems.uploadlineitems)
    *
@@ -204,12 +204,12 @@ class Google_Service_DoubleClickBidManager_Queries_Resource extends Google_Servi
     $params = array_merge($params, $optParams);
     return $this->call('createquery', array($params), "Google_Service_DoubleClickBidManager_Query");
   }
+
   /**
    * Deletes a stored query as well as the associated stored reports.
    * (queries.deletequery)
    *
-   * @param string $queryId
-   * Query ID to delete.
+   * @param string $queryId Query ID to delete.
    * @param array $optParams Optional parameters.
    */
   public function deletequery($queryId, $optParams = array())
@@ -218,11 +218,11 @@ class Google_Service_DoubleClickBidManager_Queries_Resource extends Google_Servi
     $params = array_merge($params, $optParams);
     return $this->call('deletequery', array($params));
   }
+
   /**
    * Retrieves a stored query. (queries.getquery)
    *
-   * @param string $queryId
-   * Query ID to retrieve.
+   * @param string $queryId Query ID to retrieve.
    * @param array $optParams Optional parameters.
    * @return Google_Service_DoubleClickBidManager_Query
    */
@@ -232,6 +232,7 @@ class Google_Service_DoubleClickBidManager_Queries_Resource extends Google_Servi
     $params = array_merge($params, $optParams);
     return $this->call('getquery', array($params), "Google_Service_DoubleClickBidManager_Query");
   }
+
   /**
    * Retrieves stored queries. (queries.listqueries)
    *
@@ -244,11 +245,11 @@ class Google_Service_DoubleClickBidManager_Queries_Resource extends Google_Servi
     $params = array_merge($params, $optParams);
     return $this->call('listqueries', array($params), "Google_Service_DoubleClickBidManager_ListQueriesResponse");
   }
+
   /**
    * Runs a stored query to generate a report. (queries.runquery)
    *
-   * @param string $queryId
-   * Query ID to run.
+   * @param string $queryId Query ID to run.
    * @param Google_RunQueryRequest $postBody
    * @param array $optParams Optional parameters.
    */
@@ -274,8 +275,7 @@ class Google_Service_DoubleClickBidManager_Reports_Resource extends Google_Servi
   /**
    * Retrieves stored reports. (reports.listreports)
    *
-   * @param string $queryId
-   * Query ID with which the reports are associated.
+   * @param string $queryId Query ID with which the reports are associated.
    * @param array $optParams Optional parameters.
    * @return Google_Service_DoubleClickBidManager_ListReportsResponse
    */
@@ -293,35 +293,33 @@ class Google_Service_DoubleClickBidManager_Reports_Resource extends Google_Servi
 class Google_Service_DoubleClickBidManager_DownloadLineItemsRequest extends Google_Collection
 {
   protected $collection_key = 'filterIds';
+  protected $internal_gapi_mappings = array(
+  );
   public $filterIds;
   public $filterType;
   public $format;
 
+
   public function setFilterIds($filterIds)
   {
     $this->filterIds = $filterIds;
   }
-
   public function getFilterIds()
   {
     return $this->filterIds;
   }
-
   public function setFilterType($filterType)
   {
     $this->filterType = $filterType;
   }
-
   public function getFilterType()
   {
     return $this->filterType;
   }
-
   public function setFormat($format)
   {
     $this->format = $format;
   }
-
   public function getFormat()
   {
     return $this->format;
@@ -330,13 +328,15 @@ class Google_Service_DoubleClickBidManager_DownloadLineItemsRequest extends Goog
 
 class Google_Service_DoubleClickBidManager_DownloadLineItemsResponse extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $lineItems;
 
+
   public function setLineItems($lineItems)
   {
     $this->lineItems = $lineItems;
   }
-
   public function getLineItems()
   {
     return $this->lineItems;
@@ -345,24 +345,24 @@ class Google_Service_DoubleClickBidManager_DownloadLineItemsResponse extends Goo
 
 class Google_Service_DoubleClickBidManager_FilterPair extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $type;
   public $value;
 
+
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
   }
-
   public function setValue($value)
   {
     $this->value = $value;
   }
-
   public function getValue()
   {
     return $this->value;
@@ -372,25 +372,25 @@ class Google_Service_DoubleClickBidManager_FilterPair extends Google_Model
 class Google_Service_DoubleClickBidManager_ListQueriesResponse extends Google_Collection
 {
   protected $collection_key = 'queries';
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   protected $queriesType = 'Google_Service_DoubleClickBidManager_Query';
   protected $queriesDataType = 'array';
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setQueries($queries)
   {
     $this->queries = $queries;
   }
-
   public function getQueries()
   {
     return $this->queries;
@@ -400,25 +400,25 @@ class Google_Service_DoubleClickBidManager_ListQueriesResponse extends Google_Co
 class Google_Service_DoubleClickBidManager_ListReportsResponse extends Google_Collection
 {
   protected $collection_key = 'reports';
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   protected $reportsType = 'Google_Service_DoubleClickBidManager_Report';
   protected $reportsDataType = 'array';
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setReports($reports)
   {
     $this->reports = $reports;
   }
-
   public function getReports()
   {
     return $this->reports;
@@ -428,6 +428,8 @@ class Google_Service_DoubleClickBidManager_ListReportsResponse extends Google_Co
 class Google_Service_DoubleClickBidManager_Parameters extends Google_Collection
 {
   protected $collection_key = 'metrics';
+  protected $internal_gapi_mappings = array(
+  );
   protected $filtersType = 'Google_Service_DoubleClickBidManager_FilterPair';
   protected $filtersDataType = 'array';
   public $groupBys;
@@ -435,51 +437,43 @@ class Google_Service_DoubleClickBidManager_Parameters extends Google_Collection
   public $metrics;
   public $type;
 
+
   public function setFilters($filters)
   {
     $this->filters = $filters;
   }
-
   public function getFilters()
   {
     return $this->filters;
   }
-
   public function setGroupBys($groupBys)
   {
     $this->groupBys = $groupBys;
   }
-
   public function getGroupBys()
   {
     return $this->groupBys;
   }
-
   public function setIncludeInviteData($includeInviteData)
   {
     $this->includeInviteData = $includeInviteData;
   }
-
   public function getIncludeInviteData()
   {
     return $this->includeInviteData;
   }
-
   public function setMetrics($metrics)
   {
     $this->metrics = $metrics;
   }
-
   public function getMetrics()
   {
     return $this->metrics;
   }
-
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
@@ -488,6 +482,8 @@ class Google_Service_DoubleClickBidManager_Parameters extends Google_Collection
 
 class Google_Service_DoubleClickBidManager_Query extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   protected $metadataType = 'Google_Service_DoubleClickBidManager_QueryMetadata';
   protected $metadataDataType = '';
@@ -500,81 +496,67 @@ class Google_Service_DoubleClickBidManager_Query extends Google_Model
   protected $scheduleDataType = '';
   public $timezoneCode;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setMetadata(Google_Service_DoubleClickBidManager_QueryMetadata $metadata)
   {
     $this->metadata = $metadata;
   }
-
   public function getMetadata()
   {
     return $this->metadata;
   }
-
   public function setParams(Google_Service_DoubleClickBidManager_Parameters $params)
   {
     $this->params = $params;
   }
-
   public function getParams()
   {
     return $this->params;
   }
-
   public function setQueryId($queryId)
   {
     $this->queryId = $queryId;
   }
-
   public function getQueryId()
   {
     return $this->queryId;
   }
-
   public function setReportDataEndTimeMs($reportDataEndTimeMs)
   {
     $this->reportDataEndTimeMs = $reportDataEndTimeMs;
   }
-
   public function getReportDataEndTimeMs()
   {
     return $this->reportDataEndTimeMs;
   }
-
   public function setReportDataStartTimeMs($reportDataStartTimeMs)
   {
     $this->reportDataStartTimeMs = $reportDataStartTimeMs;
   }
-
   public function getReportDataStartTimeMs()
   {
     return $this->reportDataStartTimeMs;
   }
-
   public function setSchedule(Google_Service_DoubleClickBidManager_QuerySchedule $schedule)
   {
     $this->schedule = $schedule;
   }
-
   public function getSchedule()
   {
     return $this->schedule;
   }
-
   public function setTimezoneCode($timezoneCode)
   {
     $this->timezoneCode = $timezoneCode;
   }
-
   public function getTimezoneCode()
   {
     return $this->timezoneCode;
@@ -584,6 +566,8 @@ class Google_Service_DoubleClickBidManager_Query extends Google_Model
 class Google_Service_DoubleClickBidManager_QueryMetadata extends Google_Collection
 {
   protected $collection_key = 'shareEmailAddress';
+  protected $internal_gapi_mappings = array(
+  );
   public $dataRange;
   public $format;
   public $googleCloudStoragePathForLatestReport;
@@ -595,101 +579,83 @@ class Google_Service_DoubleClickBidManager_QueryMetadata extends Google_Collecti
   public $shareEmailAddress;
   public $title;
 
+
   public function setDataRange($dataRange)
   {
     $this->dataRange = $dataRange;
   }
-
   public function getDataRange()
   {
     return $this->dataRange;
   }
-
   public function setFormat($format)
   {
     $this->format = $format;
   }
-
   public function getFormat()
   {
     return $this->format;
   }
-
   public function setGoogleCloudStoragePathForLatestReport($googleCloudStoragePathForLatestReport)
   {
     $this->googleCloudStoragePathForLatestReport = $googleCloudStoragePathForLatestReport;
   }
-
   public function getGoogleCloudStoragePathForLatestReport()
   {
     return $this->googleCloudStoragePathForLatestReport;
   }
-
   public function setGoogleDrivePathForLatestReport($googleDrivePathForLatestReport)
   {
     $this->googleDrivePathForLatestReport = $googleDrivePathForLatestReport;
   }
-
   public function getGoogleDrivePathForLatestReport()
   {
     return $this->googleDrivePathForLatestReport;
   }
-
   public function setLatestReportRunTimeMs($latestReportRunTimeMs)
   {
     $this->latestReportRunTimeMs = $latestReportRunTimeMs;
   }
-
   public function getLatestReportRunTimeMs()
   {
     return $this->latestReportRunTimeMs;
   }
-
   public function setReportCount($reportCount)
   {
     $this->reportCount = $reportCount;
   }
-
   public function getReportCount()
   {
     return $this->reportCount;
   }
-
   public function setRunning($running)
   {
     $this->running = $running;
   }
-
   public function getRunning()
   {
     return $this->running;
   }
-
   public function setSendNotification($sendNotification)
   {
     $this->sendNotification = $sendNotification;
   }
-
   public function getSendNotification()
   {
     return $this->sendNotification;
   }
-
   public function setShareEmailAddress($shareEmailAddress)
   {
     $this->shareEmailAddress = $shareEmailAddress;
   }
-
   public function getShareEmailAddress()
   {
     return $this->shareEmailAddress;
   }
-
   public function setTitle($title)
   {
     $this->title = $title;
   }
-
   public function getTitle()
   {
     return $this->title;
@@ -698,46 +664,42 @@ class Google_Service_DoubleClickBidManager_QueryMetadata extends Google_Collecti
 
 class Google_Service_DoubleClickBidManager_QuerySchedule extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $endTimeMs;
   public $frequency;
   public $nextRunMinuteOfDay;
   public $nextRunTimezoneCode;
 
+
   public function setEndTimeMs($endTimeMs)
   {
     $this->endTimeMs = $endTimeMs;
   }
-
   public function getEndTimeMs()
   {
     return $this->endTimeMs;
   }
-
   public function setFrequency($frequency)
   {
     $this->frequency = $frequency;
   }
-
   public function getFrequency()
   {
     return $this->frequency;
   }
-
   public function setNextRunMinuteOfDay($nextRunMinuteOfDay)
   {
     $this->nextRunMinuteOfDay = $nextRunMinuteOfDay;
   }
-
   public function getNextRunMinuteOfDay()
   {
     return $this->nextRunMinuteOfDay;
   }
-
   public function setNextRunTimezoneCode($nextRunTimezoneCode)
   {
     $this->nextRunTimezoneCode = $nextRunTimezoneCode;
   }
-
   public function getNextRunTimezoneCode()
   {
     return $this->nextRunTimezoneCode;
@@ -746,6 +708,8 @@ class Google_Service_DoubleClickBidManager_QuerySchedule extends Google_Model
 
 class Google_Service_DoubleClickBidManager_Report extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   protected $keyType = 'Google_Service_DoubleClickBidManager_ReportKey';
   protected $keyDataType = '';
   protected $metadataType = 'Google_Service_DoubleClickBidManager_ReportMetadata';
@@ -753,31 +717,27 @@ class Google_Service_DoubleClickBidManager_Report extends Google_Model
   protected $paramsType = 'Google_Service_DoubleClickBidManager_Parameters';
   protected $paramsDataType = '';
 
+
   public function setKey(Google_Service_DoubleClickBidManager_ReportKey $key)
   {
     $this->key = $key;
   }
-
   public function getKey()
   {
     return $this->key;
   }
-
   public function setMetadata(Google_Service_DoubleClickBidManager_ReportMetadata $metadata)
   {
     $this->metadata = $metadata;
   }
-
   public function getMetadata()
   {
     return $this->metadata;
   }
-
   public function setParams(Google_Service_DoubleClickBidManager_Parameters $params)
   {
     $this->params = $params;
   }
-
   public function getParams()
   {
     return $this->params;
@@ -786,13 +746,15 @@ class Google_Service_DoubleClickBidManager_Report extends Google_Model
 
 class Google_Service_DoubleClickBidManager_ReportFailure extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $errorCode;
 
+
   public function setErrorCode($errorCode)
   {
     $this->errorCode = $errorCode;
   }
-
   public function getErrorCode()
   {
     return $this->errorCode;
@@ -801,24 +763,24 @@ class Google_Service_DoubleClickBidManager_ReportFailure extends Google_Model
 
 class Google_Service_DoubleClickBidManager_ReportKey extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $queryId;
   public $reportId;
 
+
   public function setQueryId($queryId)
   {
     $this->queryId = $queryId;
   }
-
   public function getQueryId()
   {
     return $this->queryId;
   }
-
   public function setReportId($reportId)
   {
     $this->reportId = $reportId;
   }
-
   public function getReportId()
   {
     return $this->reportId;
@@ -827,47 +789,43 @@ class Google_Service_DoubleClickBidManager_ReportKey extends Google_Model
 
 class Google_Service_DoubleClickBidManager_ReportMetadata extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $googleCloudStoragePath;
   public $reportDataEndTimeMs;
   public $reportDataStartTimeMs;
   protected $statusType = 'Google_Service_DoubleClickBidManager_ReportStatus';
   protected $statusDataType = '';
 
+
   public function setGoogleCloudStoragePath($googleCloudStoragePath)
   {
     $this->googleCloudStoragePath = $googleCloudStoragePath;
   }
-
   public function getGoogleCloudStoragePath()
   {
     return $this->googleCloudStoragePath;
   }
-
   public function setReportDataEndTimeMs($reportDataEndTimeMs)
   {
     $this->reportDataEndTimeMs = $reportDataEndTimeMs;
   }
-
   public function getReportDataEndTimeMs()
   {
     return $this->reportDataEndTimeMs;
   }
-
   public function setReportDataStartTimeMs($reportDataStartTimeMs)
   {
     $this->reportDataStartTimeMs = $reportDataStartTimeMs;
   }
-
   public function getReportDataStartTimeMs()
   {
     return $this->reportDataStartTimeMs;
   }
-
   public function setStatus(Google_Service_DoubleClickBidManager_ReportStatus $status)
   {
     $this->status = $status;
   }
-
   public function getStatus()
   {
     return $this->status;
@@ -876,47 +834,43 @@ class Google_Service_DoubleClickBidManager_ReportMetadata extends Google_Model
 
 class Google_Service_DoubleClickBidManager_ReportStatus extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   protected $failureType = 'Google_Service_DoubleClickBidManager_ReportFailure';
   protected $failureDataType = '';
   public $finishTimeMs;
   public $format;
   public $state;
 
+
   public function setFailure(Google_Service_DoubleClickBidManager_ReportFailure $failure)
   {
     $this->failure = $failure;
   }
-
   public function getFailure()
   {
     return $this->failure;
   }
-
   public function setFinishTimeMs($finishTimeMs)
   {
     $this->finishTimeMs = $finishTimeMs;
   }
-
   public function getFinishTimeMs()
   {
     return $this->finishTimeMs;
   }
-
   public function setFormat($format)
   {
     $this->format = $format;
   }
-
   public function getFormat()
   {
     return $this->format;
   }
-
   public function setState($state)
   {
     $this->state = $state;
   }
-
   public function getState()
   {
     return $this->state;
@@ -926,6 +880,8 @@ class Google_Service_DoubleClickBidManager_ReportStatus extends Google_Model
 class Google_Service_DoubleClickBidManager_RowStatus extends Google_Collection
 {
   protected $collection_key = 'errors';
+  protected $internal_gapi_mappings = array(
+  );
   public $changed;
   public $entityId;
   public $entityName;
@@ -933,61 +889,51 @@ class Google_Service_DoubleClickBidManager_RowStatus extends Google_Collection
   public $persisted;
   public $rowNumber;
 
+
   public function setChanged($changed)
   {
     $this->changed = $changed;
   }
-
   public function getChanged()
   {
     return $this->changed;
   }
-
   public function setEntityId($entityId)
   {
     $this->entityId = $entityId;
   }
-
   public function getEntityId()
   {
     return $this->entityId;
   }
-
   public function setEntityName($entityName)
   {
     $this->entityName = $entityName;
   }
-
   public function getEntityName()
   {
     return $this->entityName;
   }
-
   public function setErrors($errors)
   {
     $this->errors = $errors;
   }
-
   public function getErrors()
   {
     return $this->errors;
   }
-
   public function setPersisted($persisted)
   {
     $this->persisted = $persisted;
   }
-
   public function getPersisted()
   {
     return $this->persisted;
   }
-
   public function setRowNumber($rowNumber)
   {
     $this->rowNumber = $rowNumber;
   }
-
   public function getRowNumber()
   {
     return $this->rowNumber;
@@ -996,46 +942,42 @@ class Google_Service_DoubleClickBidManager_RowStatus extends Google_Collection
 
 class Google_Service_DoubleClickBidManager_RunQueryRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $dataRange;
   public $reportDataEndTimeMs;
   public $reportDataStartTimeMs;
   public $timezoneCode;
 
+
   public function setDataRange($dataRange)
   {
     $this->dataRange = $dataRange;
   }
-
   public function getDataRange()
   {
     return $this->dataRange;
   }
-
   public function setReportDataEndTimeMs($reportDataEndTimeMs)
   {
     $this->reportDataEndTimeMs = $reportDataEndTimeMs;
   }
-
   public function getReportDataEndTimeMs()
   {
     return $this->reportDataEndTimeMs;
   }
-
   public function setReportDataStartTimeMs($reportDataStartTimeMs)
   {
     $this->reportDataStartTimeMs = $reportDataStartTimeMs;
   }
-
   public function getReportDataStartTimeMs()
   {
     return $this->reportDataStartTimeMs;
   }
-
   public function setTimezoneCode($timezoneCode)
   {
     $this->timezoneCode = $timezoneCode;
   }
-
   public function getTimezoneCode()
   {
     return $this->timezoneCode;
@@ -1044,35 +986,33 @@ class Google_Service_DoubleClickBidManager_RunQueryRequest extends Google_Model
 
 class Google_Service_DoubleClickBidManager_UploadLineItemsRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $dryRun;
   public $format;
   public $lineItems;
 
+
   public function setDryRun($dryRun)
   {
     $this->dryRun = $dryRun;
   }
-
   public function getDryRun()
   {
     return $this->dryRun;
   }
-
   public function setFormat($format)
   {
     $this->format = $format;
   }
-
   public function getFormat()
   {
     return $this->format;
   }
-
   public function setLineItems($lineItems)
   {
     $this->lineItems = $lineItems;
   }
-
   public function getLineItems()
   {
     return $this->lineItems;
@@ -1081,14 +1021,16 @@ class Google_Service_DoubleClickBidManager_UploadLineItemsRequest extends Google
 
 class Google_Service_DoubleClickBidManager_UploadLineItemsResponse extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   protected $uploadStatusType = 'Google_Service_DoubleClickBidManager_UploadStatus';
   protected $uploadStatusDataType = '';
 
+
   public function setUploadStatus(Google_Service_DoubleClickBidManager_UploadStatus $uploadStatus)
   {
     $this->uploadStatus = $uploadStatus;
   }
-
   public function getUploadStatus()
   {
     return $this->uploadStatus;
@@ -1098,25 +1040,25 @@ class Google_Service_DoubleClickBidManager_UploadLineItemsResponse extends Googl
 class Google_Service_DoubleClickBidManager_UploadStatus extends Google_Collection
 {
   protected $collection_key = 'rowStatus';
+  protected $internal_gapi_mappings = array(
+  );
   public $errors;
   protected $rowStatusType = 'Google_Service_DoubleClickBidManager_RowStatus';
   protected $rowStatusDataType = 'array';
 
+
   public function setErrors($errors)
   {
     $this->errors = $errors;
   }
-
   public function getErrors()
   {
     return $this->errors;
   }
-
   public function setRowStatus($rowStatus)
   {
     $this->rowStatus = $rowStatus;
   }
-
   public function getRowStatus()
   {
     return $this->rowStatus;

lib/google/src/Google/Service/Exception.php

@@ -1,6 +1,6 @@
 <?php
 
-require_once 'Google/Exception.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 class Google_Service_Exception extends Google_Exception
 {

lib/google/src/Google/Service/Freebase.php

@@ -19,8 +19,7 @@
  * Service definition for Freebase (v1).
  *
  * <p>
- * Find Freebase entities using textual queries and other constraints.
- * </p>
+ * Find Freebase entities using textual queries and other constraints.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -200,19 +199,14 @@ class Google_Service_Freebase extends Google_Service
    *
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string lang
-   * Languages for names and values. First language is used for display. Default is 'en'.
-   * @opt_param float confidence
-   * Required confidence for a candidate to match. Must be between .5 and 1.0
-   * @opt_param string name
-   * Name of entity.
-   * @opt_param string kind
-   * Classifications of entity e.g. type, category, title.
-   * @opt_param string prop
-   * Property values for entity formatted as
-  :
-   * @opt_param int limit
-   * Maximum number of candidates to return.
+   * @opt_param string lang Languages for names and values. First language is used
+   * for display. Default is 'en'.
+   * @opt_param float confidence Required confidence for a candidate to match.
+   * Must be between .5 and 1.0
+   * @opt_param string name Name of entity.
+   * @opt_param string kind Classifications of entity e.g. type, category, title.
+   * @opt_param string prop Property values for entity formatted as :
+   * @opt_param int limit Maximum number of candidates to return.
    * @return Google_Service_Freebase_ReconcileGet
    */
   public function reconcile($optParams = array())
@@ -226,58 +220,40 @@ class Google_Service_Freebase extends Google_Service
    *
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string domain
-   * Restrict to topics with this Freebase domain id.
-   * @opt_param string help
-   * The keyword to request help on.
-   * @opt_param string query
-   * Query term to search for.
-   * @opt_param string scoring
-   * Relevance scoring algorithm to use.
-   * @opt_param int cursor
-   * The cursor value to use for the next page of results.
-   * @opt_param bool prefixed
-   * Prefix match against names and aliases.
-   * @opt_param bool exact
-   * Query on exact name and keys only.
-   * @opt_param string mid
-   * A mid to use instead of a query.
-   * @opt_param string encode
-   * The encoding of the response. You can use this parameter to enable html encoding.
-   * @opt_param string type
-   * Restrict to topics with this Freebase type id.
-   * @opt_param string as_of_time
-   * A mql as_of_time value to use with mql_output queries.
-   * @opt_param bool stemmed
-   * Query on stemmed names and aliases. May not be used with prefixed.
-   * @opt_param string format
-   * Structural format of the json response.
-   * @opt_param string spell
-   * Request 'did you mean' suggestions
-   * @opt_param string with
-   * A rule to match against.
-   * @opt_param string lang
-   * The code of the language to run the query with. Default is 'en'.
-   * @opt_param bool indent
-   * Whether to indent the json results or not.
-   * @opt_param string filter
-   * A filter to apply to the query.
-   * @opt_param string callback
-   * JS method name for JSONP callbacks.
-   * @opt_param string without
-   * A rule to not match against.
-   * @opt_param int limit
-   * Maximum number of results to return.
-   * @opt_param string output
-   * An output expression to request data from matches.
-   * @opt_param string mql_output
-   * The MQL query to run againist the results to extract more data.
+   * @opt_param string domain Restrict to topics with this Freebase domain id.
+   * @opt_param string help The keyword to request help on.
+   * @opt_param string query Query term to search for.
+   * @opt_param string scoring Relevance scoring algorithm to use.
+   * @opt_param int cursor The cursor value to use for the next page of results.
+   * @opt_param bool prefixed Prefix match against names and aliases.
+   * @opt_param bool exact Query on exact name and keys only.
+   * @opt_param string mid A mid to use instead of a query.
+   * @opt_param string encode The encoding of the response. You can use this
+   * parameter to enable html encoding.
+   * @opt_param string type Restrict to topics with this Freebase type id.
+   * @opt_param string as_of_time A mql as_of_time value to use with mql_output
+   * queries.
+   * @opt_param bool stemmed Query on stemmed names and aliases. May not be used
+   * with prefixed.
+   * @opt_param string format Structural format of the json response.
+   * @opt_param string spell Request 'did you mean' suggestions
+   * @opt_param string with A rule to match against.
+   * @opt_param string lang The code of the language to run the query with.
+   * Default is 'en'.
+   * @opt_param bool indent Whether to indent the json results or not.
+   * @opt_param string filter A filter to apply to the query.
+   * @opt_param string callback JS method name for JSONP callbacks.
+   * @opt_param string without A rule to not match against.
+   * @opt_param int limit Maximum number of results to return.
+   * @opt_param string output An output expression to request data from matches.
+   * @opt_param string mql_output The MQL query to run againist the results to
+   * extract more data.
    */
   public function search($optParams = array())
   {
     $params = array();
     $params = array_merge($params, $optParams);
-    return $this->call('search', array($params));
+    return $this->base_methods->call('search', array($params));
   }
 }
 
@@ -287,6 +263,8 @@ class Google_Service_Freebase extends Google_Service
 
 class Google_Service_Freebase_ReconcileCandidate extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $confidence;
   public $lang;
   public $mid;
@@ -294,51 +272,43 @@ class Google_Service_Freebase_ReconcileCandidate extends Google_Model
   protected $notableType = 'Google_Service_Freebase_ReconcileCandidateNotable';
   protected $notableDataType = '';
 
+
   public function setConfidence($confidence)
   {
     $this->confidence = $confidence;
   }
-
   public function getConfidence()
   {
     return $this->confidence;
   }
-
   public function setLang($lang)
   {
     $this->lang = $lang;
   }
-
   public function getLang()
   {
     return $this->lang;
   }
-
   public function setMid($mid)
   {
     $this->mid = $mid;
   }
-
   public function getMid()
   {
     return $this->mid;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setNotable(Google_Service_Freebase_ReconcileCandidateNotable $notable)
   {
     $this->notable = $notable;
   }
-
   public function getNotable()
   {
     return $this->notable;
@@ -347,24 +317,24 @@ class Google_Service_Freebase_ReconcileCandidate extends Google_Model
 
 class Google_Service_Freebase_ReconcileCandidateNotable extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $id;
   public $name;
 
+
   public function setId($id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
@@ -374,6 +344,8 @@ class Google_Service_Freebase_ReconcileCandidateNotable extends Google_Model
 class Google_Service_Freebase_ReconcileGet extends Google_Collection
 {
   protected $collection_key = 'warning';
+  protected $internal_gapi_mappings = array(
+  );
   protected $candidateType = 'Google_Service_Freebase_ReconcileCandidate';
   protected $candidateDataType = 'array';
   protected $costsType = 'Google_Service_Freebase_ReconcileGetCosts';
@@ -383,41 +355,35 @@ class Google_Service_Freebase_ReconcileGet extends Google_Collection
   protected $warningType = 'Google_Service_Freebase_ReconcileGetWarning';
   protected $warningDataType = 'array';
 
+
   public function setCandidate($candidate)
   {
     $this->candidate = $candidate;
   }
-
   public function getCandidate()
   {
     return $this->candidate;
   }
-
   public function setCosts(Google_Service_Freebase_ReconcileGetCosts $costs)
   {
     $this->costs = $costs;
   }
-
   public function getCosts()
   {
     return $this->costs;
   }
-
   public function setMatch(Google_Service_Freebase_ReconcileCandidate $match)
   {
     $this->match = $match;
   }
-
   public function getMatch()
   {
     return $this->match;
   }
-
   public function setWarning($warning)
   {
     $this->warning = $warning;
   }
-
   public function getWarning()
   {
     return $this->warning;
@@ -426,24 +392,24 @@ class Google_Service_Freebase_ReconcileGet extends Google_Collection
 
 class Google_Service_Freebase_ReconcileGetCosts extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $hits;
   public $ms;
 
+
   public function setHits($hits)
   {
     $this->hits = $hits;
   }
-
   public function getHits()
   {
     return $this->hits;
   }
-
   public function setMs($ms)
   {
     $this->ms = $ms;
   }
-
   public function getMs()
   {
     return $this->ms;
@@ -452,35 +418,33 @@ class Google_Service_Freebase_ReconcileGetCosts extends Google_Model
 
 class Google_Service_Freebase_ReconcileGetWarning extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $location;
   public $message;
   public $reason;
 
+
   public function setLocation($location)
   {
     $this->location = $location;
   }
-
   public function getLocation()
   {
     return $this->location;
   }
-
   public function setMessage($message)
   {
     $this->message = $message;
   }
-
   public function getMessage()
   {
     return $this->message;
   }
-
   public function setReason($reason)
   {
     $this->reason = $reason;
   }
-
   public function getReason()
   {
     return $this->reason;

lib/google/src/Google/Service/GroupsMigration.php

@@ -19,8 +19,7 @@
  * Service definition for GroupsMigration (v1).
  *
  * <p>
- * Groups Migration Api.
- * </p>
+ * Groups Migration Api.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -86,8 +85,7 @@ class Google_Service_GroupsMigration_Archive_Resource extends Google_Service_Res
   /**
    * Inserts a new mail into the archive of the Google group. (archive.insert)
    *
-   * @param string $groupId
-   * The group ID
+   * @param string $groupId The group ID
    * @param array $optParams Optional parameters.
    * @return Google_Service_GroupsMigration_Groups
    */
@@ -104,24 +102,24 @@ class Google_Service_GroupsMigration_Archive_Resource extends Google_Service_Res
 
 class Google_Service_GroupsMigration_Groups extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   public $responseCode;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setResponseCode($responseCode)
   {
     $this->responseCode = $responseCode;
   }
-
   public function getResponseCode()
   {
     return $this->responseCode;

lib/google/src/Google/Service/Groupssettings.php

@@ -19,8 +19,7 @@
  * Service definition for Groupssettings (v1).
  *
  * <p>
- * Lets you manage permission levels and related settings of a group.
- * </p>
+ * Lets you manage permission levels and related settings of a group.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -32,7 +31,8 @@
 class Google_Service_Groupssettings extends Google_Service
 {
   /** View and manage the settings of a Google Apps Group. */
-  const APPS_GROUPS_SETTINGS = "https://www.googleapis.com/auth/apps.groups.settings";
+  const APPS_GROUPS_SETTINGS =
+      "https://www.googleapis.com/auth/apps.groups.settings";
 
   public $groups;
   
@@ -107,8 +107,7 @@ class Google_Service_Groupssettings_Groups_Resource extends Google_Service_Resou
   /**
    * Gets one resource by id. (groups.get)
    *
-   * @param string $groupUniqueId
-   * The resource ID
+   * @param string $groupUniqueId The resource ID
    * @param array $optParams Optional parameters.
    * @return Google_Service_Groupssettings_Groups
    */
@@ -118,12 +117,12 @@ class Google_Service_Groupssettings_Groups_Resource extends Google_Service_Resou
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_Groupssettings_Groups");
   }
+
   /**
    * Updates an existing resource. This method supports patch semantics.
    * (groups.patch)
    *
-   * @param string $groupUniqueId
-   * The resource ID
+   * @param string $groupUniqueId The resource ID
    * @param Google_Groups $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Groupssettings_Groups
@@ -134,11 +133,11 @@ class Google_Service_Groupssettings_Groups_Resource extends Google_Service_Resou
     $params = array_merge($params, $optParams);
     return $this->call('patch', array($params), "Google_Service_Groupssettings_Groups");
   }
+
   /**
    * Updates an existing resource. (groups.update)
    *
-   * @param string $groupUniqueId
-   * The resource ID
+   * @param string $groupUniqueId The resource ID
    * @param Google_Groups $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Groupssettings_Groups
@@ -156,6 +155,8 @@ class Google_Service_Groupssettings_Groups_Resource extends Google_Service_Resou
 
 class Google_Service_Groupssettings_Groups extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $allowExternalMembers;
   public $allowGoogleCommunication;
   public $allowWebPosting;
@@ -185,281 +186,227 @@ class Google_Service_Groupssettings_Groups extends Google_Model
   public $whoCanViewGroup;
   public $whoCanViewMembership;
 
+
   public function setAllowExternalMembers($allowExternalMembers)
   {
     $this->allowExternalMembers = $allowExternalMembers;
   }
-
   public function getAllowExternalMembers()
   {
     return $this->allowExternalMembers;
   }
-
   public function setAllowGoogleCommunication($allowGoogleCommunication)
   {
     $this->allowGoogleCommunication = $allowGoogleCommunication;
   }
-
   public function getAllowGoogleCommunication()
   {
     return $this->allowGoogleCommunication;
   }
-
   public function setAllowWebPosting($allowWebPosting)
   {
     $this->allowWebPosting = $allowWebPosting;
   }
-
   public function getAllowWebPosting()
   {
     return $this->allowWebPosting;
   }
-
   public function setArchiveOnly($archiveOnly)
   {
     $this->archiveOnly = $archiveOnly;
   }
-
   public function getArchiveOnly()
   {
     return $this->archiveOnly;
   }
-
   public function setCustomReplyTo($customReplyTo)
   {
     $this->customReplyTo = $customReplyTo;
   }
-
   public function getCustomReplyTo()
   {
     return $this->customReplyTo;
   }
-
   public function setDefaultMessageDenyNotificationText($defaultMessageDenyNotificationText)
   {
     $this->defaultMessageDenyNotificationText = $defaultMessageDenyNotificationText;
   }
-
   public function getDefaultMessageDenyNotificationText()
   {
     return $this->defaultMessageDenyNotificationText;
   }
-
   public function setDescription($description)
   {
     $this->description = $description;
   }
-
   public function getDescription()
   {
     return $this->description;
   }
-
   public function setEmail($email)
   {
     $this->email = $email;
   }
-
   public function getEmail()
   {
     return $this->email;
   }
-
   public function setIncludeInGlobalAddressList($includeInGlobalAddressList)
   {
     $this->includeInGlobalAddressList = $includeInGlobalAddressList;
   }
-
   public function getIncludeInGlobalAddressList()
   {
     return $this->includeInGlobalAddressList;
   }
-
   public function setIsArchived($isArchived)
   {
     $this->isArchived = $isArchived;
   }
-
   public function getIsArchived()
   {
     return $this->isArchived;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setMaxMessageBytes($maxMessageBytes)
   {
     $this->maxMessageBytes = $maxMessageBytes;
   }
-
   public function getMaxMessageBytes()
   {
     return $this->maxMessageBytes;
   }
-
   public function setMembersCanPostAsTheGroup($membersCanPostAsTheGroup)
   {
     $this->membersCanPostAsTheGroup = $membersCanPostAsTheGroup;
   }
-
   public function getMembersCanPostAsTheGroup()
   {
     return $this->membersCanPostAsTheGroup;
   }
-
   public function setMessageDisplayFont($messageDisplayFont)
   {
     $this->messageDisplayFont = $messageDisplayFont;
   }
-
   public function getMessageDisplayFont()
   {
     return $this->messageDisplayFont;
   }
-
   public function setMessageModerationLevel($messageModerationLevel)
   {
     $this->messageModerationLevel = $messageModerationLevel;
   }
-
   public function getMessageModerationLevel()
   {
     return $this->messageModerationLevel;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setPrimaryLanguage($primaryLanguage)
   {
     $this->primaryLanguage = $primaryLanguage;
   }
-
   public function getPrimaryLanguage()
   {
     return $this->primaryLanguage;
   }
-
   public function setReplyTo($replyTo)
   {
     $this->replyTo = $replyTo;
   }
-
   public function getReplyTo()
   {
     return $this->replyTo;
   }
-
   public function setSendMessageDenyNotification($sendMessageDenyNotification)
   {
     $this->sendMessageDenyNotification = $sendMessageDenyNotification;
   }
-
   public function getSendMessageDenyNotification()
   {
     return $this->sendMessageDenyNotification;
   }
-
   public function setShowInGroupDirectory($showInGroupDirectory)
   {
     $this->showInGroupDirectory = $showInGroupDirectory;
   }
-
   public function getShowInGroupDirectory()
   {
     return $this->showInGroupDirectory;
   }
-
   public function setSpamModerationLevel($spamModerationLevel)
   {
     $this->spamModerationLevel = $spamModerationLevel;
   }
-
   public function getSpamModerationLevel()
   {
     return $this->spamModerationLevel;
   }
-
   public function setWhoCanContactOwner($whoCanContactOwner)
   {
     $this->whoCanContactOwner = $whoCanContactOwner;
   }
-
   public function getWhoCanContactOwner()
   {
     return $this->whoCanContactOwner;
   }
-
   public function setWhoCanInvite($whoCanInvite)
   {
     $this->whoCanInvite = $whoCanInvite;
   }
-
   public function getWhoCanInvite()
   {
     return $this->whoCanInvite;
   }
-
   public function setWhoCanJoin($whoCanJoin)
   {
     $this->whoCanJoin = $whoCanJoin;
   }
-
   public function getWhoCanJoin()
   {
     return $this->whoCanJoin;
   }
-
   public function setWhoCanLeaveGroup($whoCanLeaveGroup)
   {
     $this->whoCanLeaveGroup = $whoCanLeaveGroup;
   }
-
   public function getWhoCanLeaveGroup()
   {
     return $this->whoCanLeaveGroup;
   }
-
   public function setWhoCanPostMessage($whoCanPostMessage)
   {
     $this->whoCanPostMessage = $whoCanPostMessage;
   }
-
   public function getWhoCanPostMessage()
   {
     return $this->whoCanPostMessage;
   }
-
   public function setWhoCanViewGroup($whoCanViewGroup)
   {
     $this->whoCanViewGroup = $whoCanViewGroup;
   }
-
   public function getWhoCanViewGroup()
   {
     return $this->whoCanViewGroup;
   }
-
   public function setWhoCanViewMembership($whoCanViewMembership)
   {
     $this->whoCanViewMembership = $whoCanViewMembership;
   }
-
   public function getWhoCanViewMembership()
   {
     return $this->whoCanViewMembership;

lib/google/src/Google/Service/Licensing.php

@@ -19,8 +19,7 @@
  * Service definition for Licensing (v1).
  *
  * <p>
- * Licensing API to view and manage license for your domain.
- * </p>
+ * Licensing API to view and manage license for your domain.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -222,12 +221,9 @@ class Google_Service_Licensing_LicenseAssignments_Resource extends Google_Servic
   /**
    * Revoke License. (licenseAssignments.delete)
    *
-   * @param string $productId
-   * Name for product
-   * @param string $skuId
-   * Name for sku
-   * @param string $userId
-   * email id or unique Id of the user
+   * @param string $productId Name for product
+   * @param string $skuId Name for sku
+   * @param string $userId email id or unique Id of the user
    * @param array $optParams Optional parameters.
    */
   public function delete($productId, $skuId, $userId, $optParams = array())
@@ -236,16 +232,14 @@ class Google_Service_Licensing_LicenseAssignments_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('delete', array($params));
   }
+
   /**
    * Get license assignment of a particular product and sku for a user
    * (licenseAssignments.get)
    *
-   * @param string $productId
-   * Name for product
-   * @param string $skuId
-   * Name for sku
-   * @param string $userId
-   * email id or unique Id of the user
+   * @param string $productId Name for product
+   * @param string $skuId Name for sku
+   * @param string $userId email id or unique Id of the user
    * @param array $optParams Optional parameters.
    * @return Google_Service_Licensing_LicenseAssignment
    */
@@ -255,13 +249,12 @@ class Google_Service_Licensing_LicenseAssignments_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_Licensing_LicenseAssignment");
   }
+
   /**
    * Assign License. (licenseAssignments.insert)
    *
-   * @param string $productId
-   * Name for product
-   * @param string $skuId
-   * Name for sku
+   * @param string $productId Name for product
+   * @param string $skuId Name for sku
    * @param Google_LicenseAssignmentInsert $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Licensing_LicenseAssignment
@@ -272,21 +265,20 @@ class Google_Service_Licensing_LicenseAssignments_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('insert', array($params), "Google_Service_Licensing_LicenseAssignment");
   }
+
   /**
    * List license assignments for given product of the customer.
    * (licenseAssignments.listForProduct)
    *
-   * @param string $productId
-   * Name for product
-   * @param string $customerId
-   * CustomerId represents the customer for whom licenseassignments are queried
+   * @param string $productId Name for product
+   * @param string $customerId CustomerId represents the customer for whom
+   * licenseassignments are queried
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string pageToken
-   * Token to fetch the next page.Optional. By default server will return first page
-   * @opt_param string maxResults
-   * Maximum number of campaigns to return at one time. Must be positive. Optional. Default value is
-    * 100.
+   * @opt_param string pageToken Token to fetch the next page.Optional. By default
+   * server will return first page
+   * @opt_param string maxResults Maximum number of campaigns to return at one
+   * time. Must be positive. Optional. Default value is 100.
    * @return Google_Service_Licensing_LicenseAssignmentList
    */
   public function listForProduct($productId, $customerId, $optParams = array())
@@ -295,23 +287,21 @@ class Google_Service_Licensing_LicenseAssignments_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('listForProduct', array($params), "Google_Service_Licensing_LicenseAssignmentList");
   }
+
   /**
    * List license assignments for given product and sku of the customer.
    * (licenseAssignments.listForProductAndSku)
    *
-   * @param string $productId
-   * Name for product
-   * @param string $skuId
-   * Name for sku
-   * @param string $customerId
-   * CustomerId represents the customer for whom licenseassignments are queried
+   * @param string $productId Name for product
+   * @param string $skuId Name for sku
+   * @param string $customerId CustomerId represents the customer for whom
+   * licenseassignments are queried
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string pageToken
-   * Token to fetch the next page.Optional. By default server will return first page
-   * @opt_param string maxResults
-   * Maximum number of campaigns to return at one time. Must be positive. Optional. Default value is
-    * 100.
+   * @opt_param string pageToken Token to fetch the next page.Optional. By default
+   * server will return first page
+   * @opt_param string maxResults Maximum number of campaigns to return at one
+   * time. Must be positive. Optional. Default value is 100.
    * @return Google_Service_Licensing_LicenseAssignmentList
    */
   public function listForProductAndSku($productId, $skuId, $customerId, $optParams = array())
@@ -320,16 +310,14 @@ class Google_Service_Licensing_LicenseAssignments_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('listForProductAndSku', array($params), "Google_Service_Licensing_LicenseAssignmentList");
   }
+
   /**
    * Assign License. This method supports patch semantics.
    * (licenseAssignments.patch)
    *
-   * @param string $productId
-   * Name for product
-   * @param string $skuId
-   * Name for sku for which license would be revoked
-   * @param string $userId
-   * email id or unique Id of the user
+   * @param string $productId Name for product
+   * @param string $skuId Name for sku for which license would be revoked
+   * @param string $userId email id or unique Id of the user
    * @param Google_LicenseAssignment $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Licensing_LicenseAssignment
@@ -340,15 +328,13 @@ class Google_Service_Licensing_LicenseAssignments_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('patch', array($params), "Google_Service_Licensing_LicenseAssignment");
   }
+
   /**
    * Assign License. (licenseAssignments.update)
    *
-   * @param string $productId
-   * Name for product
-   * @param string $skuId
-   * Name for sku for which license would be revoked
-   * @param string $userId
-   * email id or unique Id of the user
+   * @param string $productId Name for product
+   * @param string $skuId Name for sku for which license would be revoked
+   * @param string $userId email id or unique Id of the user
    * @param Google_LicenseAssignment $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Licensing_LicenseAssignment
@@ -366,6 +352,8 @@ class Google_Service_Licensing_LicenseAssignments_Resource extends Google_Servic
 
 class Google_Service_Licensing_LicenseAssignment extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $etags;
   public $kind;
   public $productId;
@@ -373,61 +361,51 @@ class Google_Service_Licensing_LicenseAssignment extends Google_Model
   public $skuId;
   public $userId;
 
+
   public function setEtags($etags)
   {
     $this->etags = $etags;
   }
-
   public function getEtags()
   {
     return $this->etags;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setProductId($productId)
   {
     $this->productId = $productId;
   }
-
   public function getProductId()
   {
     return $this->productId;
   }
-
   public function setSelfLink($selfLink)
   {
     $this->selfLink = $selfLink;
   }
-
   public function getSelfLink()
   {
     return $this->selfLink;
   }
-
   public function setSkuId($skuId)
   {
     $this->skuId = $skuId;
   }
-
   public function getSkuId()
   {
     return $this->skuId;
   }
-
   public function setUserId($userId)
   {
     $this->userId = $userId;
   }
-
   public function getUserId()
   {
     return $this->userId;
@@ -436,13 +414,15 @@ class Google_Service_Licensing_LicenseAssignment extends Google_Model
 
 class Google_Service_Licensing_LicenseAssignmentInsert extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $userId;
 
+
   public function setUserId($userId)
   {
     $this->userId = $userId;
   }
-
   public function getUserId()
   {
     return $this->userId;
@@ -452,47 +432,43 @@ class Google_Service_Licensing_LicenseAssignmentInsert extends Google_Model
 class Google_Service_Licensing_LicenseAssignmentList extends Google_Collection
 {
   protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   protected $itemsType = 'Google_Service_Licensing_LicenseAssignment';
   protected $itemsDataType = 'array';
   public $kind;
   public $nextPageToken;
 
+
   public function setEtag($etag)
   {
     $this->etag = $etag;
   }
-
   public function getEtag()
   {
     return $this->etag;
   }
-
   public function setItems($items)
   {
     $this->items = $items;
   }
-
   public function getItems()
   {
     return $this->items;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;

lib/google/src/Google/Service/Oauth2.php

@@ -19,8 +19,7 @@
  * Service definition for Oauth2 (v2).
  *
  * <p>
- * Lets you access OAuth2 protocol related APIs.
- * </p>
+ * Lets you access OAuth2 protocol related APIs.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -32,13 +31,17 @@
 class Google_Service_Oauth2 extends Google_Service
 {
   /** Know your basic profile info and list of people in your circles.. */
-  const PLUS_LOGIN = "https://www.googleapis.com/auth/plus.login";
+  const PLUS_LOGIN =
+      "https://www.googleapis.com/auth/plus.login";
   /** Know who you are on Google. */
-  const PLUS_ME = "https://www.googleapis.com/auth/plus.me";
+  const PLUS_ME =
+      "https://www.googleapis.com/auth/plus.me";
   /** View your email address. */
-  const USERINFO_EMAIL = "https://www.googleapis.com/auth/userinfo.email";
+  const USERINFO_EMAIL =
+      "https://www.googleapis.com/auth/userinfo.email";
   /** View your basic profile info. */
-  const USERINFO_PROFILE = "https://www.googleapis.com/auth/userinfo.profile";
+  const USERINFO_PROFILE =
+      "https://www.googleapis.com/auth/userinfo.profile";
 
   public $userinfo;
   public $userinfo_v2_me;
@@ -114,9 +117,7 @@ class Google_Service_Oauth2 extends Google_Service
    * @param array $optParams Optional parameters.
    *
    * @opt_param string access_token
-   *
    * @opt_param string id_token
-   *
    * @return Google_Service_Oauth2_Tokeninfo
    */
   public function tokeninfo($optParams = array())
@@ -163,7 +164,6 @@ class Google_Service_Oauth2_Userinfo_Resource extends Google_Service_Resource
  */
 class Google_Service_Oauth2_UserinfoV2_Resource extends Google_Service_Resource
 {
-
 }
 
 /**
@@ -196,6 +196,13 @@ class Google_Service_Oauth2_UserinfoV2Me_Resource extends Google_Service_Resourc
 
 class Google_Service_Oauth2_Tokeninfo extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+        "accessType" => "access_type",
+        "expiresIn" => "expires_in",
+        "issuedTo" => "issued_to",
+        "userId" => "user_id",
+        "verifiedEmail" => "verified_email",
+  );
   public $accessType;
   public $audience;
   public $email;
@@ -205,81 +212,67 @@ class Google_Service_Oauth2_Tokeninfo extends Google_Model
   public $userId;
   public $verifiedEmail;
 
+
   public function setAccessType($accessType)
   {
     $this->accessType = $accessType;
   }
-
   public function getAccessType()
   {
     return $this->accessType;
   }
-
   public function setAudience($audience)
   {
     $this->audience = $audience;
   }
-
   public function getAudience()
   {
     return $this->audience;
   }
-
   public function setEmail($email)
   {
     $this->email = $email;
   }
-
   public function getEmail()
   {
     return $this->email;
   }
-
   public function setExpiresIn($expiresIn)
   {
     $this->expiresIn = $expiresIn;
   }
-
   public function getExpiresIn()
   {
     return $this->expiresIn;
   }
-
   public function setIssuedTo($issuedTo)
   {
     $this->issuedTo = $issuedTo;
   }
-
   public function getIssuedTo()
   {
     return $this->issuedTo;
   }
-
   public function setScope($scope)
   {
     $this->scope = $scope;
   }
-
   public function getScope()
   {
     return $this->scope;
   }
-
   public function setUserId($userId)
   {
     $this->userId = $userId;
   }
-
   public function getUserId()
   {
     return $this->userId;
   }
-
   public function setVerifiedEmail($verifiedEmail)
   {
     $this->verifiedEmail = $verifiedEmail;
   }
-
   public function getVerifiedEmail()
   {
     return $this->verifiedEmail;
@@ -288,6 +281,11 @@ class Google_Service_Oauth2_Tokeninfo extends Google_Model
 
 class Google_Service_Oauth2_Userinfoplus extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+        "familyName" => "family_name",
+        "givenName" => "given_name",
+        "verifiedEmail" => "verified_email",
+  );
   public $email;
   public $familyName;
   public $gender;
@@ -300,111 +298,91 @@ class Google_Service_Oauth2_Userinfoplus extends Google_Model
   public $picture;
   public $verifiedEmail;
 
+
   public function setEmail($email)
   {
     $this->email = $email;
   }
-
   public function getEmail()
   {
     return $this->email;
   }
-
   public function setFamilyName($familyName)
   {
     $this->familyName = $familyName;
   }
-
   public function getFamilyName()
   {
     return $this->familyName;
   }
-
   public function setGender($gender)
   {
     $this->gender = $gender;
   }
-
   public function getGender()
   {
     return $this->gender;
   }
-
   public function setGivenName($givenName)
   {
     $this->givenName = $givenName;
   }
-
   public function getGivenName()
   {
     return $this->givenName;
   }
-
   public function setHd($hd)
   {
     $this->hd = $hd;
   }
-
   public function getHd()
   {
     return $this->hd;
   }
-
   public function setId($id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setLink($link)
   {
     $this->link = $link;
   }
-
   public function getLink()
   {
     return $this->link;
   }
-
   public function setLocale($locale)
   {
     $this->locale = $locale;
   }
-
   public function getLocale()
   {
     return $this->locale;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setPicture($picture)
   {
     $this->picture = $picture;
   }
-
   public function getPicture()
   {
     return $this->picture;
   }
-
   public function setVerifiedEmail($verifiedEmail)
   {
     $this->verifiedEmail = $verifiedEmail;
   }
-
   public function getVerifiedEmail()
   {
     return $this->verifiedEmail;

lib/google/src/Google/Service/Pagespeedonline.php

@@ -19,8 +19,8 @@
  * Service definition for Pagespeedonline (v1).
  *
  * <p>
- * Lets you analyze the performance of a web page and get tailored suggestions to make that page faster.
- * </p>
+ * Lets you analyze the performance of a web page and get tailored suggestions
+ * to make that page faster.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -109,20 +109,17 @@ class Google_Service_Pagespeedonline_Pagespeedapi_Resource extends Google_Servic
    * Speed score, a list of suggestions to make that page faster, and other
    * information. (pagespeedapi.runpagespeed)
    *
-   * @param string $url
-   * The URL to fetch and analyze
+   * @param string $url The URL to fetch and analyze
    * @param array $optParams Optional parameters.
    *
-   * @opt_param bool screenshot
-   * Indicates if binary data containing a screenshot should be included
-   * @opt_param string locale
-   * The locale used to localize formatted results
-   * @opt_param string rule
-   * A Page Speed rule to run; if none are given, all rules are run
-   * @opt_param string strategy
-   * The analysis strategy to use
-   * @opt_param bool filter_third_party_resources
-   * Indicates if third party resources should be filtered out before PageSpeed analysis.
+   * @opt_param bool screenshot Indicates if binary data containing a screenshot
+   * should be included
+   * @opt_param string locale The locale used to localize formatted results
+   * @opt_param string rule A Page Speed rule to run; if none are given, all rules
+   * are run
+   * @opt_param string strategy The analysis strategy to use
+   * @opt_param bool filter_third_party_resources Indicates if third party
+   * resources should be filtered out before PageSpeed analysis.
    * @return Google_Service_Pagespeedonline_Result
    */
   public function runpagespeed($url, $optParams = array())
@@ -139,6 +136,8 @@ class Google_Service_Pagespeedonline_Pagespeedapi_Resource extends Google_Servic
 class Google_Service_Pagespeedonline_Result extends Google_Collection
 {
   protected $collection_key = 'invalidRules';
+  protected $internal_gapi_mappings = array(
+  );
   protected $formattedResultsType = 'Google_Service_Pagespeedonline_ResultFormattedResults';
   protected $formattedResultsDataType = '';
   public $id;
@@ -154,101 +153,83 @@ class Google_Service_Pagespeedonline_Result extends Google_Collection
   protected $versionType = 'Google_Service_Pagespeedonline_ResultVersion';
   protected $versionDataType = '';
 
+
   public function setFormattedResults(Google_Service_Pagespeedonline_ResultFormattedResults $formattedResults)
   {
     $this->formattedResults = $formattedResults;
   }
-
   public function getFormattedResults()
   {
     return $this->formattedResults;
   }
-
   public function setId($id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setInvalidRules($invalidRules)
   {
     $this->invalidRules = $invalidRules;
   }
-
   public function getInvalidRules()
   {
     return $this->invalidRules;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setPageStats(Google_Service_Pagespeedonline_ResultPageStats $pageStats)
   {
     $this->pageStats = $pageStats;
   }
-
   public function getPageStats()
   {
     return $this->pageStats;
   }
-
   public function setResponseCode($responseCode)
   {
     $this->responseCode = $responseCode;
   }
-
   public function getResponseCode()
   {
     return $this->responseCode;
   }
-
   public function setScore($score)
   {
     $this->score = $score;
   }
-
   public function getScore()
   {
     return $this->score;
   }
-
   public function setScreenshot(Google_Service_Pagespeedonline_ResultScreenshot $screenshot)
   {
     $this->screenshot = $screenshot;
   }
-
   public function getScreenshot()
   {
     return $this->screenshot;
   }
-
   public function setTitle($title)
   {
     $this->title = $title;
   }
-
   public function getTitle()
   {
     return $this->title;
   }
-
   public function setVersion(Google_Service_Pagespeedonline_ResultVersion $version)
   {
     $this->version = $version;
   }
-
   public function getVersion()
   {
     return $this->version;
@@ -257,25 +238,25 @@ class Google_Service_Pagespeedonline_Result extends Google_Collection
 
 class Google_Service_Pagespeedonline_ResultFormattedResults extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $locale;
   protected $ruleResultsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElement';
   protected $ruleResultsDataType = 'map';
 
+
   public function setLocale($locale)
   {
     $this->locale = $locale;
   }
-
   public function getLocale()
   {
     return $this->locale;
   }
-
   public function setRuleResults($ruleResults)
   {
     $this->ruleResults = $ruleResults;
   }
-
   public function getRuleResults()
   {
     return $this->ruleResults;
@@ -284,42 +265,39 @@ class Google_Service_Pagespeedonline_ResultFormattedResults extends Google_Model
 
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResults extends Google_Model
 {
-
 }
 
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElement extends Google_Collection
 {
   protected $collection_key = 'urlBlocks';
+  protected $internal_gapi_mappings = array(
+  );
   public $localizedRuleName;
   public $ruleImpact;
   protected $urlBlocksType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocks';
   protected $urlBlocksDataType = 'array';
 
+
   public function setLocalizedRuleName($localizedRuleName)
   {
     $this->localizedRuleName = $localizedRuleName;
   }
-
   public function getLocalizedRuleName()
   {
     return $this->localizedRuleName;
   }
-
   public function setRuleImpact($ruleImpact)
   {
     $this->ruleImpact = $ruleImpact;
   }
-
   public function getRuleImpact()
   {
     return $this->ruleImpact;
   }
-
   public function setUrlBlocks($urlBlocks)
   {
     $this->urlBlocks = $urlBlocks;
   }
-
   public function getUrlBlocks()
   {
     return $this->urlBlocks;
@@ -329,26 +307,26 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElement ex
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocks extends Google_Collection
 {
   protected $collection_key = 'urls';
+  protected $internal_gapi_mappings = array(
+  );
   protected $headerType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksHeader';
   protected $headerDataType = '';
   protected $urlsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrls';
   protected $urlsDataType = 'array';
 
+
   public function setHeader(Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksHeader $header)
   {
     $this->header = $header;
   }
-
   public function getHeader()
   {
     return $this->header;
   }
-
   public function setUrls($urls)
   {
     $this->urls = $urls;
   }
-
   public function getUrls()
   {
     return $this->urls;
@@ -358,25 +336,25 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksHeader extends Google_Collection
 {
   protected $collection_key = 'args';
+  protected $internal_gapi_mappings = array(
+  );
   protected $argsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksHeaderArgs';
   protected $argsDataType = 'array';
   public $format;
 
+
   public function setArgs($args)
   {
     $this->args = $args;
   }
-
   public function getArgs()
   {
     return $this->args;
   }
-
   public function setFormat($format)
   {
     $this->format = $format;
   }
-
   public function getFormat()
   {
     return $this->format;
@@ -385,24 +363,24 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
 
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksHeaderArgs extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $type;
   public $value;
 
+
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
   }
-
   public function setValue($value)
   {
     $this->value = $value;
   }
-
   public function getValue()
   {
     return $this->value;
@@ -412,26 +390,26 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrls extends Google_Collection
 {
   protected $collection_key = 'details';
+  protected $internal_gapi_mappings = array(
+  );
   protected $detailsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsDetails';
   protected $detailsDataType = 'array';
   protected $resultType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsResult';
   protected $resultDataType = '';
 
+
   public function setDetails($details)
   {
     $this->details = $details;
   }
-
   public function getDetails()
   {
     return $this->details;
   }
-
   public function setResult(Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsResult $result)
   {
     $this->result = $result;
   }
-
   public function getResult()
   {
     return $this->result;
@@ -441,25 +419,25 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsDetails extends Google_Collection
 {
   protected $collection_key = 'args';
+  protected $internal_gapi_mappings = array(
+  );
   protected $argsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsDetailsArgs';
   protected $argsDataType = 'array';
   public $format;
 
+
   public function setArgs($args)
   {
     $this->args = $args;
   }
-
   public function getArgs()
   {
     return $this->args;
   }
-
   public function setFormat($format)
   {
     $this->format = $format;
   }
-
   public function getFormat()
   {
     return $this->format;
@@ -468,24 +446,24 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
 
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsDetailsArgs extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $type;
   public $value;
 
+
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
   }
-
   public function setValue($value)
   {
     $this->value = $value;
   }
-
   public function getValue()
   {
     return $this->value;
@@ -495,25 +473,25 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsResult extends Google_Collection
 {
   protected $collection_key = 'args';
+  protected $internal_gapi_mappings = array(
+  );
   protected $argsType = 'Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsResultArgs';
   protected $argsDataType = 'array';
   public $format;
 
+
   public function setArgs($args)
   {
     $this->args = $args;
   }
-
   public function getArgs()
   {
     return $this->args;
   }
-
   public function setFormat($format)
   {
     $this->format = $format;
   }
-
   public function getFormat()
   {
     return $this->format;
@@ -522,24 +500,24 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
 
 class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrlBlocksUrlsResultArgs extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $type;
   public $value;
 
+
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
   }
-
   public function setValue($value)
   {
     $this->value = $value;
   }
-
   public function getValue()
   {
     return $this->value;
@@ -548,6 +526,8 @@ class Google_Service_Pagespeedonline_ResultFormattedResultsRuleResultsElementUrl
 
 class Google_Service_Pagespeedonline_ResultPageStats extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $cssResponseBytes;
   public $flashResponseBytes;
   public $htmlResponseBytes;
@@ -562,131 +542,107 @@ class Google_Service_Pagespeedonline_ResultPageStats extends Google_Model
   public $textResponseBytes;
   public $totalRequestBytes;
 
+
   public function setCssResponseBytes($cssResponseBytes)
   {
     $this->cssResponseBytes = $cssResponseBytes;
   }
-
   public function getCssResponseBytes()
   {
     return $this->cssResponseBytes;
   }
-
   public function setFlashResponseBytes($flashResponseBytes)
   {
     $this->flashResponseBytes = $flashResponseBytes;
   }
-
   public function getFlashResponseBytes()
   {
     return $this->flashResponseBytes;
   }
-
   public function setHtmlResponseBytes($htmlResponseBytes)
   {
     $this->htmlResponseBytes = $htmlResponseBytes;
   }
-
   public function getHtmlResponseBytes()
   {
     return $this->htmlResponseBytes;
   }
-
   public function setImageResponseBytes($imageResponseBytes)
   {
     $this->imageResponseBytes = $imageResponseBytes;
   }
-
   public function getImageResponseBytes()
   {
     return $this->imageResponseBytes;
   }
-
   public function setJavascriptResponseBytes($javascriptResponseBytes)
   {
     $this->javascriptResponseBytes = $javascriptResponseBytes;
   }
-
   public function getJavascriptResponseBytes()
   {
     return $this->javascriptResponseBytes;
   }
-
   public function setNumberCssResources($numberCssResources)
   {
     $this->numberCssResources = $numberCssResources;
   }
-
   public function getNumberCssResources()
   {
     return $this->numberCssResources;
   }
-
   public function setNumberHosts($numberHosts)
   {
     $this->numberHosts = $numberHosts;
   }
-
   public function getNumberHosts()
   {
     return $this->numberHosts;
   }
-
   public function setNumberJsResources($numberJsResources)
   {
     $this->numberJsResources = $numberJsResources;
   }
-
   public function getNumberJsResources()
   {
     return $this->numberJsResources;
   }
-
   public function setNumberResources($numberResources)
   {
     $this->numberResources = $numberResources;
   }
-
   public function getNumberResources()
   {
     return $this->numberResources;
   }
-
   public function setNumberStaticResources($numberStaticResources)
   {
     $this->numberStaticResources = $numberStaticResources;
   }
-
   public function getNumberStaticResources()
   {
     return $this->numberStaticResources;
   }
-
   public function setOtherResponseBytes($otherResponseBytes)
   {
     $this->otherResponseBytes = $otherResponseBytes;
   }
-
   public function getOtherResponseBytes()
   {
     return $this->otherResponseBytes;
   }
-
   public function setTextResponseBytes($textResponseBytes)
   {
     $this->textResponseBytes = $textResponseBytes;
   }
-
   public function getTextResponseBytes()
   {
     return $this->textResponseBytes;
   }
-
   public function setTotalRequestBytes($totalRequestBytes)
   {
     $this->totalRequestBytes = $totalRequestBytes;
   }
-
   public function getTotalRequestBytes()
   {
     return $this->totalRequestBytes;
@@ -695,46 +651,43 @@ class Google_Service_Pagespeedonline_ResultPageStats extends Google_Model
 
 class Google_Service_Pagespeedonline_ResultScreenshot extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+        "mimeType" => "mime_type",
+  );
   public $data;
   public $height;
   public $mimeType;
   public $width;
 
+
   public function setData($data)
   {
     $this->data = $data;
   }
-
   public function getData()
   {
     return $this->data;
   }
-
   public function setHeight($height)
   {
     $this->height = $height;
   }
-
   public function getHeight()
   {
     return $this->height;
   }
-
   public function setMimeType($mimeType)
   {
     $this->mimeType = $mimeType;
   }
-
   public function getMimeType()
   {
     return $this->mimeType;
   }
-
   public function setWidth($width)
   {
     $this->width = $width;
   }
-
   public function getWidth()
   {
     return $this->width;
@@ -743,24 +696,24 @@ class Google_Service_Pagespeedonline_ResultScreenshot extends Google_Model
 
 class Google_Service_Pagespeedonline_ResultVersion extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $major;
   public $minor;
 
+
   public function setMajor($major)
   {
     $this->major = $major;
   }
-
   public function getMajor()
   {
     return $this->major;
   }
-
   public function setMinor($minor)
   {
     $this->minor = $minor;
   }
-
   public function getMinor()
   {
     return $this->minor;

lib/google/src/Google/Service/Pubsub.php

@@ -19,8 +19,7 @@
  * Service definition for Pubsub (v1beta1).
  *
  * <p>
- * Provides reliable, many-to-many, asynchronous messaging between applications.
- * </p>
+ * Provides reliable, many-to-many, asynchronous messaging between applications.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -32,9 +31,11 @@
 class Google_Service_Pubsub extends Google_Service
 {
   /** View and manage your data across Google Cloud Platform services. */
-  const CLOUD_PLATFORM = "https://www.googleapis.com/auth/cloud-platform";
+  const CLOUD_PLATFORM =
+      "https://www.googleapis.com/auth/cloud-platform";
   /** View and manage Pub/Sub topics and subscriptions. */
-  const PUBSUB = "https://www.googleapis.com/auth/pubsub";
+  const PUBSUB =
+      "https://www.googleapis.com/auth/pubsub";
 
   public $subscriptions;
   public $topics;
@@ -115,6 +116,10 @@ class Google_Service_Pubsub extends Google_Service
               'path' => 'subscriptions/pull',
               'httpMethod' => 'POST',
               'parameters' => array(),
+            ),'pullBatch' => array(
+              'path' => 'subscriptions/pullBatch',
+              'httpMethod' => 'POST',
+              'parameters' => array(),
             ),
           )
         )
@@ -170,6 +175,10 @@ class Google_Service_Pubsub extends Google_Service
               'path' => 'topics/publish',
               'httpMethod' => 'POST',
               'parameters' => array(),
+            ),'publishBatch' => array(
+              'path' => 'topics/publishBatch',
+              'httpMethod' => 'POST',
+              'parameters' => array(),
             ),
           )
         )
@@ -206,10 +215,15 @@ class Google_Service_Pubsub_Subscriptions_Resource extends Google_Service_Resour
     $params = array_merge($params, $optParams);
     return $this->call('acknowledge', array($params));
   }
+
   /**
    * Creates a subscription on a given topic for a given subscriber. If the
    * subscription already exists, returns ALREADY_EXISTS. If the corresponding
-   * topic doesn't exist, returns NOT_FOUND. (subscriptions.create)
+   * topic doesn't exist, returns NOT_FOUND.
+   *
+   * If the name is not provided in the request, the server will assign a random
+   * name for this subscription on the same project as the topic.
+   * (subscriptions.create)
    *
    * @param Google_Subscription $postBody
    * @param array $optParams Optional parameters.
@@ -221,13 +235,13 @@ class Google_Service_Pubsub_Subscriptions_Resource extends Google_Service_Resour
     $params = array_merge($params, $optParams);
     return $this->call('create', array($params), "Google_Service_Pubsub_Subscription");
   }
+
   /**
    * Deletes an existing subscription. All pending messages in the subscription
    * are immediately dropped. Calls to Pull after deletion will return NOT_FOUND.
    * (subscriptions.delete)
    *
-   * @param string $subscription
-   * The subscription to delete.
+   * @param string $subscription The subscription to delete.
    * @param array $optParams Optional parameters.
    */
   public function delete($subscription, $optParams = array())
@@ -236,11 +250,11 @@ class Google_Service_Pubsub_Subscriptions_Resource extends Google_Service_Resour
     $params = array_merge($params, $optParams);
     return $this->call('delete', array($params));
   }
+
   /**
    * Gets the configuration details of a subscription. (subscriptions.get)
    *
-   * @param string $subscription
-   * The name of the subscription to get.
+   * @param string $subscription The name of the subscription to get.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Pubsub_Subscription
    */
@@ -250,17 +264,16 @@ class Google_Service_Pubsub_Subscriptions_Resource extends Google_Service_Resour
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_Pubsub_Subscription");
   }
+
   /**
    * Lists matching subscriptions. (subscriptions.listSubscriptions)
    *
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string pageToken
-   * The value obtained in the last ListSubscriptionsResponse for continuation.
-   * @opt_param int maxResults
-   * Maximum number of subscriptions to return.
-   * @opt_param string query
-   * A valid label query expression.
+   * @opt_param string pageToken The value obtained in the last
+   * ListSubscriptionsResponse for continuation.
+   * @opt_param int maxResults Maximum number of subscriptions to return.
+   * @opt_param string query A valid label query expression.
    * @return Google_Service_Pubsub_ListSubscriptionsResponse
    */
   public function listSubscriptions($optParams = array())
@@ -269,6 +282,7 @@ class Google_Service_Pubsub_Subscriptions_Resource extends Google_Service_Resour
     $params = array_merge($params, $optParams);
     return $this->call('list', array($params), "Google_Service_Pubsub_ListSubscriptionsResponse");
   }
+
   /**
    * Modifies the Ack deadline for a message received from a pull request.
    * (subscriptions.modifyAckDeadline)
@@ -282,6 +296,7 @@ class Google_Service_Pubsub_Subscriptions_Resource extends Google_Service_Resour
     $params = array_merge($params, $optParams);
     return $this->call('modifyAckDeadline', array($params));
   }
+
   /**
    * Modifies the PushConfig for a specified subscription. This method can be used
    * to suspend the flow of messages to an end point by clearing the PushConfig
@@ -298,6 +313,7 @@ class Google_Service_Pubsub_Subscriptions_Resource extends Google_Service_Resour
     $params = array_merge($params, $optParams);
     return $this->call('modifyPushConfig', array($params));
   }
+
   /**
    * Pulls a single message from the server. If return_immediately is true, and no
    * messages are available in the subscription, this method returns
@@ -315,6 +331,23 @@ class Google_Service_Pubsub_Subscriptions_Resource extends Google_Service_Resour
     $params = array_merge($params, $optParams);
     return $this->call('pull', array($params), "Google_Service_Pubsub_PullResponse");
   }
+
+  /**
+   * Pulls messages from the server. Returns an empty list if there are no
+   * messages available in the backlog. The system is free to return UNAVAILABLE
+   * if there too many pull requests outstanding for a given subscription.
+   * (subscriptions.pullBatch)
+   *
+   * @param Google_PullBatchRequest $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Pubsub_PullBatchResponse
+   */
+  public function pullBatch(Google_Service_Pubsub_PullBatchRequest $postBody, $optParams = array())
+  {
+    $params = array('postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('pullBatch', array($params), "Google_Service_Pubsub_PullBatchResponse");
+  }
 }
 
 /**
@@ -341,13 +374,13 @@ class Google_Service_Pubsub_Topics_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('create', array($params), "Google_Service_Pubsub_Topic");
   }
+
   /**
    * Deletes the topic with the given name. All subscriptions to this topic are
    * also deleted. Returns NOT_FOUND if the topic does not exist. After a topic is
    * deleted, a new topic may be created with the same name. (topics.delete)
    *
-   * @param string $topic
-   * Name of the topic to delete.
+   * @param string $topic Name of the topic to delete.
    * @param array $optParams Optional parameters.
    */
   public function delete($topic, $optParams = array())
@@ -356,14 +389,14 @@ class Google_Service_Pubsub_Topics_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('delete', array($params));
   }
+
   /**
    * Gets the configuration of a topic. Since the topic only has the name
    * attribute, this method is only useful to check the existence of a topic. If
    * other attributes are added in the future, they will be returned here.
    * (topics.get)
    *
-   * @param string $topic
-   * The name of the topic to get.
+   * @param string $topic The name of the topic to get.
    * @param array $optParams Optional parameters.
    * @return Google_Service_Pubsub_Topic
    */
@@ -373,17 +406,16 @@ class Google_Service_Pubsub_Topics_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_Pubsub_Topic");
   }
+
   /**
    * Lists matching topics. (topics.listTopics)
    *
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string pageToken
-   * The value obtained in the last ListTopicsResponse for continuation.
-   * @opt_param int maxResults
-   * Maximum number of topics to return.
-   * @opt_param string query
-   * A valid label query expression.
+   * @opt_param string pageToken The value obtained in the last ListTopicsResponse
+   * for continuation.
+   * @opt_param int maxResults Maximum number of topics to return.
+   * @opt_param string query A valid label query expression.
    * @return Google_Service_Pubsub_ListTopicsResponse
    */
   public function listTopics($optParams = array())
@@ -392,6 +424,7 @@ class Google_Service_Pubsub_Topics_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('list', array($params), "Google_Service_Pubsub_ListTopicsResponse");
   }
+
   /**
    * Adds a message to the topic. Returns NOT_FOUND if the topic does not exist.
    * (topics.publish)
@@ -405,6 +438,21 @@ class Google_Service_Pubsub_Topics_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('publish', array($params));
   }
+
+  /**
+   * Adds one or more messages to the topic. Returns NOT_FOUND if the topic does
+   * not exist. (topics.publishBatch)
+   *
+   * @param Google_PublishBatchRequest $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Pubsub_PublishBatchResponse
+   */
+  public function publishBatch(Google_Service_Pubsub_PublishBatchRequest $postBody, $optParams = array())
+  {
+    $params = array('postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('publishBatch', array($params), "Google_Service_Pubsub_PublishBatchResponse");
+  }
 }
 
 
@@ -413,24 +461,24 @@ class Google_Service_Pubsub_Topics_Resource extends Google_Service_Resource
 class Google_Service_Pubsub_AcknowledgeRequest extends Google_Collection
 {
   protected $collection_key = 'ackId';
+  protected $internal_gapi_mappings = array(
+  );
   public $ackId;
   public $subscription;
 
+
   public function setAckId($ackId)
   {
     $this->ackId = $ackId;
   }
-
   public function getAckId()
   {
     return $this->ackId;
   }
-
   public function setSubscription($subscription)
   {
     $this->subscription = $subscription;
   }
-
   public function getSubscription()
   {
     return $this->subscription;
@@ -439,35 +487,33 @@ class Google_Service_Pubsub_AcknowledgeRequest extends Google_Collection
 
 class Google_Service_Pubsub_Label extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $key;
   public $numValue;
   public $strValue;
 
+
   public function setKey($key)
   {
     $this->key = $key;
   }
-
   public function getKey()
   {
     return $this->key;
   }
-
   public function setNumValue($numValue)
   {
     $this->numValue = $numValue;
   }
-
   public function getNumValue()
   {
     return $this->numValue;
   }
-
   public function setStrValue($strValue)
   {
     $this->strValue = $strValue;
   }
-
   public function getStrValue()
   {
     return $this->strValue;
@@ -477,25 +523,25 @@ class Google_Service_Pubsub_Label extends Google_Model
 class Google_Service_Pubsub_ListSubscriptionsResponse extends Google_Collection
 {
   protected $collection_key = 'subscription';
+  protected $internal_gapi_mappings = array(
+  );
   public $nextPageToken;
   protected $subscriptionType = 'Google_Service_Pubsub_Subscription';
   protected $subscriptionDataType = 'array';
 
+
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
   }
-
   public function setSubscription($subscription)
   {
     $this->subscription = $subscription;
   }
-
   public function getSubscription()
   {
     return $this->subscription;
@@ -505,25 +551,25 @@ class Google_Service_Pubsub_ListSubscriptionsResponse extends Google_Collection
 class Google_Service_Pubsub_ListTopicsResponse extends Google_Collection
 {
   protected $collection_key = 'topic';
+  protected $internal_gapi_mappings = array(
+  );
   public $nextPageToken;
   protected $topicType = 'Google_Service_Pubsub_Topic';
   protected $topicDataType = 'array';
 
+
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
   }
-
   public function setTopic($topic)
   {
     $this->topic = $topic;
   }
-
   public function getTopic()
   {
     return $this->topic;
@@ -532,35 +578,33 @@ class Google_Service_Pubsub_ListTopicsResponse extends Google_Collection
 
 class Google_Service_Pubsub_ModifyAckDeadlineRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $ackDeadlineSeconds;
   public $ackId;
   public $subscription;
 
+
   public function setAckDeadlineSeconds($ackDeadlineSeconds)
   {
     $this->ackDeadlineSeconds = $ackDeadlineSeconds;
   }
-
   public function getAckDeadlineSeconds()
   {
     return $this->ackDeadlineSeconds;
   }
-
   public function setAckId($ackId)
   {
     $this->ackId = $ackId;
   }
-
   public function getAckId()
   {
     return $this->ackId;
   }
-
   public function setSubscription($subscription)
   {
     $this->subscription = $subscription;
   }
-
   public function getSubscription()
   {
     return $this->subscription;
@@ -569,52 +613,98 @@ class Google_Service_Pubsub_ModifyAckDeadlineRequest extends Google_Model
 
 class Google_Service_Pubsub_ModifyPushConfigRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   protected $pushConfigType = 'Google_Service_Pubsub_PushConfig';
   protected $pushConfigDataType = '';
   public $subscription;
 
+
   public function setPushConfig(Google_Service_Pubsub_PushConfig $pushConfig)
   {
     $this->pushConfig = $pushConfig;
   }
-
   public function getPushConfig()
   {
     return $this->pushConfig;
   }
-
   public function setSubscription($subscription)
   {
     $this->subscription = $subscription;
   }
-
   public function getSubscription()
   {
     return $this->subscription;
   }
 }
 
+class Google_Service_Pubsub_PublishBatchRequest extends Google_Collection
+{
+  protected $collection_key = 'messages';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $messagesType = 'Google_Service_Pubsub_PubsubMessage';
+  protected $messagesDataType = 'array';
+  public $topic;
+
+
+  public function setMessages($messages)
+  {
+    $this->messages = $messages;
+  }
+  public function getMessages()
+  {
+    return $this->messages;
+  }
+  public function setTopic($topic)
+  {
+    $this->topic = $topic;
+  }
+  public function getTopic()
+  {
+    return $this->topic;
+  }
+}
+
+class Google_Service_Pubsub_PublishBatchResponse extends Google_Collection
+{
+  protected $collection_key = 'messageIds';
+  protected $internal_gapi_mappings = array(
+  );
+  public $messageIds;
+
+
+  public function setMessageIds($messageIds)
+  {
+    $this->messageIds = $messageIds;
+  }
+  public function getMessageIds()
+  {
+    return $this->messageIds;
+  }
+}
+
 class Google_Service_Pubsub_PublishRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   protected $messageType = 'Google_Service_Pubsub_PubsubMessage';
   protected $messageDataType = '';
   public $topic;
 
+
   public function setMessage(Google_Service_Pubsub_PubsubMessage $message)
   {
     $this->message = $message;
   }
-
   public function getMessage()
   {
     return $this->message;
   }
-
   public function setTopic($topic)
   {
     $this->topic = $topic;
   }
-
   public function getTopic()
   {
     return $this->topic;
@@ -623,47 +713,43 @@ class Google_Service_Pubsub_PublishRequest extends Google_Model
 
 class Google_Service_Pubsub_PubsubEvent extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $deleted;
   protected $messageType = 'Google_Service_Pubsub_PubsubMessage';
   protected $messageDataType = '';
   public $subscription;
   public $truncated;
 
+
   public function setDeleted($deleted)
   {
     $this->deleted = $deleted;
   }
-
   public function getDeleted()
   {
     return $this->deleted;
   }
-
   public function setMessage(Google_Service_Pubsub_PubsubMessage $message)
   {
     $this->message = $message;
   }
-
   public function getMessage()
   {
     return $this->message;
   }
-
   public function setSubscription($subscription)
   {
     $this->subscription = $subscription;
   }
-
   public function getSubscription()
   {
     return $this->subscription;
   }
-
   public function setTruncated($truncated)
   {
     $this->truncated = $truncated;
   }
-
   public function getTruncated()
   {
     return $this->truncated;
@@ -673,51 +759,114 @@ class Google_Service_Pubsub_PubsubEvent extends Google_Model
 class Google_Service_Pubsub_PubsubMessage extends Google_Collection
 {
   protected $collection_key = 'label';
+  protected $internal_gapi_mappings = array(
+  );
   public $data;
   protected $labelType = 'Google_Service_Pubsub_Label';
   protected $labelDataType = 'array';
+  public $messageId;
+
 
   public function setData($data)
   {
     $this->data = $data;
   }
-
   public function getData()
   {
     return $this->data;
   }
-
   public function setLabel($label)
   {
     $this->label = $label;
   }
-
   public function getLabel()
   {
     return $this->label;
   }
+  public function setMessageId($messageId)
+  {
+    $this->messageId = $messageId;
+  }
+  public function getMessageId()
+  {
+    return $this->messageId;
+  }
+}
+
+class Google_Service_Pubsub_PullBatchRequest extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $maxEvents;
+  public $returnImmediately;
+  public $subscription;
+
+
+  public function setMaxEvents($maxEvents)
+  {
+    $this->maxEvents = $maxEvents;
+  }
+  public function getMaxEvents()
+  {
+    return $this->maxEvents;
+  }
+  public function setReturnImmediately($returnImmediately)
+  {
+    $this->returnImmediately = $returnImmediately;
+  }
+  public function getReturnImmediately()
+  {
+    return $this->returnImmediately;
+  }
+  public function setSubscription($subscription)
+  {
+    $this->subscription = $subscription;
+  }
+  public function getSubscription()
+  {
+    return $this->subscription;
+  }
+}
+
+class Google_Service_Pubsub_PullBatchResponse extends Google_Collection
+{
+  protected $collection_key = 'pullResponses';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $pullResponsesType = 'Google_Service_Pubsub_PullResponse';
+  protected $pullResponsesDataType = 'array';
+
+
+  public function setPullResponses($pullResponses)
+  {
+    $this->pullResponses = $pullResponses;
+  }
+  public function getPullResponses()
+  {
+    return $this->pullResponses;
+  }
 }
 
 class Google_Service_Pubsub_PullRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $returnImmediately;
   public $subscription;
 
+
   public function setReturnImmediately($returnImmediately)
   {
     $this->returnImmediately = $returnImmediately;
   }
-
   public function getReturnImmediately()
   {
     return $this->returnImmediately;
   }
-
   public function setSubscription($subscription)
   {
     $this->subscription = $subscription;
   }
-
   public function getSubscription()
   {
     return $this->subscription;
@@ -726,25 +875,25 @@ class Google_Service_Pubsub_PullRequest extends Google_Model
 
 class Google_Service_Pubsub_PullResponse extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $ackId;
   protected $pubsubEventType = 'Google_Service_Pubsub_PubsubEvent';
   protected $pubsubEventDataType = '';
 
+
   public function setAckId($ackId)
   {
     $this->ackId = $ackId;
   }
-
   public function getAckId()
   {
     return $this->ackId;
   }
-
   public function setPubsubEvent(Google_Service_Pubsub_PubsubEvent $pubsubEvent)
   {
     $this->pubsubEvent = $pubsubEvent;
   }
-
   public function getPubsubEvent()
   {
     return $this->pubsubEvent;
@@ -753,13 +902,15 @@ class Google_Service_Pubsub_PullResponse extends Google_Model
 
 class Google_Service_Pubsub_PushConfig extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $pushEndpoint;
 
+
   public function setPushEndpoint($pushEndpoint)
   {
     $this->pushEndpoint = $pushEndpoint;
   }
-
   public function getPushEndpoint()
   {
     return $this->pushEndpoint;
@@ -768,47 +919,43 @@ class Google_Service_Pubsub_PushConfig extends Google_Model
 
 class Google_Service_Pubsub_Subscription extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $ackDeadlineSeconds;
   public $name;
   protected $pushConfigType = 'Google_Service_Pubsub_PushConfig';
   protected $pushConfigDataType = '';
   public $topic;
 
+
   public function setAckDeadlineSeconds($ackDeadlineSeconds)
   {
     $this->ackDeadlineSeconds = $ackDeadlineSeconds;
   }
-
   public function getAckDeadlineSeconds()
   {
     return $this->ackDeadlineSeconds;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setPushConfig(Google_Service_Pubsub_PushConfig $pushConfig)
   {
     $this->pushConfig = $pushConfig;
   }
-
   public function getPushConfig()
   {
     return $this->pushConfig;
   }
-
   public function setTopic($topic)
   {
     $this->topic = $topic;
   }
-
   public function getTopic()
   {
     return $this->topic;
@@ -817,13 +964,15 @@ class Google_Service_Pubsub_Subscription extends Google_Model
 
 class Google_Service_Pubsub_Topic extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $name;
 
+
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;

lib/google/src/Google/Service/Replicapoolupdater.php

@@ -0,0 +1,631 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * Service definition for Replicapoolupdater (v1beta1).
+ *
+ * <p>
+ * The Google Compute Engine Instance Group Updater API provides services for
+ * updating groups of Compute Engine Instances.</p>
+ *
+ * <p>
+ * For more information about this service, see the API
+ * <a href="https://cloud.google.com/compute/docs/instance-groups/manager/#applying_rolling_updates_using_the_updater_service" target="_blank">Documentation</a>
+ * </p>
+ *
+ * @author Google, Inc.
+ */
+class Google_Service_Replicapoolupdater extends Google_Service
+{
+  /** View and manage your data across Google Cloud Platform services. */
+  const CLOUD_PLATFORM =
+      "https://www.googleapis.com/auth/cloud-platform";
+  /** View and manage replica pools. */
+  const REPLICAPOOL =
+      "https://www.googleapis.com/auth/replicapool";
+  /** View replica pools. */
+  const REPLICAPOOL_READONLY =
+      "https://www.googleapis.com/auth/replicapool.readonly";
+
+  public $updates;
+  
+
+  /**
+   * Constructs the internal representation of the Replicapoolupdater service.
+   *
+   * @param Google_Client $client
+   */
+  public function __construct(Google_Client $client)
+  {
+    parent::__construct($client);
+    $this->servicePath = 'replicapoolupdater/v1beta1/projects/';
+    $this->version = 'v1beta1';
+    $this->serviceName = 'replicapoolupdater';
+
+    $this->updates = new Google_Service_Replicapoolupdater_Updates_Resource(
+        $this,
+        $this->serviceName,
+        'updates',
+        array(
+          'methods' => array(
+            'cancel' => array(
+              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/updates/{update}/cancel',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'project' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zone' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'instanceGroupManager' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'update' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
+              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/updates/{update}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'project' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zone' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'instanceGroupManager' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'update' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'insert' => array(
+              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/updates',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'project' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zone' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'instanceGroupManager' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/updates',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'project' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zone' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'instanceGroupManager' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'maxResults' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+              ),
+            ),'pause' => array(
+              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/updates/{update}/pause',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'project' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zone' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'instanceGroupManager' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'update' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'rollback' => array(
+              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/updates/{update}/rollback',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'project' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zone' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'instanceGroupManager' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'update' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'rollforward' => array(
+              'path' => '{project}/zones/{zone}/instanceGroupManagers/{instanceGroupManager}/updates/{update}/rollforward',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'project' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'zone' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'instanceGroupManager' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'update' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
+  }
+}
+
+
+/**
+ * The "updates" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $replicapoolupdaterService = new Google_Service_Replicapoolupdater(...);
+ *   $updates = $replicapoolupdaterService->updates;
+ *  </code>
+ */
+class Google_Service_Replicapoolupdater_Updates_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Called on the particular Update endpoint. Cancels the update in state PAUSED.
+   * No-op if invoked in state CANCELLED. (updates.cancel)
+   *
+   * @param string $project Project ID for this request.
+   * @param string $zone Zone for the instance group manager.
+   * @param string $instanceGroupManager Name of the instance group manager for
+   * this request.
+   * @param string $update Unique (in the context of a group) handle of an update.
+   * @param array $optParams Optional parameters.
+   */
+  public function cancel($project, $zone, $instanceGroupManager, $update, $optParams = array())
+  {
+    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'update' => $update);
+    $params = array_merge($params, $optParams);
+    return $this->call('cancel', array($params));
+  }
+
+  /**
+   * Called on the particular Update endpoint. Returns the Update resource.
+   * (updates.get)
+   *
+   * @param string $project Project ID for this request.
+   * @param string $zone Zone for the instance group manager.
+   * @param string $instanceGroupManager Name of the instance group manager for
+   * this request.
+   * @param string $update Unique (in the context of a group) handle of an update.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Replicapoolupdater_Update
+   */
+  public function get($project, $zone, $instanceGroupManager, $update, $optParams = array())
+  {
+    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'update' => $update);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Replicapoolupdater_Update");
+  }
+
+  /**
+   * Called on the collection endpoint. Inserts the new Update resource and starts
+   * the update. (updates.insert)
+   *
+   * @param string $project Project ID for this request.
+   * @param string $zone Zone for the instance group manager.
+   * @param string $instanceGroupManager Name of the instance group manager for
+   * this request.
+   * @param Google_Update $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Replicapoolupdater_InsertResponse
+   */
+  public function insert($project, $zone, $instanceGroupManager, Google_Service_Replicapoolupdater_Update $postBody, $optParams = array())
+  {
+    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('insert', array($params), "Google_Service_Replicapoolupdater_InsertResponse");
+  }
+
+  /**
+   * Called on the collection endpoint. Lists updates for a given instance group,
+   * in reverse chronological order. Pagination is supported, see
+   * ListRequestHeader. (updates.listUpdates)
+   *
+   * @param string $project Project ID for this request.
+   * @param string $zone Zone for the instance group manager.
+   * @param string $instanceGroupManager Name of the instance group manager for
+   * this request.
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string pageToken Set this to the nextPageToken value returned by a
+   * previous list request to obtain the next page of results from the previous
+   * list request.
+   * @opt_param int maxResults Maximum count of results to be returned. Acceptable
+   * values are 1 to 100, inclusive. (Default: 50)
+   * @return Google_Service_Replicapoolupdater_UpdateList
+   */
+  public function listUpdates($project, $zone, $instanceGroupManager, $optParams = array())
+  {
+    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Replicapoolupdater_UpdateList");
+  }
+
+  /**
+   * Called on the particular Update endpoint. Pauses the update in state
+   * ROLLING_FORWARD or ROLLING_BACK. No-op if invoked in state PAUSED.
+   * (updates.pause)
+   *
+   * @param string $project Project ID for this request.
+   * @param string $zone Zone for the instance group manager.
+   * @param string $instanceGroupManager Name of the instance group manager for
+   * this request.
+   * @param string $update Unique (in the context of a group) handle of an update.
+   * @param array $optParams Optional parameters.
+   */
+  public function pause($project, $zone, $instanceGroupManager, $update, $optParams = array())
+  {
+    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'update' => $update);
+    $params = array_merge($params, $optParams);
+    return $this->call('pause', array($params));
+  }
+
+  /**
+   * Called on the particular Update endpoint. Rolls back the update in state
+   * ROLLING_FORWARD or PAUSED. No-op if invoked in state ROLLED_BACK or
+   * ROLLING_BACK. (updates.rollback)
+   *
+   * @param string $project Project ID for this request.
+   * @param string $zone Zone for the instance group manager.
+   * @param string $instanceGroupManager Name of the instance group manager for
+   * this request.
+   * @param string $update Unique (in the context of a group) handle of an update.
+   * @param array $optParams Optional parameters.
+   */
+  public function rollback($project, $zone, $instanceGroupManager, $update, $optParams = array())
+  {
+    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'update' => $update);
+    $params = array_merge($params, $optParams);
+    return $this->call('rollback', array($params));
+  }
+
+  /**
+   * Called on the particular Update endpoint. Rolls forward the update in state
+   * ROLLING_BACK or PAUSED. No-op if invoked in state ROLLED_OUT or
+   * ROLLING_FORWARD. (updates.rollforward)
+   *
+   * @param string $project Project ID for this request.
+   * @param string $zone Zone for the instance group manager.
+   * @param string $instanceGroupManager Name of the instance group manager for
+   * this request.
+   * @param string $update Unique (in the context of a group) handle of an update.
+   * @param array $optParams Optional parameters.
+   */
+  public function rollforward($project, $zone, $instanceGroupManager, $update, $optParams = array())
+  {
+    $params = array('project' => $project, 'zone' => $zone, 'instanceGroupManager' => $instanceGroupManager, 'update' => $update);
+    $params = array_merge($params, $optParams);
+    return $this->call('rollforward', array($params));
+  }
+}
+
+
+
+
+class Google_Service_Replicapoolupdater_InsertResponse extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $update;
+
+
+  public function setUpdate($update)
+  {
+    $this->update = $update;
+  }
+  public function getUpdate()
+  {
+    return $this->update;
+  }
+}
+
+class Google_Service_Replicapoolupdater_InstanceUpdate extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $instanceName;
+  public $state;
+
+
+  public function setInstanceName($instanceName)
+  {
+    $this->instanceName = $instanceName;
+  }
+  public function getInstanceName()
+  {
+    return $this->instanceName;
+  }
+  public function setState($state)
+  {
+    $this->state = $state;
+  }
+  public function getState()
+  {
+    return $this->state;
+  }
+}
+
+class Google_Service_Replicapoolupdater_Update extends Google_Collection
+{
+  protected $collection_key = 'instanceUpdates';
+  protected $internal_gapi_mappings = array(
+  );
+  public $creationTimestamp;
+  public $details;
+  public $handle;
+  public $instanceTemplate;
+  protected $instanceUpdatesType = 'Google_Service_Replicapoolupdater_InstanceUpdate';
+  protected $instanceUpdatesDataType = 'array';
+  public $kind;
+  protected $policyType = 'Google_Service_Replicapoolupdater_UpdatePolicy';
+  protected $policyDataType = '';
+  public $selfLink;
+  public $state;
+  public $targetState;
+  public $user;
+
+
+  public function setCreationTimestamp($creationTimestamp)
+  {
+    $this->creationTimestamp = $creationTimestamp;
+  }
+  public function getCreationTimestamp()
+  {
+    return $this->creationTimestamp;
+  }
+  public function setDetails($details)
+  {
+    $this->details = $details;
+  }
+  public function getDetails()
+  {
+    return $this->details;
+  }
+  public function setHandle($handle)
+  {
+    $this->handle = $handle;
+  }
+  public function getHandle()
+  {
+    return $this->handle;
+  }
+  public function setInstanceTemplate($instanceTemplate)
+  {
+    $this->instanceTemplate = $instanceTemplate;
+  }
+  public function getInstanceTemplate()
+  {
+    return $this->instanceTemplate;
+  }
+  public function setInstanceUpdates($instanceUpdates)
+  {
+    $this->instanceUpdates = $instanceUpdates;
+  }
+  public function getInstanceUpdates()
+  {
+    return $this->instanceUpdates;
+  }
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+  public function getKind()
+  {
+    return $this->kind;
+  }
+  public function setPolicy(Google_Service_Replicapoolupdater_UpdatePolicy $policy)
+  {
+    $this->policy = $policy;
+  }
+  public function getPolicy()
+  {
+    return $this->policy;
+  }
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+  public function setState($state)
+  {
+    $this->state = $state;
+  }
+  public function getState()
+  {
+    return $this->state;
+  }
+  public function setTargetState($targetState)
+  {
+    $this->targetState = $targetState;
+  }
+  public function getTargetState()
+  {
+    return $this->targetState;
+  }
+  public function setUser($user)
+  {
+    $this->user = $user;
+  }
+  public function getUser()
+  {
+    return $this->user;
+  }
+}
+
+class Google_Service_Replicapoolupdater_UpdateList extends Google_Collection
+{
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
+  protected $itemsType = 'Google_Service_Replicapoolupdater_Update';
+  protected $itemsDataType = 'array';
+  public $nextPageToken;
+
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+  public function getItems()
+  {
+    return $this->items;
+  }
+  public function setNextPageToken($nextPageToken)
+  {
+    $this->nextPageToken = $nextPageToken;
+  }
+  public function getNextPageToken()
+  {
+    return $this->nextPageToken;
+  }
+}
+
+class Google_Service_Replicapoolupdater_UpdatePolicy extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  protected $canaryType = 'Google_Service_Replicapoolupdater_UpdatePolicyCanary';
+  protected $canaryDataType = '';
+  public $maxNumConcurrentInstances;
+  public $sleepAfterInstanceRestartSec;
+
+
+  public function setCanary(Google_Service_Replicapoolupdater_UpdatePolicyCanary $canary)
+  {
+    $this->canary = $canary;
+  }
+  public function getCanary()
+  {
+    return $this->canary;
+  }
+  public function setMaxNumConcurrentInstances($maxNumConcurrentInstances)
+  {
+    $this->maxNumConcurrentInstances = $maxNumConcurrentInstances;
+  }
+  public function getMaxNumConcurrentInstances()
+  {
+    return $this->maxNumConcurrentInstances;
+  }
+  public function setSleepAfterInstanceRestartSec($sleepAfterInstanceRestartSec)
+  {
+    $this->sleepAfterInstanceRestartSec = $sleepAfterInstanceRestartSec;
+  }
+  public function getSleepAfterInstanceRestartSec()
+  {
+    return $this->sleepAfterInstanceRestartSec;
+  }
+}
+
+class Google_Service_Replicapoolupdater_UpdatePolicyCanary extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $numInstances;
+
+
+  public function setNumInstances($numInstances)
+  {
+    $this->numInstances = $numInstances;
+  }
+  public function getNumInstances()
+  {
+    return $this->numInstances;
+  }
+}

lib/google/src/Google/Service/Reports.php

@@ -19,8 +19,8 @@
  * Service definition for Reports (reports_v1).
  *
  * <p>
- * Allows the administrators of Google Apps customers to fetch reports about the usage, collaboration, security and risk for their users.
- * </p>
+ * Allows the administrators of Google Apps customers to fetch reports about the
+ * usage, collaboration, security and risk for their users.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -32,9 +32,11 @@
 class Google_Service_Reports extends Google_Service
 {
   /** View audit reports of Google Apps for your domain. */
-  const ADMIN_REPORTS_AUDIT_READONLY = "https://www.googleapis.com/auth/admin.reports.audit.readonly";
+  const ADMIN_REPORTS_AUDIT_READONLY =
+      "https://www.googleapis.com/auth/admin.reports.audit.readonly";
   /** View usage reports of Google Apps for your domain. */
-  const ADMIN_REPORTS_USAGE_READONLY = "https://www.googleapis.com/auth/admin.reports.usage.readonly";
+  const ADMIN_REPORTS_USAGE_READONLY =
+      "https://www.googleapis.com/auth/admin.reports.usage.readonly";
 
   public $activities;
   public $channels;
@@ -268,30 +270,27 @@ class Google_Service_Reports_Activities_Resource extends Google_Service_Resource
    * Retrieves a list of activities for a specific customer and application.
    * (activities.listActivities)
    *
-   * @param string $userKey
-   * Represents the profile id or the user email for which the data should be filtered. When 'all' is
-    * specified as the userKey, it returns usageReports for all users.
-   * @param string $applicationName
-   * Application name for which the events are to be retrieved.
+   * @param string $userKey Represents the profile id or the user email for which
+   * the data should be filtered. When 'all' is specified as the userKey, it
+   * returns usageReports for all users.
+   * @param string $applicationName Application name for which the events are to
+   * be retrieved.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string startTime
-   * Return events which occured at or after this time.
-   * @opt_param string actorIpAddress
-   * IP Address of host where the event was performed. Supports both IPv4 and IPv6 addresses.
-   * @opt_param int maxResults
-   * Number of activity records to be shown in each page.
-   * @opt_param string eventName
-   * Name of the event being queried.
-   * @opt_param string pageToken
-   * Token to specify next page.
-   * @opt_param string filters
-   * Event parameters in the form [parameter1 name][operator][parameter1 value],[parameter2
-    * name][operator][parameter2 value],...
-   * @opt_param string endTime
-   * Return events which occured at or before this time.
-   * @opt_param string customerId
-   * Represents the customer for which the data is to be fetched.
+   * @opt_param string startTime Return events which occured at or after this
+   * time.
+   * @opt_param string actorIpAddress IP Address of host where the event was
+   * performed. Supports both IPv4 and IPv6 addresses.
+   * @opt_param int maxResults Number of activity records to be shown in each
+   * page.
+   * @opt_param string eventName Name of the event being queried.
+   * @opt_param string pageToken Token to specify next page.
+   * @opt_param string filters Event parameters in the form [parameter1
+   * name][operator][parameter1 value],[parameter2 name][operator][parameter2
+   * value],...
+   * @opt_param string endTime Return events which occured at or before this time.
+   * @opt_param string customerId Represents the customer for which the data is to
+   * be fetched.
    * @return Google_Service_Reports_Activities
    */
   public function listActivities($userKey, $applicationName, $optParams = array())
@@ -300,34 +299,32 @@ class Google_Service_Reports_Activities_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('list', array($params), "Google_Service_Reports_Activities");
   }
+
   /**
    * Push changes to activities (activities.watch)
    *
-   * @param string $userKey
-   * Represents the profile id or the user email for which the data should be filtered. When 'all' is
-    * specified as the userKey, it returns usageReports for all users.
-   * @param string $applicationName
-   * Application name for which the events are to be retrieved.
+   * @param string $userKey Represents the profile id or the user email for which
+   * the data should be filtered. When 'all' is specified as the userKey, it
+   * returns usageReports for all users.
+   * @param string $applicationName Application name for which the events are to
+   * be retrieved.
    * @param Google_Channel $postBody
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string startTime
-   * Return events which occured at or after this time.
-   * @opt_param string actorIpAddress
-   * IP Address of host where the event was performed. Supports both IPv4 and IPv6 addresses.
-   * @opt_param int maxResults
-   * Number of activity records to be shown in each page.
-   * @opt_param string eventName
-   * Name of the event being queried.
-   * @opt_param string pageToken
-   * Token to specify next page.
-   * @opt_param string filters
-   * Event parameters in the form [parameter1 name][operator][parameter1 value],[parameter2
-    * name][operator][parameter2 value],...
-   * @opt_param string endTime
-   * Return events which occured at or before this time.
-   * @opt_param string customerId
-   * Represents the customer for which the data is to be fetched.
+   * @opt_param string startTime Return events which occured at or after this
+   * time.
+   * @opt_param string actorIpAddress IP Address of host where the event was
+   * performed. Supports both IPv4 and IPv6 addresses.
+   * @opt_param int maxResults Number of activity records to be shown in each
+   * page.
+   * @opt_param string eventName Name of the event being queried.
+   * @opt_param string pageToken Token to specify next page.
+   * @opt_param string filters Event parameters in the form [parameter1
+   * name][operator][parameter1 value],[parameter2 name][operator][parameter2
+   * value],...
+   * @opt_param string endTime Return events which occured at or before this time.
+   * @opt_param string customerId Represents the customer for which the data is to
+   * be fetched.
    * @return Google_Service_Reports_Channel
    */
   public function watch($userKey, $applicationName, Google_Service_Reports_Channel $postBody, $optParams = array())
@@ -378,17 +375,15 @@ class Google_Service_Reports_CustomerUsageReports_Resource extends Google_Servic
    * Retrieves a report which is a collection of properties / statistics for a
    * specific customer. (customerUsageReports.get)
    *
-   * @param string $date
-   * Represents the date in yyyy-mm-dd format for which the data is to be fetched.
+   * @param string $date Represents the date in yyyy-mm-dd format for which the
+   * data is to be fetched.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string pageToken
-   * Token to specify next page.
-   * @opt_param string customerId
-   * Represents the customer for which the data is to be fetched.
-   * @opt_param string parameters
-   * Represents the application name, parameter name pairs to fetch in csv as app_name1:param_name1,
-    * app_name2:param_name2.
+   * @opt_param string pageToken Token to specify next page.
+   * @opt_param string customerId Represents the customer for which the data is to
+   * be fetched.
+   * @opt_param string parameters Represents the application name, parameter name
+   * pairs to fetch in csv as app_name1:param_name1, app_name2:param_name2.
    * @return Google_Service_Reports_UsageReports
    */
   public function get($date, $optParams = array())
@@ -414,23 +409,21 @@ class Google_Service_Reports_UserUsageReport_Resource extends Google_Service_Res
    * Retrieves a report which is a collection of properties / statistics for a set
    * of users. (userUsageReport.get)
    *
-   * @param string $userKey
-   * Represents the profile id or the user email for which the data should be filtered.
-   * @param string $date
-   * Represents the date in yyyy-mm-dd format for which the data is to be fetched.
+   * @param string $userKey Represents the profile id or the user email for which
+   * the data should be filtered.
+   * @param string $date Represents the date in yyyy-mm-dd format for which the
+   * data is to be fetched.
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string parameters
-   * Represents the application name, parameter name pairs to fetch in csv as app_name1:param_name1,
-    * app_name2:param_name2.
-   * @opt_param string maxResults
-   * Maximum number of results to return. Maximum allowed is 1000
-   * @opt_param string pageToken
-   * Token to specify next page.
-   * @opt_param string filters
-   * Represents the set of filters including parameter operator value.
-   * @opt_param string customerId
-   * Represents the customer for which the data is to be fetched.
+   * @opt_param string parameters Represents the application name, parameter name
+   * pairs to fetch in csv as app_name1:param_name1, app_name2:param_name2.
+   * @opt_param string maxResults Maximum number of results to return. Maximum
+   * allowed is 1000
+   * @opt_param string pageToken Token to specify next page.
+   * @opt_param string filters Represents the set of filters including parameter
+   * operator value.
+   * @opt_param string customerId Represents the customer for which the data is to
+   * be fetched.
    * @return Google_Service_Reports_UsageReports
    */
   public function get($userKey, $date, $optParams = array())
@@ -447,47 +440,43 @@ class Google_Service_Reports_UserUsageReport_Resource extends Google_Service_Res
 class Google_Service_Reports_Activities extends Google_Collection
 {
   protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   protected $itemsType = 'Google_Service_Reports_Activity';
   protected $itemsDataType = 'array';
   public $kind;
   public $nextPageToken;
 
+
   public function setEtag($etag)
   {
     $this->etag = $etag;
   }
-
   public function getEtag()
   {
     return $this->etag;
   }
-
   public function setItems($items)
   {
     $this->items = $items;
   }
-
   public function getItems()
   {
     return $this->items;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
@@ -497,6 +486,8 @@ class Google_Service_Reports_Activities extends Google_Collection
 class Google_Service_Reports_Activity extends Google_Collection
 {
   protected $collection_key = 'events';
+  protected $internal_gapi_mappings = array(
+  );
   protected $actorType = 'Google_Service_Reports_ActivityActor';
   protected $actorDataType = '';
   public $etag;
@@ -508,71 +499,59 @@ class Google_Service_Reports_Activity extends Google_Collection
   public $kind;
   public $ownerDomain;
 
+
   public function setActor(Google_Service_Reports_ActivityActor $actor)
   {
     $this->actor = $actor;
   }
-
   public function getActor()
   {
     return $this->actor;
   }
-
   public function setEtag($etag)
   {
     $this->etag = $etag;
   }
-
   public function getEtag()
   {
     return $this->etag;
   }
-
   public function setEvents($events)
   {
     $this->events = $events;
   }
-
   public function getEvents()
   {
     return $this->events;
   }
-
   public function setId(Google_Service_Reports_ActivityId $id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setIpAddress($ipAddress)
   {
     $this->ipAddress = $ipAddress;
   }
-
   public function getIpAddress()
   {
     return $this->ipAddress;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setOwnerDomain($ownerDomain)
   {
     $this->ownerDomain = $ownerDomain;
   }
-
   public function getOwnerDomain()
   {
     return $this->ownerDomain;
@@ -581,46 +560,42 @@ class Google_Service_Reports_Activity extends Google_Collection
 
 class Google_Service_Reports_ActivityActor extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $callerType;
   public $email;
   public $key;
   public $profileId;
 
+
   public function setCallerType($callerType)
   {
     $this->callerType = $callerType;
   }
-
   public function getCallerType()
   {
     return $this->callerType;
   }
-
   public function setEmail($email)
   {
     $this->email = $email;
   }
-
   public function getEmail()
   {
     return $this->email;
   }
-
   public function setKey($key)
   {
     $this->key = $key;
   }
-
   public function getKey()
   {
     return $this->key;
   }
-
   public function setProfileId($profileId)
   {
     $this->profileId = $profileId;
   }
-
   public function getProfileId()
   {
     return $this->profileId;
@@ -630,84 +605,97 @@ class Google_Service_Reports_ActivityActor extends Google_Model
 class Google_Service_Reports_ActivityEvents extends Google_Collection
 {
   protected $collection_key = 'parameters';
+  protected $internal_gapi_mappings = array(
+  );
   public $name;
   protected $parametersType = 'Google_Service_Reports_ActivityEventsParameters';
   protected $parametersDataType = 'array';
   public $type;
 
+
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setParameters($parameters)
   {
     $this->parameters = $parameters;
   }
-
   public function getParameters()
   {
     return $this->parameters;
   }
-
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
   }
 }
 
-class Google_Service_Reports_ActivityEventsParameters extends Google_Model
+class Google_Service_Reports_ActivityEventsParameters extends Google_Collection
 {
+  protected $collection_key = 'multiValue';
+  protected $internal_gapi_mappings = array(
+  );
   public $boolValue;
   public $intValue;
+  public $multiIntValue;
+  public $multiValue;
   public $name;
   public $value;
 
+
   public function setBoolValue($boolValue)
   {
     $this->boolValue = $boolValue;
   }
-
   public function getBoolValue()
   {
     return $this->boolValue;
   }
-
   public function setIntValue($intValue)
   {
     $this->intValue = $intValue;
   }
-
   public function getIntValue()
   {
     return $this->intValue;
   }
-
+  public function setMultiIntValue($multiIntValue)
+  {
+    $this->multiIntValue = $multiIntValue;
+  }
+  public function getMultiIntValue()
+  {
+    return $this->multiIntValue;
+  }
+  public function setMultiValue($multiValue)
+  {
+    $this->multiValue = $multiValue;
+  }
+  public function getMultiValue()
+  {
+    return $this->multiValue;
+  }
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setValue($value)
   {
     $this->value = $value;
   }
-
   public function getValue()
   {
     return $this->value;
@@ -716,46 +704,42 @@ class Google_Service_Reports_ActivityEventsParameters extends Google_Model
 
 class Google_Service_Reports_ActivityId extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $applicationName;
   public $customerId;
   public $time;
   public $uniqueQualifier;
 
+
   public function setApplicationName($applicationName)
   {
     $this->applicationName = $applicationName;
   }
-
   public function getApplicationName()
   {
     return $this->applicationName;
   }
-
   public function setCustomerId($customerId)
   {
     $this->customerId = $customerId;
   }
-
   public function getCustomerId()
   {
     return $this->customerId;
   }
-
   public function setTime($time)
   {
     $this->time = $time;
   }
-
   public function getTime()
   {
     return $this->time;
   }
-
   public function setUniqueQualifier($uniqueQualifier)
   {
     $this->uniqueQualifier = $uniqueQualifier;
   }
-
   public function getUniqueQualifier()
   {
     return $this->uniqueQualifier;
@@ -764,6 +748,8 @@ class Google_Service_Reports_ActivityId extends Google_Model
 
 class Google_Service_Reports_Channel extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $address;
   public $expiration;
   public $id;
@@ -775,101 +761,83 @@ class Google_Service_Reports_Channel extends Google_Model
   public $token;
   public $type;
 
+
   public function setAddress($address)
   {
     $this->address = $address;
   }
-
   public function getAddress()
   {
     return $this->address;
   }
-
   public function setExpiration($expiration)
   {
     $this->expiration = $expiration;
   }
-
   public function getExpiration()
   {
     return $this->expiration;
   }
-
   public function setId($id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setParams($params)
   {
     $this->params = $params;
   }
-
   public function getParams()
   {
     return $this->params;
   }
-
   public function setPayload($payload)
   {
     $this->payload = $payload;
   }
-
   public function getPayload()
   {
     return $this->payload;
   }
-
   public function setResourceId($resourceId)
   {
     $this->resourceId = $resourceId;
   }
-
   public function getResourceId()
   {
     return $this->resourceId;
   }
-
   public function setResourceUri($resourceUri)
   {
     $this->resourceUri = $resourceUri;
   }
-
   public function getResourceUri()
   {
     return $this->resourceUri;
   }
-
   public function setToken($token)
   {
     $this->token = $token;
   }
-
   public function getToken()
   {
     return $this->token;
   }
-
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
@@ -878,12 +846,13 @@ class Google_Service_Reports_Channel extends Google_Model
 
 class Google_Service_Reports_ChannelParams extends Google_Model
 {
-
 }
 
 class Google_Service_Reports_UsageReport extends Google_Collection
 {
   protected $collection_key = 'parameters';
+  protected $internal_gapi_mappings = array(
+  );
   public $date;
   protected $entityType = 'Google_Service_Reports_UsageReportEntity';
   protected $entityDataType = '';
@@ -892,51 +861,43 @@ class Google_Service_Reports_UsageReport extends Google_Collection
   protected $parametersType = 'Google_Service_Reports_UsageReportParameters';
   protected $parametersDataType = 'array';
 
+
   public function setDate($date)
   {
     $this->date = $date;
   }
-
   public function getDate()
   {
     return $this->date;
   }
-
   public function setEntity(Google_Service_Reports_UsageReportEntity $entity)
   {
     $this->entity = $entity;
   }
-
   public function getEntity()
   {
     return $this->entity;
   }
-
   public function setEtag($etag)
   {
     $this->etag = $etag;
   }
-
   public function getEtag()
   {
     return $this->etag;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setParameters($parameters)
   {
     $this->parameters = $parameters;
   }
-
   public function getParameters()
   {
     return $this->parameters;
@@ -945,46 +906,42 @@ class Google_Service_Reports_UsageReport extends Google_Collection
 
 class Google_Service_Reports_UsageReportEntity extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $customerId;
   public $profileId;
   public $type;
   public $userEmail;
 
+
   public function setCustomerId($customerId)
   {
     $this->customerId = $customerId;
   }
-
   public function getCustomerId()
   {
     return $this->customerId;
   }
-
   public function setProfileId($profileId)
   {
     $this->profileId = $profileId;
   }
-
   public function getProfileId()
   {
     return $this->profileId;
   }
-
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
   }
-
   public function setUserEmail($userEmail)
   {
     $this->userEmail = $userEmail;
   }
-
   public function getUserEmail()
   {
     return $this->userEmail;
@@ -994,6 +951,8 @@ class Google_Service_Reports_UsageReportEntity extends Google_Model
 class Google_Service_Reports_UsageReportParameters extends Google_Collection
 {
   protected $collection_key = 'msgValue';
+  protected $internal_gapi_mappings = array(
+  );
   public $boolValue;
   public $datetimeValue;
   public $intValue;
@@ -1001,61 +960,51 @@ class Google_Service_Reports_UsageReportParameters extends Google_Collection
   public $name;
   public $stringValue;
 
+
   public function setBoolValue($boolValue)
   {
     $this->boolValue = $boolValue;
   }
-
   public function getBoolValue()
   {
     return $this->boolValue;
   }
-
   public function setDatetimeValue($datetimeValue)
   {
     $this->datetimeValue = $datetimeValue;
   }
-
   public function getDatetimeValue()
   {
     return $this->datetimeValue;
   }
-
   public function setIntValue($intValue)
   {
     $this->intValue = $intValue;
   }
-
   public function getIntValue()
   {
     return $this->intValue;
   }
-
   public function setMsgValue($msgValue)
   {
     $this->msgValue = $msgValue;
   }
-
   public function getMsgValue()
   {
     return $this->msgValue;
   }
-
   public function setName($name)
   {
     $this->name = $name;
   }
-
   public function getName()
   {
     return $this->name;
   }
-
   public function setStringValue($stringValue)
   {
     $this->stringValue = $stringValue;
   }
-
   public function getStringValue()
   {
     return $this->stringValue;
@@ -1064,12 +1013,13 @@ class Google_Service_Reports_UsageReportParameters extends Google_Collection
 
 class Google_Service_Reports_UsageReportParametersMsgValue extends Google_Model
 {
-
 }
 
 class Google_Service_Reports_UsageReports extends Google_Collection
 {
   protected $collection_key = 'warnings';
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   public $kind;
   public $nextPageToken;
@@ -1078,51 +1028,43 @@ class Google_Service_Reports_UsageReports extends Google_Collection
   protected $warningsType = 'Google_Service_Reports_UsageReportsWarnings';
   protected $warningsDataType = 'array';
 
+
   public function setEtag($etag)
   {
     $this->etag = $etag;
   }
-
   public function getEtag()
   {
     return $this->etag;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
   }
-
   public function setUsageReports($usageReports)
   {
     $this->usageReports = $usageReports;
   }
-
   public function getUsageReports()
   {
     return $this->usageReports;
   }
-
   public function setWarnings($warnings)
   {
     $this->warnings = $warnings;
   }
-
   public function getWarnings()
   {
     return $this->warnings;
@@ -1132,36 +1074,34 @@ class Google_Service_Reports_UsageReports extends Google_Collection
 class Google_Service_Reports_UsageReportsWarnings extends Google_Collection
 {
   protected $collection_key = 'data';
+  protected $internal_gapi_mappings = array(
+  );
   public $code;
   protected $dataType = 'Google_Service_Reports_UsageReportsWarningsData';
   protected $dataDataType = 'array';
   public $message;
 
+
   public function setCode($code)
   {
     $this->code = $code;
   }
-
   public function getCode()
   {
     return $this->code;
   }
-
   public function setData($data)
   {
     $this->data = $data;
   }
-
   public function getData()
   {
     return $this->data;
   }
-
   public function setMessage($message)
   {
     $this->message = $message;
   }
-
   public function getMessage()
   {
     return $this->message;
@@ -1170,24 +1110,24 @@ class Google_Service_Reports_UsageReportsWarnings extends Google_Collection
 
 class Google_Service_Reports_UsageReportsWarningsData extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $key;
   public $value;
 
+
   public function setKey($key)
   {
     $this->key = $key;
   }
-
   public function getKey()
   {
     return $this->key;
   }
-
   public function setValue($value)
   {
     $this->value = $value;
   }
-
   public function getValue()
   {
     return $this->value;

lib/google/src/Google/Service/Reseller.php

@@ -19,8 +19,7 @@
  * Service definition for Reseller (v1).
  *
  * <p>
- * Lets you create and manage your customers and their subscriptions.
- * </p>
+ * Lets you create and manage your customers and their subscriptions.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -32,9 +31,11 @@
 class Google_Service_Reseller extends Google_Service
 {
   /** Manage users on your domain. */
-  const APPS_ORDER = "https://www.googleapis.com/auth/apps.order";
+  const APPS_ORDER =
+      "https://www.googleapis.com/auth/apps.order";
   /** Manage users on your domain. */
-  const APPS_ORDER_READONLY = "https://www.googleapis.com/auth/apps.order.readonly";
+  const APPS_ORDER_READONLY =
+      "https://www.googleapis.com/auth/apps.order.readonly";
 
   public $customers;
   public $subscriptions;
@@ -107,7 +108,22 @@ class Google_Service_Reseller extends Google_Service
         'subscriptions',
         array(
           'methods' => array(
-            'changePlan' => array(
+            'activate' => array(
+              'path' => 'customers/{customerId}/subscriptions/{subscriptionId}/activate',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'customerId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'subscriptionId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'changePlan' => array(
               'path' => 'customers/{customerId}/subscriptions/{subscriptionId}/changePlan',
               'httpMethod' => 'POST',
               'parameters' => array(
@@ -241,6 +257,21 @@ class Google_Service_Reseller extends Google_Service
                   'required' => true,
                 ),
               ),
+            ),'suspend' => array(
+              'path' => 'customers/{customerId}/subscriptions/{subscriptionId}/suspend',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'customerId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'subscriptionId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
             ),
           )
         )
@@ -264,8 +295,7 @@ class Google_Service_Reseller_Customers_Resource extends Google_Service_Resource
    * Gets a customer resource if one exists and is owned by the reseller.
    * (customers.get)
    *
-   * @param string $customerId
-   * Id of the Customer
+   * @param string $customerId Id of the Customer
    * @param array $optParams Optional parameters.
    * @return Google_Service_Reseller_Customer
    */
@@ -275,15 +305,16 @@ class Google_Service_Reseller_Customers_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_Reseller_Customer");
   }
+
   /**
    * Creates a customer resource if one does not already exist. (customers.insert)
    *
    * @param Google_Customer $postBody
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string customerAuthToken
-   * An auth token needed for inserting a customer for which domain already exists. Can be generated
-    * at https://www.google.com/a/cpanel//TransferToken. Optional.
+   * @opt_param string customerAuthToken An auth token needed for inserting a
+   * customer for which domain already exists. Can be generated at
+   * https://www.google.com/a/cpanel//TransferToken. Optional.
    * @return Google_Service_Reseller_Customer
    */
   public function insert(Google_Service_Reseller_Customer $postBody, $optParams = array())
@@ -292,12 +323,12 @@ class Google_Service_Reseller_Customers_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('insert', array($params), "Google_Service_Reseller_Customer");
   }
+
   /**
    * Update a customer resource if one it exists and is owned by the reseller.
    * This method supports patch semantics. (customers.patch)
    *
-   * @param string $customerId
-   * Id of the Customer
+   * @param string $customerId Id of the Customer
    * @param Google_Customer $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Reseller_Customer
@@ -308,12 +339,12 @@ class Google_Service_Reseller_Customers_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('patch', array($params), "Google_Service_Reseller_Customer");
   }
+
   /**
    * Update a customer resource if one it exists and is owned by the reseller.
    * (customers.update)
    *
-   * @param string $customerId
-   * Id of the Customer
+   * @param string $customerId Id of the Customer
    * @param Google_Customer $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Reseller_Customer
@@ -337,13 +368,29 @@ class Google_Service_Reseller_Customers_Resource extends Google_Service_Resource
 class Google_Service_Reseller_Subscriptions_Resource extends Google_Service_Resource
 {
 
+  /**
+   * Activates a subscription previously suspended by the reseller
+   * (subscriptions.activate)
+   *
+   * @param string $customerId Id of the Customer
+   * @param string $subscriptionId Id of the subscription, which is unique for a
+   * customer
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Reseller_Subscription
+   */
+  public function activate($customerId, $subscriptionId, $optParams = array())
+  {
+    $params = array('customerId' => $customerId, 'subscriptionId' => $subscriptionId);
+    $params = array_merge($params, $optParams);
+    return $this->call('activate', array($params), "Google_Service_Reseller_Subscription");
+  }
+
   /**
    * Changes the plan of a subscription (subscriptions.changePlan)
    *
-   * @param string $customerId
-   * Id of the Customer
-   * @param string $subscriptionId
-   * Id of the subscription, which is unique for a customer
+   * @param string $customerId Id of the Customer
+   * @param string $subscriptionId Id of the subscription, which is unique for a
+   * customer
    * @param Google_ChangePlanRequest $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Reseller_Subscription
@@ -354,14 +401,14 @@ class Google_Service_Reseller_Subscriptions_Resource extends Google_Service_Reso
     $params = array_merge($params, $optParams);
     return $this->call('changePlan', array($params), "Google_Service_Reseller_Subscription");
   }
+
   /**
    * Changes the renewal settings of a subscription
    * (subscriptions.changeRenewalSettings)
    *
-   * @param string $customerId
-   * Id of the Customer
-   * @param string $subscriptionId
-   * Id of the subscription, which is unique for a customer
+   * @param string $customerId Id of the Customer
+   * @param string $subscriptionId Id of the subscription, which is unique for a
+   * customer
    * @param Google_RenewalSettings $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Reseller_Subscription
@@ -372,13 +419,13 @@ class Google_Service_Reseller_Subscriptions_Resource extends Google_Service_Reso
     $params = array_merge($params, $optParams);
     return $this->call('changeRenewalSettings', array($params), "Google_Service_Reseller_Subscription");
   }
+
   /**
    * Changes the seats configuration of a subscription (subscriptions.changeSeats)
    *
-   * @param string $customerId
-   * Id of the Customer
-   * @param string $subscriptionId
-   * Id of the subscription, which is unique for a customer
+   * @param string $customerId Id of the Customer
+   * @param string $subscriptionId Id of the subscription, which is unique for a
+   * customer
    * @param Google_Seats $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_Reseller_Subscription
@@ -389,15 +436,15 @@ class Google_Service_Reseller_Subscriptions_Resource extends Google_Service_Reso
     $params = array_merge($params, $optParams);
     return $this->call('changeSeats', array($params), "Google_Service_Reseller_Subscription");
   }
+
   /**
    * Cancels/Downgrades a subscription. (subscriptions.delete)
    *
-   * @param string $customerId
-   * Id of the Customer
-   * @param string $subscriptionId
-   * Id of the subscription, which is unique for a customer
-   * @param string $deletionType
-   * Whether the subscription is to be fully cancelled or downgraded
+   * @param string $customerId Id of the Customer
+   * @param string $subscriptionId Id of the subscription, which is unique for a
+   * customer
+   * @param string $deletionType Whether the subscription is to be fully cancelled
+   * or downgraded
    * @param array $optParams Optional parameters.
    */
   public function delete($customerId, $subscriptionId, $deletionType, $optParams = array())
@@ -406,13 +453,13 @@ class Google_Service_Reseller_Subscriptions_Resource extends Google_Service_Reso
     $params = array_merge($params, $optParams);
     return $this->call('delete', array($params));
   }
+
   /**
    * Gets a subscription of the customer. (subscriptions.get)
    *
-   * @param string $customerId
-   * Id of the Customer
-   * @param string $subscriptionId
-   * Id of the subscription, which is unique for a customer
+   * @param string $customerId Id of the Customer
+   * @param string $subscriptionId Id of the subscription, which is unique for a
+   * customer
    * @param array $optParams Optional parameters.
    * @return Google_Service_Reseller_Subscription
    */
@@ -422,17 +469,17 @@ class Google_Service_Reseller_Subscriptions_Resource extends Google_Service_Reso
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_Reseller_Subscription");
   }
+
   /**
    * Creates/Transfers a subscription for the customer. (subscriptions.insert)
    *
-   * @param string $customerId
-   * Id of the Customer
+   * @param string $customerId Id of the Customer
    * @param Google_Subscription $postBody
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string customerAuthToken
-   * An auth token needed for transferring a subscription. Can be generated at
-    * https://www.google.com/a/cpanel/customer-domain/TransferToken. Optional.
+   * @opt_param string customerAuthToken An auth token needed for transferring a
+   * subscription. Can be generated at https://www.google.com/a/cpanel/customer-
+   * domain/TransferToken. Optional.
    * @return Google_Service_Reseller_Subscription
    */
   public function insert($customerId, Google_Service_Reseller_Subscription $postBody, $optParams = array())
@@ -441,23 +488,21 @@ class Google_Service_Reseller_Subscriptions_Resource extends Google_Service_Reso
     $params = array_merge($params, $optParams);
     return $this->call('insert', array($params), "Google_Service_Reseller_Subscription");
   }
+
   /**
    * Lists subscriptions of a reseller, optionally filtered by a customer name
    * prefix. (subscriptions.listSubscriptions)
    *
    * @param array $optParams Optional parameters.
    *
-   * @opt_param string customerAuthToken
-   * An auth token needed if the customer is not a resold customer of this reseller. Can be generated
-    * at https://www.google.com/a/cpanel/customer-domain/TransferToken.Optional.
-   * @opt_param string pageToken
-   * Token to specify next page in the list
-   * @opt_param string customerId
-   * Id of the Customer
-   * @opt_param string maxResults
-   * Maximum number of results to return
-   * @opt_param string customerNamePrefix
-   * Prefix of the customer's domain name by which the subscriptions should be filtered. Optional
+   * @opt_param string customerAuthToken An auth token needed if the customer is
+   * not a resold customer of this reseller. Can be generated at
+   * https://www.google.com/a/cpanel/customer-domain/TransferToken.Optional.
+   * @opt_param string pageToken Token to specify next page in the list
+   * @opt_param string customerId Id of the Customer
+   * @opt_param string maxResults Maximum number of results to return
+   * @opt_param string customerNamePrefix Prefix of the customer's domain name by
+   * which the subscriptions should be filtered. Optional
    * @return Google_Service_Reseller_Subscriptions
    */
   public function listSubscriptions($optParams = array())
@@ -466,13 +511,13 @@ class Google_Service_Reseller_Subscriptions_Resource extends Google_Service_Reso
     $params = array_merge($params, $optParams);
     return $this->call('list', array($params), "Google_Service_Reseller_Subscriptions");
   }
+
   /**
    * Starts paid service of a trial subscription (subscriptions.startPaidService)
    *
-   * @param string $customerId
-   * Id of the Customer
-   * @param string $subscriptionId
-   * Id of the subscription, which is unique for a customer
+   * @param string $customerId Id of the Customer
+   * @param string $subscriptionId Id of the subscription, which is unique for a
+   * customer
    * @param array $optParams Optional parameters.
    * @return Google_Service_Reseller_Subscription
    */
@@ -482,6 +527,22 @@ class Google_Service_Reseller_Subscriptions_Resource extends Google_Service_Reso
     $params = array_merge($params, $optParams);
     return $this->call('startPaidService', array($params), "Google_Service_Reseller_Subscription");
   }
+
+  /**
+   * Suspends an active subscription (subscriptions.suspend)
+   *
+   * @param string $customerId Id of the Customer
+   * @param string $subscriptionId Id of the subscription, which is unique for a
+   * customer
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Reseller_Subscription
+   */
+  public function suspend($customerId, $subscriptionId, $optParams = array())
+  {
+    $params = array('customerId' => $customerId, 'subscriptionId' => $subscriptionId);
+    $params = array_merge($params, $optParams);
+    return $this->call('suspend', array($params), "Google_Service_Reseller_Subscription");
+  }
 }
 
 
@@ -489,6 +550,8 @@ class Google_Service_Reseller_Subscriptions_Resource extends Google_Service_Reso
 
 class Google_Service_Reseller_Address extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $addressLine1;
   public $addressLine2;
   public $addressLine3;
@@ -500,101 +563,83 @@ class Google_Service_Reseller_Address extends Google_Model
   public $postalCode;
   public $region;
 
+
   public function setAddressLine1($addressLine1)
   {
     $this->addressLine1 = $addressLine1;
   }
-
   public function getAddressLine1()
   {
     return $this->addressLine1;
   }
-
   public function setAddressLine2($addressLine2)
   {
     $this->addressLine2 = $addressLine2;
   }
-
   public function getAddressLine2()
   {
     return $this->addressLine2;
   }
-
   public function setAddressLine3($addressLine3)
   {
     $this->addressLine3 = $addressLine3;
   }
-
   public function getAddressLine3()
   {
     return $this->addressLine3;
   }
-
   public function setContactName($contactName)
   {
     $this->contactName = $contactName;
   }
-
   public function getContactName()
   {
     return $this->contactName;
   }
-
   public function setCountryCode($countryCode)
   {
     $this->countryCode = $countryCode;
   }
-
   public function getCountryCode()
   {
     return $this->countryCode;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setLocality($locality)
   {
     $this->locality = $locality;
   }
-
   public function getLocality()
   {
     return $this->locality;
   }
-
   public function setOrganizationName($organizationName)
   {
     $this->organizationName = $organizationName;
   }
-
   public function getOrganizationName()
   {
     return $this->organizationName;
   }
-
   public function setPostalCode($postalCode)
   {
     $this->postalCode = $postalCode;
   }
-
   public function getPostalCode()
   {
     return $this->postalCode;
   }
-
   public function setRegion($region)
   {
     $this->region = $region;
   }
-
   public function getRegion()
   {
     return $this->region;
@@ -603,47 +648,43 @@ class Google_Service_Reseller_Address extends Google_Model
 
 class Google_Service_Reseller_ChangePlanRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   public $planName;
   public $purchaseOrderId;
   protected $seatsType = 'Google_Service_Reseller_Seats';
   protected $seatsDataType = '';
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setPlanName($planName)
   {
     $this->planName = $planName;
   }
-
   public function getPlanName()
   {
     return $this->planName;
   }
-
   public function setPurchaseOrderId($purchaseOrderId)
   {
     $this->purchaseOrderId = $purchaseOrderId;
   }
-
   public function getPurchaseOrderId()
   {
     return $this->purchaseOrderId;
   }
-
   public function setSeats(Google_Service_Reseller_Seats $seats)
   {
     $this->seats = $seats;
   }
-
   public function getSeats()
   {
     return $this->seats;
@@ -652,6 +693,8 @@ class Google_Service_Reseller_ChangePlanRequest extends Google_Model
 
 class Google_Service_Reseller_Customer extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $alternateEmail;
   public $customerDomain;
   public $customerId;
@@ -661,71 +704,59 @@ class Google_Service_Reseller_Customer extends Google_Model
   protected $postalAddressDataType = '';
   public $resourceUiUrl;
 
+
   public function setAlternateEmail($alternateEmail)
   {
     $this->alternateEmail = $alternateEmail;
   }
-
   public function getAlternateEmail()
   {
     return $this->alternateEmail;
   }
-
   public function setCustomerDomain($customerDomain)
   {
     $this->customerDomain = $customerDomain;
   }
-
   public function getCustomerDomain()
   {
     return $this->customerDomain;
   }
-
   public function setCustomerId($customerId)
   {
     $this->customerId = $customerId;
   }
-
   public function getCustomerId()
   {
     return $this->customerId;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setPhoneNumber($phoneNumber)
   {
     $this->phoneNumber = $phoneNumber;
   }
-
   public function getPhoneNumber()
   {
     return $this->phoneNumber;
   }
-
   public function setPostalAddress(Google_Service_Reseller_Address $postalAddress)
   {
     $this->postalAddress = $postalAddress;
   }
-
   public function getPostalAddress()
   {
     return $this->postalAddress;
   }
-
   public function setResourceUiUrl($resourceUiUrl)
   {
     $this->resourceUiUrl = $resourceUiUrl;
   }
-
   public function getResourceUiUrl()
   {
     return $this->resourceUiUrl;
@@ -734,24 +765,24 @@ class Google_Service_Reseller_Customer extends Google_Model
 
 class Google_Service_Reseller_RenewalSettings extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   public $renewalType;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setRenewalType($renewalType)
   {
     $this->renewalType = $renewalType;
   }
-
   public function getRenewalType()
   {
     return $this->renewalType;
@@ -760,35 +791,42 @@ class Google_Service_Reseller_RenewalSettings extends Google_Model
 
 class Google_Service_Reseller_Seats extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
+  public $licensedNumberOfSeats;
   public $maximumNumberOfSeats;
   public $numberOfSeats;
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
+  public function setLicensedNumberOfSeats($licensedNumberOfSeats)
+  {
+    $this->licensedNumberOfSeats = $licensedNumberOfSeats;
+  }
+  public function getLicensedNumberOfSeats()
+  {
+    return $this->licensedNumberOfSeats;
+  }
   public function setMaximumNumberOfSeats($maximumNumberOfSeats)
   {
     $this->maximumNumberOfSeats = $maximumNumberOfSeats;
   }
-
   public function getMaximumNumberOfSeats()
   {
     return $this->maximumNumberOfSeats;
   }
-
   public function setNumberOfSeats($numberOfSeats)
   {
     $this->numberOfSeats = $numberOfSeats;
   }
-
   public function getNumberOfSeats()
   {
     return $this->numberOfSeats;
@@ -797,6 +835,8 @@ class Google_Service_Reseller_Seats extends Google_Model
 
 class Google_Service_Reseller_Subscription extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $creationTime;
   public $customerId;
   public $kind;
@@ -816,131 +856,107 @@ class Google_Service_Reseller_Subscription extends Google_Model
   protected $trialSettingsType = 'Google_Service_Reseller_SubscriptionTrialSettings';
   protected $trialSettingsDataType = '';
 
+
   public function setCreationTime($creationTime)
   {
     $this->creationTime = $creationTime;
   }
-
   public function getCreationTime()
   {
     return $this->creationTime;
   }
-
   public function setCustomerId($customerId)
   {
     $this->customerId = $customerId;
   }
-
   public function getCustomerId()
   {
     return $this->customerId;
   }
-
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setPlan(Google_Service_Reseller_SubscriptionPlan $plan)
   {
     $this->plan = $plan;
   }
-
   public function getPlan()
   {
     return $this->plan;
   }
-
   public function setPurchaseOrderId($purchaseOrderId)
   {
     $this->purchaseOrderId = $purchaseOrderId;
   }
-
   public function getPurchaseOrderId()
   {
     return $this->purchaseOrderId;
   }
-
   public function setRenewalSettings(Google_Service_Reseller_RenewalSettings $renewalSettings)
   {
     $this->renewalSettings = $renewalSettings;
   }
-
   public function getRenewalSettings()
   {
     return $this->renewalSettings;
   }
-
   public function setResourceUiUrl($resourceUiUrl)
   {
     $this->resourceUiUrl = $resourceUiUrl;
   }
-
   public function getResourceUiUrl()
   {
     return $this->resourceUiUrl;
   }
-
   public function setSeats(Google_Service_Reseller_Seats $seats)
   {
     $this->seats = $seats;
   }
-
   public function getSeats()
   {
     return $this->seats;
   }
-
   public function setSkuId($skuId)
   {
     $this->skuId = $skuId;
   }
-
   public function getSkuId()
   {
     return $this->skuId;
   }
-
   public function setStatus($status)
   {
     $this->status = $status;
   }
-
   public function getStatus()
   {
     return $this->status;
   }
-
   public function setSubscriptionId($subscriptionId)
   {
     $this->subscriptionId = $subscriptionId;
   }
-
   public function getSubscriptionId()
   {
     return $this->subscriptionId;
   }
-
   public function setTransferInfo(Google_Service_Reseller_SubscriptionTransferInfo $transferInfo)
   {
     $this->transferInfo = $transferInfo;
   }
-
   public function getTransferInfo()
   {
     return $this->transferInfo;
   }
-
   public function setTrialSettings(Google_Service_Reseller_SubscriptionTrialSettings $trialSettings)
   {
     $this->trialSettings = $trialSettings;
   }
-
   public function getTrialSettings()
   {
     return $this->trialSettings;
@@ -949,36 +965,34 @@ class Google_Service_Reseller_Subscription extends Google_Model
 
 class Google_Service_Reseller_SubscriptionPlan extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   protected $commitmentIntervalType = 'Google_Service_Reseller_SubscriptionPlanCommitmentInterval';
   protected $commitmentIntervalDataType = '';
   public $isCommitmentPlan;
   public $planName;
 
+
   public function setCommitmentInterval(Google_Service_Reseller_SubscriptionPlanCommitmentInterval $commitmentInterval)
   {
     $this->commitmentInterval = $commitmentInterval;
   }
-
   public function getCommitmentInterval()
   {
     return $this->commitmentInterval;
   }
-
   public function setIsCommitmentPlan($isCommitmentPlan)
   {
     $this->isCommitmentPlan = $isCommitmentPlan;
   }
-
   public function getIsCommitmentPlan()
   {
     return $this->isCommitmentPlan;
   }
-
   public function setPlanName($planName)
   {
     $this->planName = $planName;
   }
-
   public function getPlanName()
   {
     return $this->planName;
@@ -987,24 +1001,24 @@ class Google_Service_Reseller_SubscriptionPlan extends Google_Model
 
 class Google_Service_Reseller_SubscriptionPlanCommitmentInterval extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $endTime;
   public $startTime;
 
+
   public function setEndTime($endTime)
   {
     $this->endTime = $endTime;
   }
-
   public function getEndTime()
   {
     return $this->endTime;
   }
-
   public function setStartTime($startTime)
   {
     $this->startTime = $startTime;
   }
-
   public function getStartTime()
   {
     return $this->startTime;
@@ -1013,24 +1027,24 @@ class Google_Service_Reseller_SubscriptionPlanCommitmentInterval extends Google_
 
 class Google_Service_Reseller_SubscriptionTransferInfo extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $minimumTransferableSeats;
   public $transferabilityExpirationTime;
 
+
   public function setMinimumTransferableSeats($minimumTransferableSeats)
   {
     $this->minimumTransferableSeats = $minimumTransferableSeats;
   }
-
   public function getMinimumTransferableSeats()
   {
     return $this->minimumTransferableSeats;
   }
-
   public function setTransferabilityExpirationTime($transferabilityExpirationTime)
   {
     $this->transferabilityExpirationTime = $transferabilityExpirationTime;
   }
-
   public function getTransferabilityExpirationTime()
   {
     return $this->transferabilityExpirationTime;
@@ -1039,24 +1053,24 @@ class Google_Service_Reseller_SubscriptionTransferInfo extends Google_Model
 
 class Google_Service_Reseller_SubscriptionTrialSettings extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $isInTrial;
   public $trialEndTime;
 
+
   public function setIsInTrial($isInTrial)
   {
     $this->isInTrial = $isInTrial;
   }
-
   public function getIsInTrial()
   {
     return $this->isInTrial;
   }
-
   public function setTrialEndTime($trialEndTime)
   {
     $this->trialEndTime = $trialEndTime;
   }
-
   public function getTrialEndTime()
   {
     return $this->trialEndTime;
@@ -1066,36 +1080,34 @@ class Google_Service_Reseller_SubscriptionTrialSettings extends Google_Model
 class Google_Service_Reseller_Subscriptions extends Google_Collection
 {
   protected $collection_key = 'subscriptions';
+  protected $internal_gapi_mappings = array(
+  );
   public $kind;
   public $nextPageToken;
   protected $subscriptionsType = 'Google_Service_Reseller_Subscription';
   protected $subscriptionsDataType = 'array';
 
+
   public function setKind($kind)
   {
     $this->kind = $kind;
   }
-
   public function getKind()
   {
     return $this->kind;
   }
-
   public function setNextPageToken($nextPageToken)
   {
     $this->nextPageToken = $nextPageToken;
   }
-
   public function getNextPageToken()
   {
     return $this->nextPageToken;
   }
-
   public function setSubscriptions($subscriptions)
   {
     $this->subscriptions = $subscriptions;
   }
-
   public function getSubscriptions()
   {
     return $this->subscriptions;

lib/google/src/Google/Service/Resource.php

@@ -15,12 +15,7 @@
  * limitations under the License.
  */
 
-require_once 'Google/Client.php';
-require_once 'Google/Exception.php';
-require_once 'Google/Utils.php';
-require_once 'Google/Http/Request.php';
-require_once 'Google/Http/MediaFileUpload.php';
-require_once 'Google/Http/REST.php';
+require_once realpath(dirname(__FILE__) . '/../../../autoload.php');
 
 /**
  * Implements the actual methods/resources of the discovered Google API using magic function
@@ -84,6 +79,15 @@ class Google_Service_Resource
   public function call($name, $arguments, $expected_class = null)
   {
     if (! isset($this->methods[$name])) {
+      $this->client->getLogger()->error(
+          'Service method unknown',
+          array(
+              'service' => $this->serviceName,
+              'resource' => $this->resourceName,
+              'method' => $name
+          )
+      );
+
       throw new Google_Exception(
           "Unknown function: " .
           "{$this->serviceName}->{$this->resourceName}->{$name}()"
@@ -129,6 +133,15 @@ class Google_Service_Resource
     );
     foreach ($parameters as $key => $val) {
       if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
+        $this->client->getLogger()->error(
+            'Service parameter unknown',
+            array(
+                'service' => $this->serviceName,
+                'resource' => $this->resourceName,
+                'method' => $name,
+                'parameter' => $key
+            )
+        );
         throw new Google_Exception("($name) unknown parameter: '$key'");
       }
     }
@@ -138,6 +151,15 @@ class Google_Service_Resource
           $paramSpec['required'] &&
           ! isset($parameters[$paramName])
       ) {
+        $this->client->getLogger()->error(
+            'Service parameter missing',
+            array(
+                'service' => $this->serviceName,
+                'resource' => $this->resourceName,
+                'method' => $name,
+                'parameter' => $paramName
+            )
+        );
         throw new Google_Exception("($name) missing required param: '$paramName'");
       }
       if (isset($parameters[$paramName])) {
@@ -153,6 +175,16 @@ class Google_Service_Resource
 
     $servicePath = $this->service->servicePath;
 
+    $this->client->getLogger()->info(
+        'Service Call',
+        array(
+            'service' => $this->serviceName,
+            'resource' => $this->resourceName,
+            'method' => $name,
+            'arguments' => $parameters,
+        )
+    );
+
     $url = Google_Http_REST::createRequestUri(
         $servicePath,
         $method['path'],

lib/google/src/Google/Service/SiteVerification.php

@@ -19,8 +19,7 @@
  * Service definition for SiteVerification (v1).
  *
  * <p>
- * Lets you programatically verify ownership of websites or domains with Google.
- * </p>
+ * Lets you programatically verify ownership of websites or domains with Google.</p>
  *
  * <p>
  * For more information about this service, see the API
@@ -32,9 +31,11 @@
 class Google_Service_SiteVerification extends Google_Service
 {
   /** Manage the list of sites and domains you control. */
-  const SITEVERIFICATION = "https://www.googleapis.com/auth/siteverification";
+  const SITEVERIFICATION =
+      "https://www.googleapis.com/auth/siteverification";
   /** Manage your new site verifications with Google. */
-  const SITEVERIFICATION_VERIFY_ONLY = "https://www.googleapis.com/auth/siteverification.verify_only";
+  const SITEVERIFICATION_VERIFY_ONLY =
+      "https://www.googleapis.com/auth/siteverification.verify_only";
 
   public $webResource;
   
@@ -137,8 +138,7 @@ class Google_Service_SiteVerification_WebResource_Resource extends Google_Servic
   /**
    * Relinquish ownership of a website or domain. (webResource.delete)
    *
-   * @param string $id
-   * The id of a verified site or domain.
+   * @param string $id The id of a verified site or domain.
    * @param array $optParams Optional parameters.
    */
   public function delete($id, $optParams = array())
@@ -147,11 +147,11 @@ class Google_Service_SiteVerification_WebResource_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('delete', array($params));
   }
+
   /**
    * Get the most current data for a website or domain. (webResource.get)
    *
-   * @param string $id
-   * The id of a verified site or domain.
+   * @param string $id The id of a verified site or domain.
    * @param array $optParams Optional parameters.
    * @return Google_Service_SiteVerification_SiteVerificationWebResourceResource
    */
@@ -161,6 +161,7 @@ class Google_Service_SiteVerification_WebResource_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('get', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceResource");
   }
+
   /**
    * Get a verification token for placing on a website or domain.
    * (webResource.getToken)
@@ -175,11 +176,12 @@ class Google_Service_SiteVerification_WebResource_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('getToken', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceGettokenResponse");
   }
+
   /**
    * Attempt verification of a website or domain. (webResource.insert)
    *
-   * @param string $verificationMethod
-   * The method to use for verifying a site or domain.
+   * @param string $verificationMethod The method to use for verifying a site or
+   * domain.
    * @param Google_SiteVerificationWebResourceResource $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_SiteVerification_SiteVerificationWebResourceResource
@@ -190,6 +192,7 @@ class Google_Service_SiteVerification_WebResource_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('insert', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceResource");
   }
+
   /**
    * Get the list of your verified websites and domains.
    * (webResource.listWebResource)
@@ -203,12 +206,12 @@ class Google_Service_SiteVerification_WebResource_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('list', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceListResponse");
   }
+
   /**
    * Modify the list of owners for your website or domain. This method supports
    * patch semantics. (webResource.patch)
    *
-   * @param string $id
-   * The id of a verified site or domain.
+   * @param string $id The id of a verified site or domain.
    * @param Google_SiteVerificationWebResourceResource $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_SiteVerification_SiteVerificationWebResourceResource
@@ -219,11 +222,11 @@ class Google_Service_SiteVerification_WebResource_Resource extends Google_Servic
     $params = array_merge($params, $optParams);
     return $this->call('patch', array($params), "Google_Service_SiteVerification_SiteVerificationWebResourceResource");
   }
+
   /**
    * Modify the list of owners for your website or domain. (webResource.update)
    *
-   * @param string $id
-   * The id of a verified site or domain.
+   * @param string $id The id of a verified site or domain.
    * @param Google_SiteVerificationWebResourceResource $postBody
    * @param array $optParams Optional parameters.
    * @return Google_Service_SiteVerification_SiteVerificationWebResourceResource
@@ -241,25 +244,25 @@ class Google_Service_SiteVerification_WebResource_Resource extends Google_Servic
 
 class Google_Service_SiteVerification_SiteVerificationWebResourceGettokenRequest extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   protected $siteType = 'Google_Service_SiteVerification_SiteVerificationWebResourceGettokenRequestSite';
   protected $siteDataType = '';
   public $verificationMethod;
 
+
   public function setSite(Google_Service_SiteVerification_SiteVerificationWebResourceGettokenRequestSite $site)
   {
     $this->site = $site;
   }
-
   public function getSite()
   {
     return $this->site;
   }
-
   public function setVerificationMethod($verificationMethod)
   {
     $this->verificationMethod = $verificationMethod;
   }
-
   public function getVerificationMethod()
   {
     return $this->verificationMethod;
@@ -268,24 +271,24 @@ class Google_Service_SiteVerification_SiteVerificationWebResourceGettokenRequest
 
 class Google_Service_SiteVerification_SiteVerificationWebResourceGettokenRequestSite extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $identifier;
   public $type;
 
+
   public function setIdentifier($identifier)
   {
     $this->identifier = $identifier;
   }
-
   public function getIdentifier()
   {
     return $this->identifier;
   }
-
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;
@@ -294,24 +297,24 @@ class Google_Service_SiteVerification_SiteVerificationWebResourceGettokenRequest
 
 class Google_Service_SiteVerification_SiteVerificationWebResourceGettokenResponse extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $method;
   public $token;
 
+
   public function setMethod($method)
   {
     $this->method = $method;
   }
-
   public function getMethod()
   {
     return $this->method;
   }
-
   public function setToken($token)
   {
     $this->token = $token;
   }
-
   public function getToken()
   {
     return $this->token;
@@ -321,14 +324,16 @@ class Google_Service_SiteVerification_SiteVerificationWebResourceGettokenRespons
 class Google_Service_SiteVerification_SiteVerificationWebResourceListResponse extends Google_Collection
 {
   protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   protected $itemsType = 'Google_Service_SiteVerification_SiteVerificationWebResourceResource';
   protected $itemsDataType = 'array';
 
+
   public function setItems($items)
   {
     $this->items = $items;
   }
-
   public function getItems()
   {
     return $this->items;
@@ -338,36 +343,34 @@ class Google_Service_SiteVerification_SiteVerificationWebResourceListResponse ex
 class Google_Service_SiteVerification_SiteVerificationWebResourceResource extends Google_Collection
 {
   protected $collection_key = 'owners';
+  protected $internal_gapi_mappings = array(
+  );
   public $id;
   public $owners;
   protected $siteType = 'Google_Service_SiteVerification_SiteVerificationWebResourceResourceSite';
   protected $siteDataType = '';
 
+
   public function setId($id)
   {
     $this->id = $id;
   }
-
   public function getId()
   {
     return $this->id;
   }
-
   public function setOwners($owners)
   {
     $this->owners = $owners;
   }
-
   public function getOwners()
   {
     return $this->owners;
   }
-
   public function setSite(Google_Service_SiteVerification_SiteVerificationWebResourceResourceSite $site)
   {
     $this->site = $site;
   }
-
   public function getSite()
   {
     return $this->site;
@@ -376,24 +379,24 @@ class Google_Service_SiteVerification_SiteVerificationWebResourceResource extend
 
 class Google_Service_SiteVerification_SiteVerificationWebResourceResourceSite extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $identifier;
   public $type;
 
+
   public function setIdentifier($identifier)
   {
     $this->identifier = $identifier;
   }
-
   public function getIdentifier()
   {
     return $this->identifier;
   }
-
   public function setType($type)
   {
     $this->type = $type;
   }
-
   public function getType()
   {
     return $this->type;