updated plugin WP Mail SMTP version 2.3.1

This commit is contained in:
2020-08-24 15:45:02 +00:00
committed by Gitium
parent be08bbbabd
commit fd5eaaad6c
66 changed files with 3703 additions and 1342 deletions

View File

@ -4,4 +4,4 @@
require_once __DIR__ . '/composer/autoload_real.php';
return ComposerAutoloaderInit72f613a3d0c2cc77892490951b6e5352::getLoader();
return ComposerAutoloaderInitecc5aee58cbc7fae6cdc39ef5e9f1f73::getLoader();

View File

@ -7,6 +7,7 @@ $baseDir = dirname($vendorDir);
return array(
'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
'Wikimedia\\Composer\\' => array($vendorDir . '/wikimedia/composer-merge-plugin/src'),
'WPMailSMTP\\' => array($baseDir . '/src'),
'Symfony\\Polyfill\\Php72\\' => array($vendorDir . '/symfony/polyfill-php72'),
'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),

View File

@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
class ComposerAutoloaderInit72f613a3d0c2cc77892490951b6e5352
class ComposerAutoloaderInitecc5aee58cbc7fae6cdc39ef5e9f1f73
{
private static $loader;
@ -22,15 +22,15 @@ class ComposerAutoloaderInit72f613a3d0c2cc77892490951b6e5352
return self::$loader;
}
spl_autoload_register(array('ComposerAutoloaderInit72f613a3d0c2cc77892490951b6e5352', 'loadClassLoader'), true, true);
spl_autoload_register(array('ComposerAutoloaderInitecc5aee58cbc7fae6cdc39ef5e9f1f73', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
spl_autoload_unregister(array('ComposerAutoloaderInit72f613a3d0c2cc77892490951b6e5352', 'loadClassLoader'));
spl_autoload_unregister(array('ComposerAutoloaderInitecc5aee58cbc7fae6cdc39ef5e9f1f73', 'loadClassLoader'));
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
if ($useStaticLoader) {
require_once __DIR__ . '/autoload_static.php';
call_user_func(\Composer\Autoload\ComposerStaticInit72f613a3d0c2cc77892490951b6e5352::getInitializer($loader));
call_user_func(\Composer\Autoload\ComposerStaticInitecc5aee58cbc7fae6cdc39ef5e9f1f73::getInitializer($loader));
} else {
$map = require __DIR__ . '/autoload_namespaces.php';
foreach ($map as $namespace => $path) {
@ -51,19 +51,19 @@ class ComposerAutoloaderInit72f613a3d0c2cc77892490951b6e5352
$loader->register(true);
if ($useStaticLoader) {
$includeFiles = Composer\Autoload\ComposerStaticInit72f613a3d0c2cc77892490951b6e5352::$files;
$includeFiles = Composer\Autoload\ComposerStaticInitecc5aee58cbc7fae6cdc39ef5e9f1f73::$files;
} else {
$includeFiles = require __DIR__ . '/autoload_files.php';
}
foreach ($includeFiles as $fileIdentifier => $file) {
composerRequire72f613a3d0c2cc77892490951b6e5352($fileIdentifier, $file);
composerRequireecc5aee58cbc7fae6cdc39ef5e9f1f73($fileIdentifier, $file);
}
return $loader;
}
}
function composerRequire72f613a3d0c2cc77892490951b6e5352($fileIdentifier, $file)
function composerRequireecc5aee58cbc7fae6cdc39ef5e9f1f73($fileIdentifier, $file)
{
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
require $file;

View File

@ -4,7 +4,7 @@
namespace Composer\Autoload;
class ComposerStaticInit72f613a3d0c2cc77892490951b6e5352
class ComposerStaticInitecc5aee58cbc7fae6cdc39ef5e9f1f73
{
public static $files = array (
'7b11c4dc42b3b3023073cb14e519683c' => __DIR__ . '/..' . '/ralouphie/getallheaders/src/getallheaders.php',
@ -24,6 +24,7 @@ class ComposerStaticInit72f613a3d0c2cc77892490951b6e5352
),
'W' =>
array (
'Wikimedia\\Composer\\' => 19,
'WPMailSMTP\\' => 11,
),
'S' =>
@ -65,6 +66,10 @@ class ComposerStaticInit72f613a3d0c2cc77892490951b6e5352
array (
0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
),
'Wikimedia\\Composer\\' =>
array (
0 => __DIR__ . '/..' . '/wikimedia/composer-merge-plugin/src',
),
'WPMailSMTP\\' =>
array (
0 => __DIR__ . '/../..' . '/src',
@ -149,10 +154,10 @@ class ComposerStaticInit72f613a3d0c2cc77892490951b6e5352
public static function getInitializer(ClassLoader $loader)
{
return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit72f613a3d0c2cc77892490951b6e5352::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit72f613a3d0c2cc77892490951b6e5352::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit72f613a3d0c2cc77892490951b6e5352::$prefixesPsr0;
$loader->classMap = ComposerStaticInit72f613a3d0c2cc77892490951b6e5352::$classMap;
$loader->prefixLengthsPsr4 = ComposerStaticInitecc5aee58cbc7fae6cdc39ef5e9f1f73::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInitecc5aee58cbc7fae6cdc39ef5e9f1f73::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInitecc5aee58cbc7fae6cdc39ef5e9f1f73::$prefixesPsr0;
$loader->classMap = ComposerStaticInitecc5aee58cbc7fae6cdc39ef5e9f1f73::$classMap;
}, null, ClassLoader::class);
}

View File

@ -19,7 +19,8 @@
* Service definition for Gmail (v1).
*
* <p>
* Access Gmail mailboxes including sending user email.</p>
* The Gmail API lets you view and manage Gmail mailbox data like threads,
* messages, and labels.</p>
*
* <p>
* For more information about this service, see the API
@ -97,7 +98,7 @@ class Google_Service_Gmail extends Google_Service
{
parent::__construct($client);
$this->rootUrl = $rootUrl ?: 'https://www.googleapis.com/';
$this->servicePath = 'gmail/v1/users/';
$this->servicePath = '';
$this->batchPath = 'batch/gmail/v1';
$this->version = 'v1';
$this->serviceName = 'gmail';
@ -109,7 +110,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'getProfile' => array(
'path' => '{userId}/profile',
'path' => 'gmail/v1/users/{userId}/profile',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -119,7 +120,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'stop' => array(
'path' => '{userId}/stop',
'path' => 'gmail/v1/users/{userId}/stop',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -129,7 +130,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'watch' => array(
'path' => '{userId}/watch',
'path' => 'gmail/v1/users/{userId}/watch',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -149,7 +150,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'create' => array(
'path' => '{userId}/drafts',
'path' => 'gmail/v1/users/{userId}/drafts',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -159,7 +160,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'delete' => array(
'path' => '{userId}/drafts/{id}',
'path' => 'gmail/v1/users/{userId}/drafts/{id}',
'httpMethod' => 'DELETE',
'parameters' => array(
'userId' => array(
@ -174,7 +175,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'get' => array(
'path' => '{userId}/drafts/{id}',
'path' => 'gmail/v1/users/{userId}/drafts/{id}',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -193,7 +194,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'list' => array(
'path' => '{userId}/drafts',
'path' => 'gmail/v1/users/{userId}/drafts',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -201,25 +202,25 @@ class Google_Service_Gmail extends Google_Service
'type' => 'string',
'required' => true,
),
'includeSpamTrash' => array(
'pageToken' => array(
'location' => 'query',
'type' => 'boolean',
'type' => 'string',
),
'maxResults' => array(
'location' => 'query',
'type' => 'integer',
),
'pageToken' => array(
'location' => 'query',
'type' => 'string',
),
'q' => array(
'location' => 'query',
'type' => 'string',
),
'includeSpamTrash' => array(
'location' => 'query',
'type' => 'boolean',
),
),
),'send' => array(
'path' => '{userId}/drafts/send',
'path' => 'gmail/v1/users/{userId}/drafts/send',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -229,7 +230,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'update' => array(
'path' => '{userId}/drafts/{id}',
'path' => 'gmail/v1/users/{userId}/drafts/{id}',
'httpMethod' => 'PUT',
'parameters' => array(
'userId' => array(
@ -254,7 +255,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'list' => array(
'path' => '{userId}/history',
'path' => 'gmail/v1/users/{userId}/history',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -267,22 +268,22 @@ class Google_Service_Gmail extends Google_Service
'type' => 'string',
'repeated' => true,
),
'startHistoryId' => array(
'location' => 'query',
'type' => 'string',
),
'labelId' => array(
'location' => 'query',
'type' => 'string',
),
'pageToken' => array(
'location' => 'query',
'type' => 'string',
),
'maxResults' => array(
'location' => 'query',
'type' => 'integer',
),
'pageToken' => array(
'location' => 'query',
'type' => 'string',
),
'startHistoryId' => array(
'location' => 'query',
'type' => 'string',
),
),
),
)
@ -295,7 +296,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'create' => array(
'path' => '{userId}/labels',
'path' => 'gmail/v1/users/{userId}/labels',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -305,7 +306,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'delete' => array(
'path' => '{userId}/labels/{id}',
'path' => 'gmail/v1/users/{userId}/labels/{id}',
'httpMethod' => 'DELETE',
'parameters' => array(
'userId' => array(
@ -320,7 +321,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'get' => array(
'path' => '{userId}/labels/{id}',
'path' => 'gmail/v1/users/{userId}/labels/{id}',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -335,7 +336,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'list' => array(
'path' => '{userId}/labels',
'path' => 'gmail/v1/users/{userId}/labels',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -345,7 +346,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'patch' => array(
'path' => '{userId}/labels/{id}',
'path' => 'gmail/v1/users/{userId}/labels/{id}',
'httpMethod' => 'PATCH',
'parameters' => array(
'userId' => array(
@ -360,7 +361,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'update' => array(
'path' => '{userId}/labels/{id}',
'path' => 'gmail/v1/users/{userId}/labels/{id}',
'httpMethod' => 'PUT',
'parameters' => array(
'userId' => array(
@ -385,7 +386,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'batchDelete' => array(
'path' => '{userId}/messages/batchDelete',
'path' => 'gmail/v1/users/{userId}/messages/batchDelete',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -395,7 +396,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'batchModify' => array(
'path' => '{userId}/messages/batchModify',
'path' => 'gmail/v1/users/{userId}/messages/batchModify',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -405,7 +406,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'delete' => array(
'path' => '{userId}/messages/{id}',
'path' => 'gmail/v1/users/{userId}/messages/{id}',
'httpMethod' => 'DELETE',
'parameters' => array(
'userId' => array(
@ -420,7 +421,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'get' => array(
'path' => '{userId}/messages/{id}',
'path' => 'gmail/v1/users/{userId}/messages/{id}',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -444,7 +445,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'import' => array(
'path' => '{userId}/messages/import',
'path' => 'gmail/v1/users/{userId}/messages/import',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -452,6 +453,10 @@ class Google_Service_Gmail extends Google_Service
'type' => 'string',
'required' => true,
),
'processForCalendar' => array(
'location' => 'query',
'type' => 'boolean',
),
'deleted' => array(
'location' => 'query',
'type' => 'boolean',
@ -464,13 +469,9 @@ class Google_Service_Gmail extends Google_Service
'location' => 'query',
'type' => 'boolean',
),
'processForCalendar' => array(
'location' => 'query',
'type' => 'boolean',
),
),
),'insert' => array(
'path' => '{userId}/messages',
'path' => 'gmail/v1/users/{userId}/messages',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -478,17 +479,17 @@ class Google_Service_Gmail extends Google_Service
'type' => 'string',
'required' => true,
),
'deleted' => array(
'location' => 'query',
'type' => 'boolean',
),
'internalDateSource' => array(
'location' => 'query',
'type' => 'string',
),
'deleted' => array(
'location' => 'query',
'type' => 'boolean',
),
),
),'list' => array(
'path' => '{userId}/messages',
'path' => 'gmail/v1/users/{userId}/messages',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -496,19 +497,11 @@ class Google_Service_Gmail extends Google_Service
'type' => 'string',
'required' => true,
),
'includeSpamTrash' => array(
'location' => 'query',
'type' => 'boolean',
),
'labelIds' => array(
'location' => 'query',
'type' => 'string',
'repeated' => true,
),
'maxResults' => array(
'location' => 'query',
'type' => 'integer',
),
'pageToken' => array(
'location' => 'query',
'type' => 'string',
@ -517,9 +510,17 @@ class Google_Service_Gmail extends Google_Service
'location' => 'query',
'type' => 'string',
),
'maxResults' => array(
'location' => 'query',
'type' => 'integer',
),
'includeSpamTrash' => array(
'location' => 'query',
'type' => 'boolean',
),
),
),'modify' => array(
'path' => '{userId}/messages/{id}/modify',
'path' => 'gmail/v1/users/{userId}/messages/{id}/modify',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -534,7 +535,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'send' => array(
'path' => '{userId}/messages/send',
'path' => 'gmail/v1/users/{userId}/messages/send',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -544,7 +545,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'trash' => array(
'path' => '{userId}/messages/{id}/trash',
'path' => 'gmail/v1/users/{userId}/messages/{id}/trash',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -559,7 +560,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'untrash' => array(
'path' => '{userId}/messages/{id}/untrash',
'path' => 'gmail/v1/users/{userId}/messages/{id}/untrash',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -584,7 +585,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'get' => array(
'path' => '{userId}/messages/{messageId}/attachments/{id}',
'path' => 'gmail/v1/users/{userId}/messages/{messageId}/attachments/{id}',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -614,7 +615,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'getAutoForwarding' => array(
'path' => '{userId}/settings/autoForwarding',
'path' => 'gmail/v1/users/{userId}/settings/autoForwarding',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -624,7 +625,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'getImap' => array(
'path' => '{userId}/settings/imap',
'path' => 'gmail/v1/users/{userId}/settings/imap',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -634,7 +635,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'getLanguage' => array(
'path' => '{userId}/settings/language',
'path' => 'gmail/v1/users/{userId}/settings/language',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -644,7 +645,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'getPop' => array(
'path' => '{userId}/settings/pop',
'path' => 'gmail/v1/users/{userId}/settings/pop',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -654,7 +655,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'getVacation' => array(
'path' => '{userId}/settings/vacation',
'path' => 'gmail/v1/users/{userId}/settings/vacation',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -664,7 +665,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'updateAutoForwarding' => array(
'path' => '{userId}/settings/autoForwarding',
'path' => 'gmail/v1/users/{userId}/settings/autoForwarding',
'httpMethod' => 'PUT',
'parameters' => array(
'userId' => array(
@ -674,7 +675,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'updateImap' => array(
'path' => '{userId}/settings/imap',
'path' => 'gmail/v1/users/{userId}/settings/imap',
'httpMethod' => 'PUT',
'parameters' => array(
'userId' => array(
@ -684,7 +685,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'updateLanguage' => array(
'path' => '{userId}/settings/language',
'path' => 'gmail/v1/users/{userId}/settings/language',
'httpMethod' => 'PUT',
'parameters' => array(
'userId' => array(
@ -694,7 +695,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'updatePop' => array(
'path' => '{userId}/settings/pop',
'path' => 'gmail/v1/users/{userId}/settings/pop',
'httpMethod' => 'PUT',
'parameters' => array(
'userId' => array(
@ -704,7 +705,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'updateVacation' => array(
'path' => '{userId}/settings/vacation',
'path' => 'gmail/v1/users/{userId}/settings/vacation',
'httpMethod' => 'PUT',
'parameters' => array(
'userId' => array(
@ -724,7 +725,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'create' => array(
'path' => '{userId}/settings/delegates',
'path' => 'gmail/v1/users/{userId}/settings/delegates',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -734,7 +735,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'delete' => array(
'path' => '{userId}/settings/delegates/{delegateEmail}',
'path' => 'gmail/v1/users/{userId}/settings/delegates/{delegateEmail}',
'httpMethod' => 'DELETE',
'parameters' => array(
'userId' => array(
@ -749,7 +750,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'get' => array(
'path' => '{userId}/settings/delegates/{delegateEmail}',
'path' => 'gmail/v1/users/{userId}/settings/delegates/{delegateEmail}',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -764,7 +765,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'list' => array(
'path' => '{userId}/settings/delegates',
'path' => 'gmail/v1/users/{userId}/settings/delegates',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -784,7 +785,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'create' => array(
'path' => '{userId}/settings/filters',
'path' => 'gmail/v1/users/{userId}/settings/filters',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -794,7 +795,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'delete' => array(
'path' => '{userId}/settings/filters/{id}',
'path' => 'gmail/v1/users/{userId}/settings/filters/{id}',
'httpMethod' => 'DELETE',
'parameters' => array(
'userId' => array(
@ -809,7 +810,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'get' => array(
'path' => '{userId}/settings/filters/{id}',
'path' => 'gmail/v1/users/{userId}/settings/filters/{id}',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -824,7 +825,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'list' => array(
'path' => '{userId}/settings/filters',
'path' => 'gmail/v1/users/{userId}/settings/filters',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -844,7 +845,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'create' => array(
'path' => '{userId}/settings/forwardingAddresses',
'path' => 'gmail/v1/users/{userId}/settings/forwardingAddresses',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -854,7 +855,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'delete' => array(
'path' => '{userId}/settings/forwardingAddresses/{forwardingEmail}',
'path' => 'gmail/v1/users/{userId}/settings/forwardingAddresses/{forwardingEmail}',
'httpMethod' => 'DELETE',
'parameters' => array(
'userId' => array(
@ -869,7 +870,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'get' => array(
'path' => '{userId}/settings/forwardingAddresses/{forwardingEmail}',
'path' => 'gmail/v1/users/{userId}/settings/forwardingAddresses/{forwardingEmail}',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -884,7 +885,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'list' => array(
'path' => '{userId}/settings/forwardingAddresses',
'path' => 'gmail/v1/users/{userId}/settings/forwardingAddresses',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -904,7 +905,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'create' => array(
'path' => '{userId}/settings/sendAs',
'path' => 'gmail/v1/users/{userId}/settings/sendAs',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -914,7 +915,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'delete' => array(
'path' => '{userId}/settings/sendAs/{sendAsEmail}',
'path' => 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}',
'httpMethod' => 'DELETE',
'parameters' => array(
'userId' => array(
@ -929,7 +930,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'get' => array(
'path' => '{userId}/settings/sendAs/{sendAsEmail}',
'path' => 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -944,7 +945,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'list' => array(
'path' => '{userId}/settings/sendAs',
'path' => 'gmail/v1/users/{userId}/settings/sendAs',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -954,7 +955,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'patch' => array(
'path' => '{userId}/settings/sendAs/{sendAsEmail}',
'path' => 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}',
'httpMethod' => 'PATCH',
'parameters' => array(
'userId' => array(
@ -969,7 +970,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'update' => array(
'path' => '{userId}/settings/sendAs/{sendAsEmail}',
'path' => 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}',
'httpMethod' => 'PUT',
'parameters' => array(
'userId' => array(
@ -984,7 +985,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'verify' => array(
'path' => '{userId}/settings/sendAs/{sendAsEmail}/verify',
'path' => 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/verify',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -1009,7 +1010,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'delete' => array(
'path' => '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}',
'path' => 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}',
'httpMethod' => 'DELETE',
'parameters' => array(
'userId' => array(
@ -1029,7 +1030,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'get' => array(
'path' => '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}',
'path' => 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -1049,7 +1050,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'insert' => array(
'path' => '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo',
'path' => 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/smimeInfo',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -1064,7 +1065,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'list' => array(
'path' => '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo',
'path' => 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/smimeInfo',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -1079,7 +1080,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'setDefault' => array(
'path' => '{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}/setDefault',
'path' => 'gmail/v1/users/{userId}/settings/sendAs/{sendAsEmail}/smimeInfo/{id}/setDefault',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -1109,7 +1110,7 @@ class Google_Service_Gmail extends Google_Service
array(
'methods' => array(
'delete' => array(
'path' => '{userId}/threads/{id}',
'path' => 'gmail/v1/users/{userId}/threads/{id}',
'httpMethod' => 'DELETE',
'parameters' => array(
'userId' => array(
@ -1124,7 +1125,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'get' => array(
'path' => '{userId}/threads/{id}',
'path' => 'gmail/v1/users/{userId}/threads/{id}',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -1148,7 +1149,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'list' => array(
'path' => '{userId}/threads',
'path' => 'gmail/v1/users/{userId}/threads',
'httpMethod' => 'GET',
'parameters' => array(
'userId' => array(
@ -1156,30 +1157,30 @@ class Google_Service_Gmail extends Google_Service
'type' => 'string',
'required' => true,
),
'maxResults' => array(
'location' => 'query',
'type' => 'integer',
),
'includeSpamTrash' => array(
'location' => 'query',
'type' => 'boolean',
),
'q' => array(
'location' => 'query',
'type' => 'string',
),
'pageToken' => array(
'location' => 'query',
'type' => 'string',
),
'labelIds' => array(
'location' => 'query',
'type' => 'string',
'repeated' => true,
),
'maxResults' => array(
'location' => 'query',
'type' => 'integer',
),
'pageToken' => array(
'location' => 'query',
'type' => 'string',
),
'q' => array(
'location' => 'query',
'type' => 'string',
),
),
),'modify' => array(
'path' => '{userId}/threads/{id}/modify',
'path' => 'gmail/v1/users/{userId}/threads/{id}/modify',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -1194,7 +1195,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'trash' => array(
'path' => '{userId}/threads/{id}/trash',
'path' => 'gmail/v1/users/{userId}/threads/{id}/trash',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(
@ -1209,7 +1210,7 @@ class Google_Service_Gmail extends Google_Service
),
),
),'untrash' => array(
'path' => '{userId}/threads/{id}/untrash',
'path' => 'gmail/v1/users/{userId}/threads/{id}/untrash',
'httpMethod' => 'POST',
'parameters' => array(
'userId' => array(

View File

@ -28,7 +28,7 @@ class Google_Service_Gmail_Resource_Users extends Google_Service_Resource
/**
* Gets the current user's Gmail profile. (users.getProfile)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
* @return Google_Service_Gmail_Profile
@ -42,7 +42,7 @@ class Google_Service_Gmail_Resource_Users extends Google_Service_Resource
/**
* Stop receiving push notifications for the given user mailbox. (users.stop)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
*/
@ -56,7 +56,7 @@ class Google_Service_Gmail_Resource_Users extends Google_Service_Resource
* Set up or update a push notification watch on the given user mailbox.
* (users.watch)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_WatchRequest $postBody
* @param array $optParams Optional parameters.

View File

@ -26,9 +26,9 @@
class Google_Service_Gmail_Resource_UsersDrafts extends Google_Service_Resource
{
/**
* Creates a new draft with the DRAFT label. (drafts.create)
* Creates a new draft with the `DRAFT` label. (drafts.create)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_Draft $postBody
* @param array $optParams Optional parameters.
@ -44,7 +44,7 @@ class Google_Service_Gmail_Resource_UsersDrafts extends Google_Service_Resource
* Immediately and permanently deletes the specified draft. Does not simply
* trash it. (drafts.delete)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the draft to delete.
* @param array $optParams Optional parameters.
@ -58,7 +58,7 @@ class Google_Service_Gmail_Resource_UsersDrafts extends Google_Service_Resource
/**
* Gets the specified draft. (drafts.get)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the draft to retrieve.
* @param array $optParams Optional parameters.
@ -75,18 +75,18 @@ class Google_Service_Gmail_Resource_UsersDrafts extends Google_Service_Resource
/**
* Lists the drafts in the user's mailbox. (drafts.listUsersDrafts)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
*
* @opt_param bool includeSpamTrash Include drafts from SPAM and TRASH in the
* results.
* @opt_param string maxResults Maximum number of drafts to return.
* @opt_param string pageToken Page token to retrieve a specific page of results
* in the list.
* @opt_param string maxResults Maximum number of drafts to return.
* @opt_param string q Only return draft messages matching the specified query.
* Supports the same query format as the Gmail search box. For example,
* "from:someuser@example.com rfc822msgid: is:unread".
* `"from:someuser@example.com rfc822msgid: is:unread"`.
* @opt_param bool includeSpamTrash Include drafts from `SPAM` and `TRASH` in
* the results.
* @return Google_Service_Gmail_ListDraftsResponse
*/
public function listUsersDrafts($userId, $optParams = array())
@ -96,10 +96,10 @@ class Google_Service_Gmail_Resource_UsersDrafts extends Google_Service_Resource
return $this->call('list', array($params), "Google_Service_Gmail_ListDraftsResponse");
}
/**
* Sends the specified, existing draft to the recipients in the To, Cc, and Bcc
* headers. (drafts.send)
* Sends the specified, existing draft to the recipients in the `To`, `Cc`, and
* `Bcc` headers. (drafts.send)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_Draft $postBody
* @param array $optParams Optional parameters.
@ -114,7 +114,7 @@ class Google_Service_Gmail_Resource_UsersDrafts extends Google_Service_Resource
/**
* Replaces a draft's content. (drafts.update)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the draft to update.
* @param Google_Service_Gmail_Draft $postBody

View File

@ -27,29 +27,29 @@ class Google_Service_Gmail_Resource_UsersHistory extends Google_Service_Resource
{
/**
* Lists the history of all changes to the given mailbox. History results are
* returned in chronological order (increasing historyId).
* returned in chronological order (increasing `historyId`).
* (history.listUsersHistory)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
*
* @opt_param string historyTypes History types to be returned by the function
* @opt_param string startHistoryId Required. Returns history records after the
* specified `startHistoryId`. The supplied `startHistoryId` should be obtained
* from the `historyId` of a message, thread, or previous `list` response.
* History IDs increase chronologically but are not contiguous with random gaps
* in between valid IDs. Supplying an invalid or out of date `startHistoryId`
* typically returns an `HTTP 404` error code. A `historyId` is typically valid
* for at least a week, but in some rare circumstances may be valid for only a
* few hours. If you receive an `HTTP 404` error response, your application
* should perform a full sync. If you receive no `nextPageToken` in the
* response, there are no updates to retrieve and you can store the returned
* `historyId` for a future request.
* @opt_param string labelId Only return messages with a label matching the ID.
* @opt_param string maxResults The maximum number of history records to return.
* @opt_param string pageToken Page token to retrieve a specific page of results
* in the list.
* @opt_param string startHistoryId Required. Returns history records after the
* specified startHistoryId. The supplied startHistoryId should be obtained from
* the historyId of a message, thread, or previous list response. History IDs
* increase chronologically but are not contiguous with random gaps in between
* valid IDs. Supplying an invalid or out of date startHistoryId typically
* returns an HTTP 404 error code. A historyId is typically valid for at least a
* week, but in some rare circumstances may be valid for only a few hours. If
* you receive an HTTP 404 error response, your application should perform a
* full sync. If you receive no nextPageToken in the response, there are no
* updates to retrieve and you can store the returned historyId for a future
* request.
* @opt_param string maxResults The maximum number of history records to return.
* @return Google_Service_Gmail_ListHistoryResponse
*/
public function listUsersHistory($userId, $optParams = array())

View File

@ -28,7 +28,7 @@ class Google_Service_Gmail_Resource_UsersLabels extends Google_Service_Resource
/**
* Creates a new label. (labels.create)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_Label $postBody
* @param array $optParams Optional parameters.
@ -44,7 +44,7 @@ class Google_Service_Gmail_Resource_UsersLabels extends Google_Service_Resource
* Immediately and permanently deletes the specified label and removes it from
* any messages and threads that it is applied to. (labels.delete)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the label to delete.
* @param array $optParams Optional parameters.
@ -58,7 +58,7 @@ class Google_Service_Gmail_Resource_UsersLabels extends Google_Service_Resource
/**
* Gets the specified label. (labels.get)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the label to retrieve.
* @param array $optParams Optional parameters.
@ -73,7 +73,7 @@ class Google_Service_Gmail_Resource_UsersLabels extends Google_Service_Resource
/**
* Lists all labels in the user's mailbox. (labels.listUsersLabels)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
* @return Google_Service_Gmail_ListLabelsResponse
@ -85,10 +85,9 @@ class Google_Service_Gmail_Resource_UsersLabels extends Google_Service_Resource
return $this->call('list', array($params), "Google_Service_Gmail_ListLabelsResponse");
}
/**
* Updates the specified label. This method supports patch semantics.
* (labels.patch)
* Patch the specified label. (labels.patch)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the label to update.
* @param Google_Service_Gmail_Label $postBody
@ -104,7 +103,7 @@ class Google_Service_Gmail_Resource_UsersLabels extends Google_Service_Resource
/**
* Updates the specified label. (labels.update)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the label to update.
* @param Google_Service_Gmail_Label $postBody

View File

@ -26,10 +26,10 @@
class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resource
{
/**
* Deletes many messages by message ID. Provides no guarantees that messages
* Deletes many messages by message ID. Provides no guarantees that messages
* were not already deleted or even existed at all. (messages.batchDelete)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_BatchDeleteMessagesRequest $postBody
* @param array $optParams Optional parameters.
@ -43,7 +43,7 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
/**
* Modifies the labels on the specified messages. (messages.batchModify)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_BatchModifyMessagesRequest $postBody
* @param array $optParams Optional parameters.
@ -56,9 +56,9 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
}
/**
* Immediately and permanently deletes the specified message. This operation
* cannot be undone. Prefer messages.trash instead. (messages.delete)
* cannot be undone. Prefer `messages.trash` instead. (messages.delete)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the message to delete.
* @param array $optParams Optional parameters.
@ -72,13 +72,13 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
/**
* Gets the specified message. (messages.get)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the message to retrieve.
* @param array $optParams Optional parameters.
*
* @opt_param string format The format to return the message in.
* @opt_param string metadataHeaders When given and format is METADATA, only
* @opt_param string metadataHeaders When given and format is `METADATA`, only
* include headers specified.
* @return Google_Service_Gmail_Message
*/
@ -93,11 +93,13 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
* scanning and classification similar to receiving via SMTP. Does not send a
* message. (messages.import)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_Message $postBody
* @param array $optParams Optional parameters.
*
* @opt_param bool processForCalendar Process calendar invites in the email and
* add any extracted meetings to the Google Calendar for this user.
* @opt_param bool deleted Mark the email as permanently deleted (not TRASH) and
* only visible in Google Vault to a Vault administrator. Only used for G Suite
* accounts.
@ -105,8 +107,6 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
* message.
* @opt_param bool neverMarkSpam Ignore the Gmail spam classifier decision and
* never mark this email as SPAM in the mailbox.
* @opt_param bool processForCalendar Process calendar invites in the email and
* add any extracted meetings to the Google Calendar for this user.
* @return Google_Service_Gmail_Message
*/
public function import($userId, Google_Service_Gmail_Message $postBody, $optParams = array())
@ -116,20 +116,20 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
return $this->call('import', array($params), "Google_Service_Gmail_Message");
}
/**
* Directly inserts a message into only this user's mailbox similar to IMAP
* APPEND, bypassing most scanning and classification. Does not send a message.
* Directly inserts a message into only this user's mailbox similar to `IMAP
* APPEND`, bypassing most scanning and classification. Does not send a message.
* (messages.insert)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_Message $postBody
* @param array $optParams Optional parameters.
*
* @opt_param string internalDateSource Source for Gmail's internal date of the
* message.
* @opt_param bool deleted Mark the email as permanently deleted (not TRASH) and
* only visible in Google Vault to a Vault administrator. Only used for G Suite
* accounts.
* @opt_param string internalDateSource Source for Gmail's internal date of the
* message.
* @return Google_Service_Gmail_Message
*/
public function insert($userId, Google_Service_Gmail_Message $postBody, $optParams = array())
@ -141,21 +141,21 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
/**
* Lists the messages in the user's mailbox. (messages.listUsersMessages)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
*
* @opt_param bool includeSpamTrash Include messages from SPAM and TRASH in the
* results.
* @opt_param string labelIds Only return messages with labels that match all of
* the specified label IDs.
* @opt_param string maxResults Maximum number of messages to return.
* @opt_param string pageToken Page token to retrieve a specific page of results
* in the list.
* @opt_param string q Only return messages matching the specified query.
* Supports the same query format as the Gmail search box. For example,
* "from:someuser@example.com rfc822msgid: is:unread". Parameter cannot be used
* when accessing the api using the gmail.metadata scope.
* `"from:someuser@example.com rfc822msgid: is:unread"`. Parameter cannot be
* used when accessing the api using the gmail.metadata scope.
* @opt_param string maxResults Maximum number of messages to return.
* @opt_param bool includeSpamTrash Include messages from `SPAM` and `TRASH` in
* the results.
* @return Google_Service_Gmail_ListMessagesResponse
*/
public function listUsersMessages($userId, $optParams = array())
@ -167,7 +167,7 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
/**
* Modifies the labels on the specified message. (messages.modify)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the message to modify.
* @param Google_Service_Gmail_ModifyMessageRequest $postBody
@ -181,10 +181,10 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
return $this->call('modify', array($params), "Google_Service_Gmail_Message");
}
/**
* Sends the specified message to the recipients in the To, Cc, and Bcc headers.
* (messages.send)
* Sends the specified message to the recipients in the `To`, `Cc`, and `Bcc`
* headers. (messages.send)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_Message $postBody
* @param array $optParams Optional parameters.
@ -199,7 +199,7 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
/**
* Moves the specified message to the trash. (messages.trash)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the message to Trash.
* @param array $optParams Optional parameters.
@ -214,7 +214,7 @@ class Google_Service_Gmail_Resource_UsersMessages extends Google_Service_Resourc
/**
* Removes the specified message from the trash. (messages.untrash)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the message to remove from Trash.
* @param array $optParams Optional parameters.

View File

@ -28,7 +28,7 @@ class Google_Service_Gmail_Resource_UsersMessagesAttachments extends Google_Serv
/**
* Gets the specified message attachment. (attachments.get)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $messageId The ID of the message containing the attachment.
* @param string $id The ID of the attachment.

View File

@ -29,7 +29,7 @@ class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resourc
* Gets the auto-forwarding setting for the specified account.
* (settings.getAutoForwarding)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
* @return Google_Service_Gmail_AutoForwarding
@ -43,7 +43,7 @@ class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resourc
/**
* Gets IMAP settings. (settings.getImap)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
* @return Google_Service_Gmail_ImapSettings
@ -57,7 +57,7 @@ class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resourc
/**
* Gets language settings. (settings.getLanguage)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
* @return Google_Service_Gmail_LanguageSettings
@ -71,7 +71,7 @@ class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resourc
/**
* Gets POP settings. (settings.getPop)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
* @return Google_Service_Gmail_PopSettings
@ -85,7 +85,7 @@ class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resourc
/**
* Gets vacation responder settings. (settings.getVacation)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
* @return Google_Service_Gmail_VacationSettings
@ -97,13 +97,13 @@ class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resourc
return $this->call('getVacation', array($params), "Google_Service_Gmail_VacationSettings");
}
/**
* Updates the auto-forwarding setting for the specified account. A verified
* Updates the auto-forwarding setting for the specified account. A verified
* forwarding address must be specified when auto-forwarding is enabled.
*
* This method is only available to service account clients that have been
* delegated domain-wide authority. (settings.updateAutoForwarding)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_AutoForwarding $postBody
* @param array $optParams Optional parameters.
@ -118,7 +118,7 @@ class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resourc
/**
* Updates IMAP settings. (settings.updateImap)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_ImapSettings $postBody
* @param array $optParams Optional parameters.
@ -133,13 +133,13 @@ class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resourc
/**
* Updates language settings.
*
* If successful, the return object contains the displayLanguage that was saved
* for the user, which may differ from the value passed into the request. This
* is because the requested displayLanguage may not be directly supported by
* Gmail but have a close variant that is, and so the variant may be chosen and
* saved instead. (settings.updateLanguage)
* If successful, the return object contains the `displayLanguage` that was
* saved for the user, which may differ from the value passed into the request.
* This is because the requested `displayLanguage` may not be directly supported
* by Gmail but have a close variant that is, and so the variant may be chosen
* and saved instead. (settings.updateLanguage)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_LanguageSettings $postBody
* @param array $optParams Optional parameters.
@ -154,7 +154,7 @@ class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resourc
/**
* Updates POP settings. (settings.updatePop)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_PopSettings $postBody
* @param array $optParams Optional parameters.
@ -169,7 +169,7 @@ class Google_Service_Gmail_Resource_UsersSettings extends Google_Service_Resourc
/**
* Updates vacation responder settings. (settings.updateVacation)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_VacationSettings $postBody
* @param array $optParams Optional parameters.

View File

@ -26,9 +26,9 @@
class Google_Service_Gmail_Resource_UsersSettingsDelegates extends Google_Service_Resource
{
/**
* Adds a delegate with its verification status set directly to accepted,
* without sending any verification email. The delegate user must be a member of
* the same G Suite organization as the delegator user.
* Adds a delegate with its verification status set directly to `accepted`,
* without sending any verification email. The delegate user must be a member
* of the same G Suite organization as the delegator user.
*
* Gmail imposes limitations on the number of delegates and delegators each user
* in a G Suite organization can have. These limits depend on your organization,
@ -43,7 +43,7 @@ class Google_Service_Gmail_Resource_UsersSettingsDelegates extends Google_Servic
* This method is only available to service account clients that have been
* delegated domain-wide authority. (delegates.create)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_Delegate $postBody
* @param array $optParams Optional parameters.
@ -65,7 +65,7 @@ class Google_Service_Gmail_Resource_UsersSettingsDelegates extends Google_Servic
* This method is only available to service account clients that have been
* delegated domain-wide authority. (delegates.delete)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param string $delegateEmail The email address of the user to be removed as a
* delegate.
@ -86,7 +86,7 @@ class Google_Service_Gmail_Resource_UsersSettingsDelegates extends Google_Servic
* This method is only available to service account clients that have been
* delegated domain-wide authority. (delegates.get)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param string $delegateEmail The email address of the user whose delegate
* relationship is to be retrieved.
@ -105,7 +105,7 @@ class Google_Service_Gmail_Resource_UsersSettingsDelegates extends Google_Servic
* This method is only available to service account clients that have been
* delegated domain-wide authority. (delegates.listUsersSettingsDelegates)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
* @return Google_Service_Gmail_ListDelegatesResponse

View File

@ -26,15 +26,15 @@
class Google_Service_Gmail_Resource_UsersSettingsForwardingAddresses extends Google_Service_Resource
{
/**
* Creates a forwarding address. If ownership verification is required, a
* Creates a forwarding address. If ownership verification is required, a
* message will be sent to the recipient and the resource's verification status
* will be set to pending; otherwise, the resource will be created with
* verification status set to accepted.
* will be set to `pending`; otherwise, the resource will be created with
* verification status set to `accepted`.
*
* This method is only available to service account clients that have been
* delegated domain-wide authority. (forwardingAddresses.create)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_ForwardingAddress $postBody
* @param array $optParams Optional parameters.
@ -53,7 +53,7 @@ class Google_Service_Gmail_Resource_UsersSettingsForwardingAddresses extends Goo
* This method is only available to service account clients that have been
* delegated domain-wide authority. (forwardingAddresses.delete)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param string $forwardingEmail The forwarding address to be deleted.
* @param array $optParams Optional parameters.
@ -67,7 +67,7 @@ class Google_Service_Gmail_Resource_UsersSettingsForwardingAddresses extends Goo
/**
* Gets the specified forwarding address. (forwardingAddresses.get)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param string $forwardingEmail The forwarding address to be retrieved.
* @param array $optParams Optional parameters.
@ -83,7 +83,7 @@ class Google_Service_Gmail_Resource_UsersSettingsForwardingAddresses extends Goo
* Lists the forwarding addresses for the specified account.
* (forwardingAddresses.listUsersSettingsForwardingAddresses)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
* @return Google_Service_Gmail_ListForwardingAddressesResponse

View File

@ -26,18 +26,18 @@
class Google_Service_Gmail_Resource_UsersSettingsSendAs extends Google_Service_Resource
{
/**
* Creates a custom "from" send-as alias. If an SMTP MSA is specified, Gmail
* Creates a custom "from" send-as alias. If an SMTP MSA is specified, Gmail
* will attempt to connect to the SMTP service to validate the configuration
* before creating the alias. If ownership verification is required for the
* before creating the alias. If ownership verification is required for the
* alias, a message will be sent to the email address and the resource's
* verification status will be set to pending; otherwise, the resource will be
* created with verification status set to accepted. If a signature is provided,
* Gmail will sanitize the HTML before saving it with the alias.
* verification status will be set to `pending`; otherwise, the resource will be
* created with verification status set to `accepted`. If a signature is
* provided, Gmail will sanitize the HTML before saving it with the alias.
*
* This method is only available to service account clients that have been
* delegated domain-wide authority. (sendAs.create)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param Google_Service_Gmail_SendAs $postBody
* @param array $optParams Optional parameters.
@ -50,13 +50,13 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAs extends Google_Service_R
return $this->call('create', array($params), "Google_Service_Gmail_SendAs");
}
/**
* Deletes the specified send-as alias. Revokes any verification that may have
* Deletes the specified send-as alias. Revokes any verification that may have
* been required for using it.
*
* This method is only available to service account clients that have been
* delegated domain-wide authority. (sendAs.delete)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param string $sendAsEmail The send-as alias to be deleted.
* @param array $optParams Optional parameters.
@ -68,10 +68,10 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAs extends Google_Service_R
return $this->call('delete', array($params));
}
/**
* Gets the specified send-as alias. Fails with an HTTP 404 error if the
* Gets the specified send-as alias. Fails with an HTTP 404 error if the
* specified address is not a member of the collection. (sendAs.get)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param string $sendAsEmail The send-as alias to be retrieved.
* @param array $optParams Optional parameters.
@ -84,11 +84,11 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAs extends Google_Service_R
return $this->call('get', array($params), "Google_Service_Gmail_SendAs");
}
/**
* Lists the send-as aliases for the specified account. The result includes the
* Lists the send-as aliases for the specified account. The result includes the
* primary send-as address associated with the account as well as any custom
* "from" aliases. (sendAs.listUsersSettingsSendAs)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
* @return Google_Service_Gmail_ListSendAsResponse
@ -100,14 +100,9 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAs extends Google_Service_R
return $this->call('list', array($params), "Google_Service_Gmail_ListSendAsResponse");
}
/**
* Updates a send-as alias. If a signature is provided, Gmail will sanitize the
* HTML before saving it with the alias.
* Patch the specified send-as alias. (sendAs.patch)
*
* Addresses other than the primary address for the account can only be updated
* by service account clients that have been delegated domain-wide authority.
* This method supports patch semantics. (sendAs.patch)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param string $sendAsEmail The send-as alias to be updated.
* @param Google_Service_Gmail_SendAs $postBody
@ -121,14 +116,14 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAs extends Google_Service_R
return $this->call('patch', array($params), "Google_Service_Gmail_SendAs");
}
/**
* Updates a send-as alias. If a signature is provided, Gmail will sanitize the
* Updates a send-as alias. If a signature is provided, Gmail will sanitize the
* HTML before saving it with the alias.
*
* Addresses other than the primary address for the account can only be updated
* by service account clients that have been delegated domain-wide authority.
* (sendAs.update)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param string $sendAsEmail The send-as alias to be updated.
* @param Google_Service_Gmail_SendAs $postBody
@ -143,12 +138,12 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAs extends Google_Service_R
}
/**
* Sends a verification email to the specified send-as alias address. The
* verification status must be pending.
* verification status must be `pending`.
*
* This method is only available to service account clients that have been
* delegated domain-wide authority. (sendAs.verify)
*
* @param string $userId User's email address. The special value "me" can be
* @param string $userId User's email address. The special value "me" can be
* used to indicate the authenticated user.
* @param string $sendAsEmail The send-as alias to be verified.
* @param array $optParams Optional parameters.

View File

@ -29,7 +29,7 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAsSmimeInfo extends Google_
* Deletes the specified S/MIME config for the specified send-as alias.
* (smimeInfo.delete)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $sendAsEmail The email address that appears in the "From:"
* header for mail sent using this alias.
@ -46,7 +46,7 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAsSmimeInfo extends Google_
* Gets the specified S/MIME config for the specified send-as alias.
* (smimeInfo.get)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $sendAsEmail The email address that appears in the "From:"
* header for mail sent using this alias.
@ -64,7 +64,7 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAsSmimeInfo extends Google_
* Insert (upload) the given S/MIME config for the specified send-as alias. Note
* that pkcs12 format is required for the key. (smimeInfo.insert)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $sendAsEmail The email address that appears in the "From:"
* header for mail sent using this alias.
@ -82,7 +82,7 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAsSmimeInfo extends Google_
* Lists S/MIME configs for the specified send-as alias.
* (smimeInfo.listUsersSettingsSendAsSmimeInfo)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $sendAsEmail The email address that appears in the "From:"
* header for mail sent using this alias.
@ -99,7 +99,7 @@ class Google_Service_Gmail_Resource_UsersSettingsSendAsSmimeInfo extends Google_
* Sets the default S/MIME config for the specified send-as alias.
* (smimeInfo.setDefault)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $sendAsEmail The email address that appears in the "From:"
* header for mail sent using this alias.

View File

@ -27,9 +27,9 @@ class Google_Service_Gmail_Resource_UsersThreads extends Google_Service_Resource
{
/**
* Immediately and permanently deletes the specified thread. This operation
* cannot be undone. Prefer threads.trash instead. (threads.delete)
* cannot be undone. Prefer `threads.trash` instead. (threads.delete)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id ID of the Thread to delete.
* @param array $optParams Optional parameters.
@ -43,7 +43,7 @@ class Google_Service_Gmail_Resource_UsersThreads extends Google_Service_Resource
/**
* Gets the specified thread. (threads.get)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the thread to retrieve.
* @param array $optParams Optional parameters.
@ -62,21 +62,21 @@ class Google_Service_Gmail_Resource_UsersThreads extends Google_Service_Resource
/**
* Lists the threads in the user's mailbox. (threads.listUsersThreads)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param array $optParams Optional parameters.
*
* @opt_param bool includeSpamTrash Include threads from SPAM and TRASH in the
* results.
* @opt_param string labelIds Only return threads with labels that match all of
* the specified label IDs.
* @opt_param string maxResults Maximum number of threads to return.
* @opt_param string pageToken Page token to retrieve a specific page of results
* in the list.
* @opt_param bool includeSpamTrash Include threads from `SPAM` and `TRASH` in
* the results.
* @opt_param string q Only return threads matching the specified query.
* Supports the same query format as the Gmail search box. For example,
* "from:someuser@example.com rfc822msgid: is:unread". Parameter cannot be used
* when accessing the api using the gmail.metadata scope.
* `"from:someuser@example.com rfc822msgid: is:unread"`. Parameter cannot be
* used when accessing the api using the gmail.metadata scope.
* @opt_param string pageToken Page token to retrieve a specific page of results
* in the list.
* @opt_param string labelIds Only return threads with labels that match all of
* the specified label IDs.
* @return Google_Service_Gmail_ListThreadsResponse
*/
public function listUsersThreads($userId, $optParams = array())
@ -89,7 +89,7 @@ class Google_Service_Gmail_Resource_UsersThreads extends Google_Service_Resource
* Modifies the labels applied to the thread. This applies to all messages in
* the thread. (threads.modify)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the thread to modify.
* @param Google_Service_Gmail_ModifyThreadRequest $postBody
@ -105,7 +105,7 @@ class Google_Service_Gmail_Resource_UsersThreads extends Google_Service_Resource
/**
* Moves the specified thread to the trash. (threads.trash)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the thread to Trash.
* @param array $optParams Optional parameters.
@ -120,7 +120,7 @@ class Google_Service_Gmail_Resource_UsersThreads extends Google_Service_Resource
/**
* Removes the specified thread from the trash. (threads.untrash)
*
* @param string $userId The user's email address. The special value me can be
* @param string $userId The user's email address. The special value `me` can be
* used to indicate the authenticated user.
* @param string $id The ID of the thread to remove from Trash.
* @param array $optParams Optional parameters.

View File

@ -25,6 +25,7 @@ use Google\Auth\Iam;
use Google\Auth\ProjectIdProviderInterface;
use Google\Auth\SignBlobInterface;
use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Exception\ServerException;
use GuzzleHttp\Psr7\Request;
@ -283,6 +284,7 @@ class GCECredentials extends CredentialsLoader implements
} catch (ClientException $e) {
} catch (ServerException $e) {
} catch (RequestException $e) {
} catch (ConnectException $e) {
}
}
return false;

View File

@ -84,14 +84,23 @@ class FetchAuthTokenCache implements
// TODO: correct caching; enable the cache to be cleared.
$cacheKey = $this->fetcher->getCacheKey();
$cached = $this->getCachedValue($cacheKey);
if (!empty($cached)) {
return ['access_token' => $cached];
if (is_array($cached)) {
if (empty($cached['expires_at'])) {
// If there is no expiration data, assume token is not expired.
// (for JwtAccess and ID tokens)
return $cached;
}
if (time() < $cached['expires_at']) {
// access token is not expired
return $cached;
}
}
$auth_token = $this->fetcher->fetchAuthToken($httpHandler);
if (isset($auth_token['access_token'])) {
$this->setCachedValue($cacheKey, $auth_token['access_token']);
if (isset($auth_token['access_token']) ||
isset($auth_token['id_token'])) {
$this->setCachedValue($cacheKey, $auth_token);
}
return $auth_token;

View File

@ -124,7 +124,11 @@ class AuthTokenMiddleware
if (array_key_exists('access_token', $auth_tokens)) {
// notify the callback if applicable
if ($this->tokenCallback) {
call_user_func($this->tokenCallback, $this->fetcher->getCacheKey(), $auth_tokens['access_token']);
call_user_func(
$this->tokenCallback,
$this->fetcher->getCacheKey(),
$auth_tokens['access_token']
);
}
return $auth_tokens['access_token'];

View File

@ -543,6 +543,10 @@ class OAuth2 implements FetchAuthTokenInterface
return implode(':', $this->scope);
}
if ($this->audience) {
return $this->audience;
}
// If scope has not set, return null to indicate no caching.
return null;
}

View File

@ -86,7 +86,7 @@ class RavenHandler extends AbstractProcessingHandler
// the record with the highest severity is the "main" one
$record = array_reduce($records, function ($highest, $record) {
if ($record['level'] > $highest['level']) {
if (null === $highest || $record['level'] > $highest['level']) {
return $record;
}

View File

@ -106,7 +106,8 @@ class StreamHandler extends AbstractProcessingHandler
restore_error_handler();
if (!is_resource($this->stream)) {
$this->stream = null;
throw new \UnexpectedValueException(sprintf('The stream or file "%s" could not be opened: '.$this->errorMessage, $this->url));
throw new \UnexpectedValueException(sprintf('The stream or file "%s" could not be opened in append mode: '.$this->errorMessage, $this->url));
}
}

View File

@ -52,6 +52,10 @@ class WebProcessor implements ProcessorInterface
throw new \UnexpectedValueException('$serverData must be an array or object implementing ArrayAccess.');
}
if (isset($this->serverData['UNIQUE_ID'])) {
$this->extraFields['unique_id'] = 'UNIQUE_ID';
}
if (null !== $extraFields) {
if (isset($extraFields[0])) {
foreach (array_keys($this->extraFields) as $fieldName) {
@ -104,10 +108,6 @@ class WebProcessor implements ProcessorInterface
$extra[$extraName] = isset($this->serverData[$serverName]) ? $this->serverData[$serverName] : null;
}
if (isset($this->serverData['UNIQUE_ID'])) {
$extra['unique_id'] = $this->serverData['UNIQUE_ID'];
}
return $extra;
}
}